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/templates/sharecomponent/settingcomponent/settingform/utils.jsx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index b58ffb7..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 += `
@@ -33,6 +33,11 @@
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 => {
--
Gitblit v1.8.0