From 151d3aee0218a3eb6b928b0b327be6cd9ac7652c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 七月 2021 16:02:07 +0800
Subject: [PATCH] 2021-07-01
---
src/menu/datasource/verifycard/utils.jsx | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 9bb5840..3b3b266 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -26,8 +26,20 @@
_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*/`)
+ })
+ }
+
_dataresource = _dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
+ _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
+ _customScript = _customScript.replace(/@select\$|\$select@/ig, '')
+ _dataresource = _dataresource.replace(/@sum\$|\$sum@/ig, '')
+ _customScript = _customScript.replace(/@sum\$|\$sum@/ig, '')
if (_customScript) {
_customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
@@ -48,8 +60,7 @@
_customScript = _customScript.replace(reg, '0')
})
}
-
-
+
// 姝ｅ垯鏇挎崲
let _regoptions = []
let _fields = []
@@ -140,6 +151,9 @@
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, '')
--
Gitblit v1.8.0