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 |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 6b8a526..3497b15 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -23,21 +23,32 @@
     }
 
     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)
+    }
+
+    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')
+      })
+    }
+    
     
     // 姝e垯鏇挎崲
     let _regoptions = []

--
Gitblit v1.8.0