From 403e1d56c8fa43d5ab9f6f96b159003144e4000d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2025 15:18:18 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx | 263 ++++++++++++++++++++++------------------------------
1 files changed, 110 insertions(+), 153 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
index d0b5dd8..eeb2476 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
@@ -1,17 +1,14 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Button, notification, Modal, Tooltip, Radio, Select } from 'antd'
+import { Form, Row, Col, Button, notification, Tooltip, Radio, Select, Switch } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
-import moment from 'moment'
-import Utils from '@/utils/utils.js'
-import Api from '@/api'
+import { checkSQL } from '@/utils/utils-custom.js'
import CodeMirror from '@/templates/zshare/codemirror'
-import './index.scss'
+// import './index.scss'
class CustomForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
btn: PropTypes.object, // 鎸夐挳淇℃伅
scripts: PropTypes.array, // 鑷畾涔夎剼鏈垪琛�
usefulfields: PropTypes.any, // 鍙敤瀛楁
@@ -23,6 +20,7 @@
editItem: null,
usefulfields: null,
loading: false,
+ skip: false,
verifySql: ''
}
@@ -36,8 +34,9 @@
fields.push('jskey')
- let _sql = `Declare @${btn.sheet} table (${usefulfields.map(item => item.field + ' ' + item.type).join(',')},jskey nvarchar(50) )
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
+ let sheet = btn.sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
+ let _sql = `create table #${sheet} (${usefulfields.map(item => item.field + ' ' + item.datatype).join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256))
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @ErrorCode='', @retmsg=''
`
@@ -48,149 +47,84 @@
}
edit = (record) => {
+ const { type } = this.props
+
this.setState({
editItem: record
})
- this.props.form.setFieldsValue({
- sql: record.sql,
- position: record.position || 'back'
- })
+ if (type === 'fullscreen') {
+ this.props.form.setFieldsValue({
+ sql: record.sql
+ })
+ } else {
+ this.props.form.setFieldsValue({
+ sql: record.sql,
+ position: record.position || 'back'
+ })
+ }
}
handleConfirm = () => {
+ const { type } = this.props
+ const { editItem, skip } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
+ if (!values.sql || /^[\s\n]+$/.test(values.sql)) {
+ notification.warning({
+ top: 92,
+ message: '璇疯緭鍏ql!',
+ duration: 5
+ })
+ return
+ }
+
values.uuid = this.state.editItem ? this.state.editItem.uuid : ''
- let _quot = values.sql.match(/'{1}/g)
- let _lparen = values.sql.match(/\({1}/g)
- let _rparen = values.sql.match(/\){1}/g)
+ if (type === 'fullscreen' && editItem) {
+ values.status = editItem.status || 'true'
+ }
- _quot = _quot ? _quot.length : 0
- _lparen = _lparen ? _lparen.length : 0
- _rparen = _rparen ? _rparen.length : 0
+ let pass = checkSQL(values.sql, 'customscript')
- if (_quot % 2 !== 0) {
+ if (!pass && !skip) return
+
+ if (/@ID@/ig.test(values.sql) && !skip) {
notification.warning({
top: 92,
- message: 'sql涓璡'蹇呴』鎴愬鍑虹幇',
- duration: 5
- })
- return
- } else if (_lparen !== _rparen) {
- notification.warning({
- top: 92,
- message: 'sql涓�()蹇呴』鎴愬鍑虹幇',
- duration: 5
- })
- return
- } else if (/--/ig.test(values.sql)) {
- notification.warning({
- top: 92,
- message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇瀛楃 -- 锛屾敞閲婅鐢� /*鍐呭*/',
+ message: '鑴氭湰涓笉鍙娇鐢ˊID@锛�',
duration: 5
})
return
}
- let error = Utils.verifySql(values.sql, 'customscript')
-
- if (error) {
- notification.warning({
- top: 92,
- message: 'sql涓笉鍙娇鐢�' + error,
- duration: 5
+ if (skip) {
+ this.setState({
+ skip: false,
+ editItem: null
})
- return
- }
-
- let tail = `
- aaa:
- `
-
- let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
- let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
- let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
-
- this.props.scripts.forEach(item => {
- if (item.status === 'false') return
-
- if (item.position === 'init') {
- _initCustomScript += `
- /* 鍒濆鍖栬剼鏈� */
- ${values.uuid === item.uuid ? values.sql : item.sql}
- `
- } else if (item.position === 'front') {
- _prevCustomScript += `
- /* 榛樿sql鍓嶈剼鏈� */
- ${values.uuid === item.uuid ? values.sql : item.sql}
- `
- } else {
- _backCustomScript += `
- /* 榛樿sql鍚庤剼鏈� */
- ${values.uuid === item.uuid ? values.sql : item.sql}
- `
- }
- })
-
- if (!values.uuid) {
- if (values.position === 'init') {
- _initCustomScript += `
- /* 鍒濆鍖栬剼鏈� */
- ${values.sql}
- `
- } else if (values.position === 'front') {
- _prevCustomScript += `
- /* 榛樿sql鍓嶈剼鏈� */
- ${values.sql}
- `
- } else {
- _backCustomScript += `
- /* 榛樿sql鍚庤剼鏈� */
- ${values.sql}
- `
- }
- }
-
- let param = {
- func: 's_debug_sql',
- exec_type: 'y',
- LText: this.state.verifySql + _initCustomScript + _prevCustomScript + _backCustomScript + tail
- }
-
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
-
- // 澶栬仈鏁版嵁搴撴浛鎹�
- if (window.GLOB.externalDatabase !== null) {
- param.LText = param.LText.replace(/@db@/ig, window.GLOB.externalDatabase)
- }
-
- param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt('', param.timestamp)
-
- this.setState({loading: true})
- Api.getLocalConfig(param).then(res => {
- if (res.status) {
+ this.props.form.setFieldsValue({
+ sql: ''
+ })
+ this.props.scriptsChange(values)
+ } else {
+ this.setState({loading: true})
+
+ this.props.scriptsChange(values, () => {
this.setState({
loading: false,
editItem: null
- }, () => {
- this.props.scriptsChange(values)
})
this.props.form.setFieldsValue({
sql: ''
})
- } else {
- this.setState({loading: false})
-
- Modal.error({
- title: res.message
+ }, () => {
+ this.setState({
+ loading: false
})
- }
- })
+ })
+ }
}
})
}
@@ -206,14 +140,18 @@
}
selectScript = (value, option) => {
- const { usefulfields, btn } = this.props
+ const { usefulfields, btn, setting } = this.props
let _value = ''
if (value === 'default') {
let fields = usefulfields.map(col => col.field).join(',')
+ let upFields = usefulfields.map(col => `${col.field}=t.${col.field}`).join(',')
if (fields) {
fields = fields + ','
+ }
+ if (upFields) {
+ upFields = upFields + ','
}
let database = btn.sheet.match(/(.*)\.(.*)\.|@db@/ig) || ''
@@ -221,12 +159,28 @@
database = database ? (database[0] || '') : ''
- _value = `Insert into ${database}${sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid@,@username,@fullname,@BID@ From @${sheet}`
+ _value = `update a set ${upFields}modifydate=getdate(),modifyuserid=@UserID@,modifyuser=@username,modifystaff=@fullname,deleted=0
+ from (select * from #${sheet} where data_type='upt') t
+ inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+ update a set deleted=1,modifydate=getdate(),modifyuserid=@UserID@,modifyuser=@username,modifystaff=@fullname
+ from (select * from #${sheet} where data_type='del') t
+ inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+ delete t from #${sheet} t inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+ Insert into ${database}${sheet} (${fields}createuserid,createuser,createstaff,bid)
+ Select ${fields}@UserID@,@username,@fullname,@BID@ From #${sheet}
+ `
+ _value = _value.replace(/\s{6}[fiuds]/ig, (word) => word.replace(/\s{6}/ig, ''))
} else {
_value = value
}
let _sql = this.props.form.getFieldValue('sql')
+ if (/^\s+$/.test(_sql)) {
+ _sql = ''
+ }
if (_sql) {
_sql = _sql + `
@@ -245,8 +199,8 @@
}
render() {
- const { systemScripts, btn } = this.props
- const { usefulfields } = this.state
+ const { systemScripts, btn, type } = this.props
+ const { usefulfields, editItem, skip } = this.state
const { getFieldDecorator } = this.props.form
const formItemLayout = {
labelCol: {
@@ -262,24 +216,26 @@
return (
<Form {...formItemLayout} className="verify-form" id="verify-excelin-custom-scripts">
<Row gutter={24}>
- {btn.sheet ? <Col span={8}>
- <Form.Item label={'琛ㄥ悕'} style={{whiteSpace: 'nowrap', margin: 0}}>
- {btn.sheet}
+ {!type && btn.sheet ? <Col span={8}>
+ <Form.Item label="琛ㄥ悕" style={{whiteSpace: 'nowrap', margin: 0}}>
+ {btn.sheet}锛堣〃鍙橀噺璇蜂娇鐢�#{btn.sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')}锛�
</Form.Item>
</Col> : null}
- <Col span={10}>
- <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
- ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
- </Form.Item>
- </Col>
- {usefulfields ? <Col span={24} className="sqlfield">
- <Form.Item label={'鍙敤瀛楁'}>
- BID, ID, LoginUID, SessionUid, UserID, Appkey, UserName, FullName, RoleID, mk_departmentcode, mk_organization, login_city, {usefulfields}
+ {!type ? <Col span={10}>
+ <Form.Item label="鎶ラ敊瀛楁" style={{margin: 0, whiteSpace: 'nowrap'}}>
+ errorcode, retmsg
</Form.Item>
</Col> : null}
- <Col span={8} style={{whiteSpace: 'nowrap'}}>
+ {!type ? <Col span={24} className="sqlfield">
+ <Form.Item label="鍙敤瀛楁">
+ <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鍏叡鍊硷紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�'}><span style={{color: '#1890ff'}}>BID, LoginUID, SessionUid, UserID, Appkey, lang, typename, datam, time_id</span></Tooltip>,
+ <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'绯荤粺鍙橀噺锛岀郴缁熶細瀹氫箟鍙橀噺骞惰祴鍊笺��'}><span style={{color: '#fa8c16'}}>UserName, FullName, RoleID, mk_departmentcode, mk_organization, mk_user_type, mk_nation, mk_province, mk_city, mk_district, mk_address</span></Tooltip>,
+ {usefulfields},data_type锛堟敞锛歫skey涓轰富閿�硷紝鏂板鏃跺墠绔敓鎴愶紱data_type涓烘搷浣滅被鍨嬶紝鏂板 - add銆佷慨鏀� - upt銆佸垹闄� - del锛�
+ </Form.Item>
+ </Col> : null}
+ {!type ? <Col span={8} style={{whiteSpace: 'nowrap'}}>
<Form.Item style={{marginBottom: 0}} label={
- <Tooltip placement="bottomLeft" title={'鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�'}>
+ <Tooltip placement="bottomLeft" title="鑷畾涔夎剼鏈笌榛樿sql浣嶇疆鍏崇郴銆�">
<QuestionCircleOutlined className="mk-form-tip" />
鎵ц浣嶇疆
</Tooltip>
@@ -294,9 +250,9 @@
</Radio.Group>
)}
</Form.Item>
- </Col>
- <Col span={10}>
- <Form.Item style={{marginBottom: 0}} label={'蹇嵎娣诲姞'}>
+ </Col> : null}
+ {!type ? <Col span={8}>
+ <Form.Item style={{marginBottom: 0}} label="蹇嵎娣诲姞">
<Select
showSearch
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
@@ -306,6 +262,9 @@
<Select.Option key="default" value={'default'}>
榛樿sql
</Select.Option>
+ <Select.Option key="debugger" value={`z_debug: select @ErrorCode='E',@retmsg='娴嬭瘯鏂偣' goto aaa`}>
+ 娴嬭瘯鏂偣
+ </Select.Option>
{systemScripts.map((option, i) =>
<Select.Option key={i} value={option.value}>
{option.name}
@@ -313,25 +272,23 @@
)}
</Select>
</Form.Item>
- </Col>
- <Col span={6} className="add">
- <Button onClick={this.handleConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 40}}>
- 淇濆瓨
+ </Col> : null}
+ <Col span={5} className="add" style={{paddingTop: '3px', whiteSpace: 'nowrap'}}>
+ <Button onClick={this.handleConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 15}}>
+ {type === 'fullscreen' && !editItem ? '娣诲姞' : '淇濆瓨'}
</Button>
<Button onClick={this.handleCancel} style={{marginBottom: 15, marginLeft: 10}}>
鍙栨秷
</Button>
</Col>
+ <Col span={3} className="forced" style={{paddingTop: '12px', fontSize: '12px', whiteSpace: 'nowrap'}}>
+ 寮哄埗淇濆瓨锛�
+ <Switch checked={skip} size="small" onChange={() => this.setState({skip: !skip})}/>
+ </Col>
<Col span={24} className="sql">
- <Form.Item label={'sql'}>
+ <Form.Item label="sql" required>
{getFieldDecorator('sql', {
- initialValue: '',
- rules: [
- {
- required: true,
- message: this.props.dict['form.required.input'] + 'sql!'
- }
- ]
+ initialValue: ''
})(<CodeMirror />)}
</Form.Item>
</Col>
--
Gitblit v1.8.0