From f8c3c53f9e29541f8c0e3fcbf682c301fd17e06a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十一月 2020 17:49:23 +0800
Subject: [PATCH] 2020-11-23
---
src/utils/utils.js | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 02e850e..4deb649 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -163,6 +163,10 @@
})
// 鏇挎崲%绗︼紙鏁版嵁搴撲腑瑙ｆ瀽鍚巗ql鎶ラ敊锛�
value = value.replace(/%/ig, ' mpercent ')
+ // 澶栬仈鏁版嵁搴撴浛鎹�
+ if (window.GLOB.externalDatabase !== null) {
+ value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+ }
// encode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛�
value = window.btoa(window.encodeURIComponent(value))
// 鎻掑叆瀛楃
@@ -230,6 +234,10 @@
// 1銆佹浛鎹�%绗︼紙鏁版嵁搴撲腑瑙ｆ瀽鍚巗ql鎶ラ敊锛�
value = value.replace(/%/ig, ' mpercent ')
+ // 澶栬仈鏁版嵁搴撴浛鎹�
+ if (window.GLOB.externalDatabase !== null) {
+ value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+ }
let encodesql = (val) => {
if (!val) return ''
@@ -634,9 +642,7 @@
} else {
baseurl = window.GLOB.location + window.GLOB.service
}
- // if (!/Content\/images\/upload\//.test(url)) {
- // baseurl = baseurl + 'Content/images/upload/'
- // }
+
let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
return realurl
}
@@ -689,7 +695,7 @@
if (item.orderBy) {
sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} ) a order by orderfield ${item.orderType}`
} else {
- sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource})`
+ sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
}
return {
--
Gitblit v1.8.0