From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/utils.jsx | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index d3a042f..7dc431d 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -7,7 +7,7 @@
* @return {Object} setting 椤甸潰璁剧疆
* @return {Array} columns 鏄剧ず瀛楁
*/
- static getDebugSql (setting, scripts, columns, searches = [], defSearch) {
+ static getDebugSql (setting, scripts, columns, searches = [], defSearch, timestamp) {
let sql = ''
let error = ''
let _dataresource = ''
@@ -40,6 +40,9 @@
// error = '绯荤粺鍑芥暟' + _customScript.match(/\$ex@.{1,50}@ex\$/g)[0].replace(/\$ex@|@ex\$/g, '') + '鏈畾涔�'
// }
+ _dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${timestamp}'`)
+ _customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${timestamp}'`)
+
_dataresource = _dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
_dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
@@ -51,7 +54,7 @@
_dataresource = _dataresource.replace(/@sum\$/ig, '@sum$*/')
if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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) select @ErrorCode='',@retmsg =''
${_customScript}
`
}
@@ -65,8 +68,8 @@
if (window.GLOB.urlFields) {
window.GLOB.urlFields.forEach(field => {
let reg = new RegExp('@' + field + '@', 'ig')
- _dataresource = _dataresource.replace(reg, '0')
- _customScript = _customScript.replace(reg, '0')
+ _dataresource = _dataresource.replace(reg, `'0'`)
+ _customScript = _customScript.replace(reg, `'0'`)
})
}
@@ -137,8 +140,6 @@
if (_customScript) {
_regoptions.push({
- reg: new RegExp('@login_city@', 'ig'),
- }, {
reg: new RegExp('@orderBy@', 'ig'),
}, {
reg: new RegExp('@UserName@', 'ig'),
@@ -156,27 +157,6 @@
_customScript = _customScript.replace(item.reg, '0')
originscript = originscript.replace(item.reg, '0')
})
-
- if (setting.varMark) {
- originscript = originscript.replace(/@ErrorCode/ig, '')
- originscript = originscript.replace(/@retmsg/ig, '')
- originscript = originscript.replace(/@UserName@/ig, '').replace(/@UserName/ig, '')
- originscript = originscript.replace(/@FullName@/ig, '').replace(/@FullName/ig, '')
- originscript = originscript.replace(/@login_city@/ig, '').replace(/@login_city/ig, '')
- originscript = originscript.replace(/@id@/ig, '').replace(/@id/ig, '')
- originscript = originscript.replace(/@bid@/ig, '').replace(/@bid/ig, '')
- originscript = originscript.replace(/@loginuid@/ig, '').replace(/@loginuid/ig, '')
- originscript = originscript.replace(/@sessionuid@/ig, '').replace(/@sessionuid/ig, '')
- originscript = originscript.replace(/@userid@/ig, '').replace(/@userid/ig, '')
- originscript = originscript.replace(/@appkey@/ig, '').replace(/@appkey/ig, '')
- originscript = originscript.replace(/@time_id@/ig, '').replace(/@time_id/ig, '')
-
- originscript = originscript.replace(new RegExp('@' + setting.varMark, 'ig'), '')
-
- if (/@/ig.test(originscript)) {
- error = '浣跨敤浜嗗彉閲忔爣璇嗗鐨勫瓧娈碉紒'
- }
- }
}
let sumSql = ''
@@ -194,6 +174,7 @@
`
} else {
sumSql = `/* sql sum楠岃瘉 */
+ declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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) select @ErrorCode='',@retmsg =''
${_sql}`
}
}
@@ -221,6 +202,7 @@
`
} else {
sql = `/* sql 楠岃瘉 */
+ declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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) select @ErrorCode='',@retmsg =''
${_dataresource}`
}
sql = sql.replace(/\n\s{8}/ig, '\n')
--
Gitblit v1.8.0