From 32b84012bb8e2f05295c4237d17224700b149c8f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 十二月 2020 16:33:27 +0800
Subject: [PATCH] merge 2020-12-31
---
src/menu/datasource/verifycard/utils.jsx | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 6b8a526..e51952b 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -23,21 +23,23 @@
}
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),@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)
+ }
// 姝ｅ垯鏇挎崲
let _regoptions = []
--
Gitblit v1.8.0