From ecbe0dc46ce2b8f607b9afd063104adeb7f10fe8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 三月 2021 15:19:31 +0800
Subject: [PATCH] 2021-03-30
---
src/menu/datasource/verifycard/utils.jsx | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 0857ae5..3497b15 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -23,27 +23,39 @@
}
if (setting.interType === 'system' && setting.execute !== 'false') {
- _dataresource = setting.dataresource
+ _dataresource = setting.dataresource || ''
}
- if (_dataresource) {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- }
- if (_customScript) {
- _customScript = _customScript.replace(/@\$|\$@/ig, '')
- }
+ _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
+ _customScript = _customScript.replace(/@\$|\$@/ig, '')
if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50) select @ErrorCode='',@retmsg =''
${_customScript}
`
}
+
+ // 澶栬仈鏁版嵁搴撴浛鎹�
+ if (window.GLOB.externalDatabase !== null) {
+ _dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
+ _customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
+
+ 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')
+ })
+ }
+
// 姝ｅ垯鏇挎崲
let _regoptions = []
let _fields = []
searches.forEach(item => {
+ if (!item.field) return
if (item.datefield) {
_regoptions.push({
var: new RegExp('@' + item.datefield, 'ig'),
@@ -108,6 +120,14 @@
var: new RegExp('@orderBy', 'ig'),
reg: new RegExp('@orderBy@', 'ig'),
})
+ _regoptions.push({
+ var: new RegExp('@UserName', 'ig'),
+ reg: new RegExp('@UserName@', 'ig'),
+ })
+ _regoptions.push({
+ var: new RegExp('@FullName', 'ig'),
+ reg: new RegExp('@FullName@', 'ig'),
+ })
if (setting.laypage !== 'false') {
_regoptions.push({
var: new RegExp('@pageSize', 'ig'),
--
Gitblit v1.8.0