From 89f85223ff7b1b5ee3931ae01efa3dd17d5524fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:03:27 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/printbutton/index.jsx | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index f9fc037..9caedab 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -27,7 +27,6 @@
MenuID: PropTypes.string, // 鑿滃崟ID
btn: PropTypes.object, // 鎸夐挳
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
- ContainerId: PropTypes.any, // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
disabled: PropTypes.any, // 琛屾寜閽鐢�
}
@@ -835,9 +834,17 @@
}
}
} else {
- if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- res.rduri = window.GLOB.mainSystemApi
- } else if (btn.sysInterface !== 'true') {
+ if (btn.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ res.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (btn.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ res.$token = btn.exProInterface || ''
+ } else {
+ res.$token = btn.exInterface || ''
+ }
+ } else {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
res.rduri = btn.proInterface
} else {
@@ -1658,7 +1665,7 @@
* @description 鏄剧ず妯℃�佹
*/
getModels = () => {
- const { setting, BID, btn } = this.props
+ const { BID, btn } = this.props
const { btnconfig } = this.state
if (!this.state.visible || !btnconfig || !btnconfig.setting) return null
@@ -1668,12 +1675,9 @@
let clickouter = false
let container = document.body
- if (
- (setting.tabType === 'main' && btnconfig.setting.container === 'tab' && this.props.ContainerId) ||
- (btnconfig.setting.container === 'tab' && btn.ContainerId)
- ) {
+ if (btnconfig.setting.container === 'tab' && btn.ContainerId) {
width = btnconfig.setting.width > 100 ? btnconfig.setting.width : btnconfig.setting.width + '%'
- container = () => document.getElementById(this.props.ContainerId || btn.ContainerId)
+ container = () => document.getElementById(btn.ContainerId)
}
if (btnconfig.setting.clickouter === 'close') {
--
Gitblit v1.8.0