From 158a48ac7861279c02c01d1020ef54ce94e62770 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 04 一月 2021 14:20:14 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 273f935..9bde95a 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -9,7 +9,7 @@
*/
static getDebugSql (setting, scripts, arr_field, regoptions, search) {
let sql = ''
- let _dataresource = setting.dataresource
+ let _dataresource = setting.dataresource || ''
let _customScript = ''
scripts && scripts.forEach(script => {
_customScript += `
@@ -18,7 +18,7 @@
})
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}
`
}
@@ -33,12 +33,17 @@
if (_customScript) {
_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)
+ }
// 姝ｅ垯鏇挎崲
let _regoptions = regoptions.map(item => {
return {
reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'${item.value}'`
+ value: `'0'`
}
})
--
Gitblit v1.8.0