From 11b6387d74467f81e33eba8f882bff610f240115 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 九月 2023 20:01:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/zshare/verifycard/customscript/index.jsx | 57 ++++++++++++++++++++++-----------------------------------
1 files changed, 22 insertions(+), 35 deletions(-)
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index 3f41300..bf078be 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -2,7 +2,6 @@
import PropTypes from 'prop-types'
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'
@@ -172,44 +171,29 @@
}
}
- let param = {
- func: 's_debug_sql',
- exec_type: 'y',
- LText: this.props.initsql + _initCustomScript + _prevCustomScript + _backCustomScript + tail
- }
+ let sql = this.props.initsql + _initCustomScript + _prevCustomScript + _backCustomScript + tail
if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
window.GLOB.funcs.forEach(item => {
let reg = new RegExp('\\$ex@' + item.func_code + '@ex\\$', 'ig')
- param.LText = param.LText.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
+ sql = sql.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
})
}
// 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
- // check
- param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
-
- // 澶栬仈鏁版嵁搴撴浛鎹�
- if (window.GLOB.externalDatabase !== null) {
- param.LText = param.LText.replace(/@db@/ig, window.GLOB.externalDatabase)
- }
-
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.LText = param.LText.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'${param.timestamp}'`)
+ sql = sql.replace(/@\$|\$@/ig, '').replace(/\$check@|@check\$/ig, '')
+ sql = sql.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'1949-10-01 15:00:00'`)
if (window.GLOB.process && workFlow === 'true') {
- param.LText = param.LText.replace(/@works_flow_code@/ig, `'${param.timestamp}'`)
- param.LText = param.LText.replace(/@works_flow_name@/ig, `'${param.timestamp}'`)
- param.LText = param.LText.replace(/@works_flow_param@/ig, `'${param.timestamp}'`)
- param.LText = param.LText.replace(/@works_flow_detail_id@/ig, `'${param.timestamp}'`)
+ sql = sql.replace(/@works_flow_code@/ig, `'1949-10-01 15:00:00'`)
+ sql = sql.replace(/@works_flow_name@/ig, `'1949-10-01 15:00:00'`)
+ sql = sql.replace(/@works_flow_param@/ig, `'1949-10-01 15:00:00'`)
+ sql = sql.replace(/@works_flow_detail_id@/ig, `'1949-10-01 15:00:00'`)
+ sql = sql.replace(/@status@/ig, `'1949-10-01 15:00:00'`)
+ sql = sql.replace(/@statusname@/ig, `'1949-10-01 15:00:00'`)
+ sql = sql.replace(/@work_group@/ig, `'1949-10-01 15:00:00'`)
+ sql = sql.replace(/@work_grade@/ig, `'1949-10-01 15:00:00'`)
}
-
- console.info(`/* sql 楠岃瘉 */\n${param.LText.replace(/\n\s{6,20}/ig, '\n')}`)
-
- param.LText = param.LText.replace(/\n/g, ' ')
- param.LText = Utils.formatOptions(param.LText)
- param.secretkey = Utils.encrypt('', param.timestamp)
if (skip) {
this.setState({
@@ -223,8 +207,8 @@
})
} else {
this.setState({loading: true})
- Api.genericInterface(param).then(res => {
- if (res.status) {
+ Api.sDebug(sql).then(res => {
+ if (res.status || res.ErrCode === '-2') {
this.setState({
loading: false,
editItem: null
@@ -274,12 +258,15 @@
if (value === 'flowSql') {
if (flowType === 'start') {
- value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
- select @ID@,@works_flow_code@,@works_flow_param@,'鑱屽憳鍒嗙粍',@works_flow_detail_id@,'鑱屽憳绛夌骇',@bid@,@UserID@,@UserName,@FullName
- insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,status,statuscharone,statuschartwo,StatusCharThree,StatusCharFour,StatusCharFive,statusname,remark,CreateUserID,CreateUser,CreateStaff,works_flow_detail_id,sort,upid,work_group,work_grade,typecharone,deleted,statusname_suc,statusname_back )`
+ value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
+ select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName
+ 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)
+ select @works_flow_id@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@`
} else {
- value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
- select @ID@,@works_flow_code@,@works_flow_param@,'鑱屽憳鍒嗙粍',@works_flow_detail_id@,'鑱屽憳绛夌骇',@bid@,@UserID@,@UserName,@FullName`
+ value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
+ select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName
+ 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)
+ select @works_flow_id@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@`
}
value = value.replace(/\n\s{8}/g, '\n')
--
Gitblit v1.8.0