From d3172b799eccdf7fa69050a0f2d596309bd78059 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 03 六月 2020 18:48:46 +0800
Subject: [PATCH] 2020-06-03
---
src/tabviews/zshare/actionList/index.jsx | 87 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index 4724344..b64d801 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -1143,7 +1143,16 @@
}
} else if (btn.sql) {
param.ID = primaryId
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param, data[0], logcolumns, this.props.Tab)) // 鏁版嵁婧�
+ param.LText = Utils.getSysDefaultSql(btn, setting, '', param, data[0], logcolumns, this.props.Tab) // 鏁版嵁婧�
+
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ param.LText = param.LText.replace(/\$@/ig, '/*')
+ param.LText = param.LText.replace(/@\$/ig, '*/')
+ } else {
+ param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ }
+
+ param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -1170,12 +1179,30 @@
}
param.ID = primaryId || Utils.getguid()
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], logcolumns, this.props.Tab)) // 鏁版嵁婧�
+ param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], logcolumns, this.props.Tab) // 鏁版嵁婧�
+
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ param.LText = param.LText.replace(/\$@/ig, '/*')
+ param.LText = param.LText.replace(/@\$/ig, '*/')
+ } else {
+ param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ }
+
+ param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
} else if (btn.sql) {
param.ID = primaryId
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], logcolumns, this.props.Tab)) // 鏁版嵁婧�
+ param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, data[0], logcolumns, this.props.Tab) // 鏁版嵁婧�
+
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ param.LText = param.LText.replace(/\$@/ig, '/*')
+ param.LText = param.LText.replace(/@\$/ig, '*/')
+ } else {
+ param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ }
+
+ param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -1218,7 +1245,16 @@
}
} else if (btn.sql) {
param.ID = primaryId
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, '', param, cell, logcolumns, this.props.Tab)) // 鏁版嵁婧�
+ param.LText = Utils.getSysDefaultSql(btn, setting, '', param, cell, logcolumns, this.props.Tab) // 鏁版嵁婧�
+
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ param.LText = param.LText.replace(/\$@/ig, '/*')
+ param.LText = param.LText.replace(/@\$/ig, '*/')
+ } else {
+ param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ }
+
+ param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -1244,12 +1280,30 @@
}
} else if (btn.sql && btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
param.ID = _formPrimaryId || Utils.getguid()
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, cell, logcolumns, this.props.Tab)) // 鏁版嵁婧�
+ param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, cell, logcolumns, this.props.Tab) // 鏁版嵁婧�
+
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ param.LText = param.LText.replace(/\$@/ig, '/*')
+ param.LText = param.LText.replace(/@\$/ig, '*/')
+ } else {
+ param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ }
+
+ param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
} else if (btn.sql) {
param.ID = primaryId
- param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, cell, logcolumns, this.props.Tab)) // 鏁版嵁婧�
+ param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, cell, logcolumns, this.props.Tab) // 鏁版嵁婧�
+
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ param.LText = param.LText.replace(/\$@/ig, '/*')
+ param.LText = param.LText.replace(/@\$/ig, '*/')
+ } else {
+ param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ }
+
+ param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
}
@@ -1868,6 +1922,13 @@
param.BID = this.props.BID
}
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ result.sql = result.sql.replace(/\$@/ig, '/*')
+ result.sql = result.sql.replace(/@\$/ig, '*/')
+ } else {
+ result.sql = result.sql.replace(/@\$|\$@/ig, '')
+ }
+
param.LText = Utils.formatOptions(result.sql)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -2424,9 +2485,23 @@
param.custom_script = param.custom_script.replace(item.reg, item.value)
})
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ param.custom_script = param.custom_script.replace(/\$@/ig, '/*')
+ param.custom_script = param.custom_script.replace(/@\$/ig, '*/')
+ } else {
+ param.custom_script = param.custom_script.replace(/@\$|\$@/ig, '')
+ }
+
param.custom_script = Utils.formatOptions(param.custom_script)
}
+ if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ LText = LText.replace(/\$@/ig, '/*')
+ LText = LText.replace(/@\$/ig, '*/')
+ } else {
+ LText = LText.replace(/@\$|\$@/ig, '')
+ }
+
param.LText = Utils.formatOptions(LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
--
Gitblit v1.8.0