From f3ec8c20eeabee6eaab1508d2f3896c28aab611c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 七月 2021 14:42:42 +0800
Subject: [PATCH] 修改页面中按钮保存
---
src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx
index d690943..fa3d829 100644
--- a/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx
@@ -7,7 +7,7 @@
* @return {Object} setting 椤甸潰璁剧疆
* @return {Array} columns 鏄剧ず瀛楁
*/
- static getDebugSql (setting, scripts, columns, searches, calendar) {
+ static getDebugSql (setting, scripts, columns, searches, calendar, urlFields = []) {
let sql = ''
let _dataresource = ''
let _customScript = ''
@@ -22,27 +22,36 @@
}
if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50) select @ErrorCode='',@retmsg =''
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
${_customScript}
`
}
if (setting.execute !== 'false') {
- _dataresource = setting.dataresource
+ _dataresource = setting.dataresource || ''
+ }
+
+ if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ window.GLOB.funcs.forEach(item => {
+ let reg = new RegExp('\\$ex@' + item.func_code + '@ex\\$', 'ig')
+ _dataresource = _dataresource.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
+ _customScript = _customScript.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
+ })
}
- if (_dataresource) {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- }
- if (_customScript) {
- _customScript = _customScript.replace(/@\$|\$@/ig, '')
- }
+ _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
+ _customScript = _customScript.replace(/@\$|\$@/ig, '')
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
_dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
_customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
}
+
+ urlFields.forEach(field => {
+ _dataresource = _dataresource.replace(new RegExp('@' + field + '@', 'ig'), '0')
+ _customScript = _customScript.replace(new RegExp('@' + field + '@', 'ig'), '0')
+ })
// 姝ｅ垯鏇挎崲
let _regoptions = []
@@ -62,13 +71,23 @@
_regoptions.push({
reg: new RegExp('@calendarDate@', 'ig'),
value: `'1970-01-01 00:00:00.000'`
- })
- _regoptions.push({
+ }, {
reg: new RegExp('@calendarDate1@', 'ig'),
value: `'2030-12-31 23:59:59.999'`
})
}
+ _regoptions.push({
+ reg: new RegExp('@login_city@', 'ig'),
+ value: `''`
+ }, {
+ reg: new RegExp('@userName@', 'ig'),
+ value: `''`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `''`
+ })
+
if ((setting.queryType === 'statistics' || calendar.refresh === 'true') && _dataresource) {
_regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
--
Gitblit v1.8.0