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/tabviews/zshare/actionList/normalbutton/index.jsx | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 35ea599..d6c03af 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -943,7 +943,7 @@
}
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
- _option.sql = _option.sql.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+ _option.sql = _option.sql.replace(/@db@/ig, window.GLOB.externalDatabase)
}
cell.data_sql = Utils.formatOptions(_option.sql)
@@ -1100,7 +1100,7 @@
* @description 鏄剧ず妯℃�佹
*/
getModels = () => {
- const { setting, BID } = this.props
+ const { setting, BID, btn } = this.props
const { btnconfig } = this.state
if (!this.state.visible || !btnconfig || !btnconfig.setting) return null
@@ -1110,9 +1110,12 @@
let clickouter = false
let container = document.body
- if (setting.tabType === 'main' && btnconfig.setting.container === 'tab' && this.props.ContainerId) {
+ if (
+ (setting.tabType === 'main' && btnconfig.setting.container === 'tab' && this.props.ContainerId) ||
+ (btnconfig.setting.container === 'tab' && btn.ContainerId)
+ ) {
width = btnconfig.setting.width + '%'
- container = () => document.getElementById(this.props.ContainerId)
+ container = () => document.getElementById(this.props.ContainerId || btn.ContainerId)
}
if (btnconfig.setting.clickouter === 'close') {
--
Gitblit v1.8.0