From 78a727a5acfb9aac5094307f13e8c4dfa1f792cb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 13 四月 2025 00:27:22 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 338 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 214 insertions(+), 124 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index d4e3ece..f2fc6c8 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -1,14 +1,13 @@
-import React, {Component} from 'react'
+import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Button, notification, Modal, Tooltip, Radio, Select } from 'antd'
+import { Form, Row, Col, Button, notification, Modal, 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 = {
@@ -23,7 +22,7 @@
editItem: null,
usefulfields: null,
loading: false,
- verifySql: ''
+ skip: false
}
UNSAFE_componentWillMount () {
@@ -37,91 +36,70 @@
}
resetfield = (columns) => {
- const { btn } = this.props
columns = columns.filter(item => item.import !== 'false')
let fields = columns.map(item => item.Column)
fields.push('jskey')
-
- let _dec = columns.map(item => item.Column + ' ' + item.type).join(',')
-
- if (_dec) {
- _dec += ','
- }
-
- let _sql = `Declare @${btn.sheet} table (${_dec}jskey nvarchar(50) )
- Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@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=''
- `
this.setState({
- verifySql: _sql,
usefulfields: fields.join(', ')
})
}
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, btn, workFlow, usefulfields } = this.props
+ const { editItem, skip } = this.state
+
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
+ if (type === 'fullscreen' && err) {
+ notification.warning({
+ top: 92,
+ message: '璇疯緭鍏ql!',
+ duration: 5
+ })
+ return
+ }
+
if (!err) {
- 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)
-
- _quot = _quot ? _quot.length : 0
- _lparen = _lparen ? _lparen.length : 0
- _rparen = _rparen ? _rparen.length : 0
-
- if (_quot % 2 !== 0) {
+ if (/^[\s\n]+$/.test(values.sql)) {
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: '璇疯緭鍏ql!',
duration: 5
})
return
}
+
+ values.uuid = editItem ? editItem.uuid : ''
+ values.position = values.position || (editItem ? editItem.position : 'front')
- let error = Utils.verifySql(values.sql, 'customscript')
-
- if (error) {
- notification.warning({
- top: 92,
- message: 'sql涓笉鍙娇鐢�' + error,
- duration: 5
- })
- return
+ if (type === 'fullscreen' && editItem) {
+ values.status = editItem.status || 'true'
}
- let tail = `
- aaa:
- `
+ let pass = checkSQL(values.sql, 'customscript')
+
+ if (!pass && !skip) return
let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
@@ -166,44 +144,117 @@
`
}
}
-
- 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.setState({
- loading: false,
- editItem: null
- }, () => {
- this.props.scriptsChange(values)
- })
- this.props.form.setFieldsValue({
- sql: ''
- })
- } else {
- this.setState({loading: false})
+ let sheet = btn.sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
+ let fields = []
+ let _dec = []
+ let vals = []
- Modal.error({
- title: res.message
- })
+ usefulfields.forEach(col => {
+ if (col.import === 'false') return
+
+ fields.push(col.Column)
+ _dec.push(col.Column + ' ' + col.type)
+
+ let val = ''
+ if (col.import === 'init') {
+ if (/^Nvarchar/ig.test(col.type)) {
+ val = ''
+ } else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
+ val = 0
+ } else if (col.type === 'date') {
+ val = '1949-10-01'
+ } else if (col.type === 'datetime') {
+ val = '1949-10-01 00:00:00'
+ }
+ } else if (/^Nvarchar/ig.test(col.type)) {
+ val = 'mk'
+ } else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
+ val = 1
+ } else if (col.type === 'date') {
+ val = '1949-10-01'
+ } else if (col.type === 'datetime') {
+ val = '1949-10-01 00:00:00'
}
+
+ vals.push(`'${val}'`)
})
+
+ vals.push(`'${new Date().getTime()}000010'`)
+ vals.push(`'bid'`)
+ vals = `Select ${vals.join(',')}`
+
+ fields.push('jskey')
+ fields = fields.join(',')
+
+ _dec = _dec.join(',')
+ _dec = _dec ? _dec + ',' : ''
+
+ let sql = `create table #${sheet} (${_dec}jskey nvarchar(50),BID nvarchar(50) )
+ 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='', @UserName='', @FullName='', @RoleID='', @mk_departmentcode='', @mk_organization='', @mk_user_type='', @mk_nation='', @mk_province='', @mk_city='', @mk_district='', @mk_address=''
+
+ ${_initCustomScript}
+
+ Insert into #${sheet} (${fields},BID)
+
+ /* excel鏁版嵁*/
+ ${vals}
+
+ ${_prevCustomScript}
+
+ ${_backCustomScript}
+
+ drop table #${sheet}
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg
+ `
+
+ sql = sql.replace(/@\$|\$@/ig, '').replace(/\$check@|@check\$/ig, '').replace(/@datam@/ig, `''`).replace(/@typename@/ig, `'debug'`)
+
+ if (workFlow === 'true') {
+ sql = sql.replace(/@works_flow_code@/ig, `'works_flow_code'`)
+ sql = sql.replace(/@works_flow_name@/ig, `'works_flow_name'`)
+ sql = sql.replace(/@works_flow_param@/ig, `'works_flow_param'`)
+ sql = sql.replace(/@works_flow_detail_id@/ig, `'works_flow_detail_id'`)
+ sql = sql.replace(/@status@/ig, `0`)
+ sql = sql.replace(/@statusname@/ig, `'寮�濮�'`)
+ sql = sql.replace(/@work_group@/ig, `'work_group'`)
+ sql = sql.replace(/@work_grade@/ig, '0')
+ sql = sql.replace(/@start_type@/ig, `'寮�濮�'`)
+ }
+
+ if (skip) {
+ this.setState({
+ skip: false,
+ editItem: null
+ }, () => {
+ this.props.scriptsChange(values)
+ })
+ this.props.form.setFieldsValue({
+ sql: ' '
+ })
+ } else {
+ this.setState({loading: true})
+ Api.sDebug(sql).then(res => {
+ if (res.status || res.ErrCode === '-2') {
+ 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
+ })
+ }
+ })
+ }
}
})
}
@@ -214,7 +265,7 @@
})
this.props.form.setFieldsValue({
- sql: ''
+ sql: ' '
})
}
@@ -223,11 +274,25 @@
let _value = ''
if (value === 'default') {
- let fields = usefulfields.filter(item => item.import !== 'false')
- fields = fields.map(col => col.Column).join(',')
+ let fields = []
+ let decls = []
+ usefulfields.forEach(col => {
+ if (col.import === 'false') return
+
+ if (col.type === 'date') {
+ decls.push(`${col.Column} Nvarchar(50)`)
+ } else {
+ decls.push(`${col.Column} ${col.type}`)
+ }
+ fields.push(col.Column)
+ })
+
+ decls = decls.join(',')
+ fields = fields.join(',')
if (fields) {
fields = fields + ','
+ decls = decls + ','
}
let database = btn.sheet.match(/(.*)\.(.*)\.|@db@/ig) || ''
@@ -235,12 +300,33 @@
database = database ? (database[0] || '') : ''
- _value = `Insert into ${database}${sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid@,@username,@fullname,@BID@ From @${sheet}`
+ _value = `/* create table #${sheet} (${decls}jskey nvarchar(50),BID nvarchar(50) ) */\nInsert into ${database}${sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid@,@username,@fullname,@BID@ From #${sheet}`
+ } else if (value === 'flowSql') {
+ let sheet = btn.sheet.replace(/(.*)\.(.*)\.|@db@/ig, '')
+
+ _value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+ select jskey,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+ from #${sheet}
+
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+ select jskey,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+ from #${sheet}
+
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select jskey,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
+ from #${sheet}
+
+ insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone)
+ select jskey,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin'
+ from #${sheet}`
} else {
_value = value
}
let _sql = this.props.form.getFieldValue('sql')
+ if (/^\s+$/.test(_sql)) {
+ _sql = ''
+ }
if (_sql) {
_sql = _sql + `
@@ -259,8 +345,8 @@
}
render() {
- const { systemScripts, btn } = this.props
- const { usefulfields } = this.state
+ const { systemScripts, btn, type, workFlow } = this.props
+ const { usefulfields, editItem, skip } = this.state
const { getFieldDecorator } = this.props.form
const formItemLayout = {
labelCol: {
@@ -276,26 +362,27 @@
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
+ {!type ? <Col span={10}>
+ <Form.Item label="鎶ラ敊瀛楁" style={{margin: 0, whiteSpace: 'nowrap'}}>
+ errorcode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT銆丆NT銆�-2NT锛�, retmsg
</Form.Item>
- </Col>
- <Col span={24} className="sqlfield">
- <Form.Item label={'鍙敤瀛楁'}>
- <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title={'鍏叡鍊硷紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�'}><span style={{color: '#1890ff'}}>BID, ID, LoginUID, SessionUid, UserID, Appkey</span></Tooltip>,
+ </Col> : null}
+ {!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, ID, LoginUID, SessionUid, UserID, Appkey, lang, time_id, typename</span></Tooltip>,
+ {workFlow === 'true' ? <Tooltip mouseLeaveDelay={0.3} mouseEnterDelay={0.3} placement="top" title="宸ヤ綔娴佸彉閲忥紝璇锋寜鐓xxx@鏍煎紡浣跨敤銆�"><span style={{color: '#26C281'}}>works_flow_code, works_flow_name, works_flow_param, works_flow_detail_id, status, statusname, work_group, work_grade, start_type, </span></Tooltip> : null}
<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}
</Form.Item>
- </Col>
- <Col span={8} style={{whiteSpace: 'nowrap'}}>
+ </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>
@@ -310,18 +397,17 @@
</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}
onSelect={this.selectScript}
getPopupContainer={() => document.getElementById('verify-excelin-custom-scripts')}
>
- <Select.Option key="default" value={'default'}>
- 榛樿sql
- </Select.Option>
+ <Select.Option key="default" value="default">榛樿sql</Select.Option>
+ {workFlow === 'true' ? <Select.Option key="flow" value="flowSql">榛樿sql锛堝伐浣滄祦锛�</Select.Option> : null}
<Select.Option key="debugger" value={`z_debug: select @ErrorCode='E',@retmsg='娴嬭瘯鏂偣' goto aaa`}>
娴嬭瘯鏂偣
</Select.Option>
@@ -332,17 +418,21 @@
)}
</Select>
</Form.Item>
- </Col>
- <Col span={6} className="add">
+ </Col> : null}
+ <Col span={5} className="add" style={{paddingTop: '2px', whiteSpace: 'nowrap'}}>
<Button onClick={this.handleConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 40}}>
- 淇濆瓨
+ {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">
{getFieldDecorator('sql', {
initialValue: '',
rules: [
--
Gitblit v1.8.0