From c62724a2cdbafa3c660538955acbedafa5a01871 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 01 六月 2024 15:25:21 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx index e63f73f..ab01815 100644 --- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx +++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx @@ -81,7 +81,7 @@ } handleConfirm = () => { - const { type, btn } = this.props + const { type, btn, workFlow } = this.props const { editItem, skip } = this.state // 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭� @@ -169,6 +169,18 @@ let sql = this.state.verifySql + _initCustomScript + _prevCustomScript + _backCustomScript + tail 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, @@ -233,6 +245,24 @@ database = database ? (database[0] || '') : '' _value = `Insert 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 } @@ -259,7 +289,7 @@ } render() { - const { systemScripts, btn, type } = this.props + const { systemScripts, btn, type, workFlow } = this.props const { usefulfields, editItem, skip } = this.state const { getFieldDecorator } = this.props.form const formItemLayout = { @@ -289,6 +319,7 @@ {!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, 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> @@ -319,9 +350,8 @@ 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> -- Gitblit v1.8.0