From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02
---
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 8e159b0..3bd809f 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -18,7 +18,7 @@
})
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}
`
}
@@ -27,12 +27,13 @@
_dataresource = ''
}
- if (_dataresource) {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- }
- if (_customScript) {
- _customScript = _customScript.replace(/@\$|\$@/ig, '')
- }
+ _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 (window.GLOB.externalDatabase !== null) {
_dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
@@ -49,6 +50,9 @@
})
_regoptions.push({
+ reg: new RegExp('@login_city@', 'ig'),
+ value: `''`
+ }, {
reg: new RegExp('@userName@', 'ig'),
value: `''`
}, {
@@ -130,13 +134,13 @@
})
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}
`
}
_customScript = _customScript.replace(/@\$|\$@/ig, '')
- _customScript = _customScript.replace(/@userName@|@fullName@/ig, `''`)
+ _customScript = _customScript.replace(/@userName@|@fullName@|@login_city@/ig, `''`)
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
_customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
--
Gitblit v1.8.0