From 696d85238a734a4b691f486fde05c93fc5dba3ab Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 一月 2021 19:16:18 +0800
Subject: [PATCH] 2021-01-07
---
src/tabviews/zshare/actionList/popupbutton/index.jsx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index c29a385..2a5c6fa 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -11,8 +11,9 @@
import './index.scss'
const SubTabTable = asyncSpinComponent(() => import('@/tabviews/subtabtable'))
+const CustomPage = asyncSpinComponent(() => import('@/tabviews/custom'))
-class NormalButton extends Component {
+class PopupButton extends Component {
static propTpyes = {
show: PropTypes.any, // 鎸夐挳鏄剧ず鏍峰紡鎺у埗
position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
@@ -154,7 +155,7 @@
onClick={() => {this.actionTrigger()}}
>{show === 'icon' && btn.icon ? '' : btn.label}</Button> : null}
<Modal
- className="popview-modal"
+ className={'popview-modal ' + (btn.$menuId ? 'custom-popview' : '')}
title={btn.label}
width={'80vw'}
maskClosable={false}
@@ -165,14 +166,15 @@
]}
destroyOnClose
>
- <SubTabTable
+ {!btn.$menuId ? <SubTabTable
Tab={btn}
MenuID={btn.linkTab}
BID={popData ? primaryId : this.props.BID}
BData={popData || this.props.BData}
SupMenuID={this.props.MenuID}
refreshSupView={this.reloadtable}
- />
+ /> : null}
+ {btn.$menuId ? <CustomPage MenuID={btn.uuid} param={{BID: (popData ? primaryId : this.props.BID), data: (popData || this.props.BData)}} /> : null}
</Modal>
</div>
)
@@ -189,4 +191,4 @@
return {}
}
-export default connect(mapStateToProps, mapDispatchToProps)(NormalButton)
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps)(PopupButton)
\ No newline at end of file
--
Gitblit v1.8.0