From dbdb4aa83f82e0b8fc797d36cb8d5dc01e39e6b6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 四月 2021 23:54:37 +0800
Subject: [PATCH] 2021-04-22
---
src/utils/utils.js | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 87e45c3..28da85a 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -729,6 +729,11 @@
sql = sql.replace(/@\$|\$@/ig, '')
}
+ // 澶栬仈鏁版嵁搴撴浛鎹�
+ if (window.GLOB.externalDatabase !== null) {
+ sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
+
if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
console.info(sql)
}
@@ -1059,6 +1064,7 @@
let datavars = {} // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
let _actionType = null
let _callbacksql = ''
+ let foreignKey = tab && tab.foreignKey ? tab.foreignKey.toLowerCase() : ''
if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
_actionType = btn.sqlType
@@ -1430,9 +1436,9 @@
if (_key === 'bid' && !datavars.bid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
_fval = '@BID@'
}
- if (_key === 'bid' && tab && tab.foreignKey) {
- arr.push(tab.foreignKey.toLowerCase())
- _fieldValue.push(`${tab.foreignKey}=${_fval}`)
+ if (_key === 'bid' && foreignKey) {
+ arr.push(foreignKey)
+ _fieldValue.push(`${foreignKey}=${_fval}`)
} else {
arr.push(_key)
_fieldValue.push(`${_key}=${_fval}`)
@@ -1553,14 +1559,14 @@
values.push('@fullname')
}
if (!keys.includes('bid')) {
- if (tab && tab.foreignKey && !keys.includes(tab.foreignKey.toLowerCase())) {
- keys.push(tab.foreignKey.toLowerCase())
+ if (foreignKey && !keys.includes(foreignKey)) {
+ keys.push(foreignKey)
} else {
keys.push('bid')
}
values.push('@BID@')
- } else if (tab && tab.foreignKey && !keys.includes(tab.foreignKey.toLowerCase())) {
- keys.push(tab.foreignKey.toLowerCase())
+ } else if (foreignKey && !keys.includes(foreignKey)) {
+ keys.push(foreignKey)
values.push('@BID@')
}
--
Gitblit v1.8.0