From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21
---
src/tabviews/zshare/actionList/popupbutton/index.jsx | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index 6456eb3..4449ae5 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -12,6 +12,7 @@
const SubTabTable = asyncSpinComponent(() => import('@/tabviews/subtabtable'))
const CustomPage = asyncSpinComponent(() => import('@/tabviews/custom'))
+const PopView = asyncSpinComponent(() => import('@/tabviews/custom/popview'))
class PopupButton extends Component {
static propTpyes = {
@@ -244,7 +245,7 @@
ratio = ratio + 'vw'
}
return <Modal
- className={'popview-modal ' + (btn.$view === 'CustomPage' ? 'custom-popview' : '')}
+ wrapClassName={'popview-modal ' + (!btn.$view ? '' : 'custom-popview')}
title={btn.label}
width={ratio}
maskClosable={btn.clickouter === 'close'}
@@ -255,14 +256,9 @@
]}
destroyOnClose
>
- {btn.$view !== 'CustomPage' ? <SubTabTable
- Tab={btn}
- MenuID={btn.linkTab}
- SupMenuID={this.props.MenuID}
- BID={popData ? primaryId : this.props.BID}
- BData={popData || this.props.BData}
- /> : null}
+ {!btn.$view ? <SubTabTable Tab={btn} MenuID={btn.linkTab} SupMenuID={this.props.MenuID} BID={popData ? primaryId : this.props.BID} BData={popData || this.props.BData}/> : null}
{btn.$view === 'CustomPage' ? <CustomPage Tab={btn} MenuID={btn.uuid} MenuName={btn.label} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
+ {btn.$view === 'popview' ? <PopView Tab={btn} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
</Modal>
} else {
let height = '100vh'
@@ -288,7 +284,7 @@
return (
<Drawer
title={btn.label}
- className={btn.$view === 'CustomPage' ? 'custom-drawer-popview' : 'table-drawer-popview'}
+ className={!btn.$view ? 'table-drawer-popview' : 'custom-drawer-popview' }
width={width}
height={height}
maskClosable={btn.clickouter === 'close'}
@@ -297,14 +293,9 @@
placement={btn.placement || 'right'}
destroyOnClose
>
- {btn.$view !== 'CustomPage' ? <SubTabTable
- Tab={btn}
- MenuID={btn.linkTab}
- SupMenuID={this.props.MenuID}
- BID={popData ? primaryId : this.props.BID}
- BData={popData || this.props.BData}
- /> : null}
+ {!btn.$view ? <SubTabTable Tab={btn} MenuID={btn.linkTab} SupMenuID={this.props.MenuID} BID={popData ? primaryId : this.props.BID} BData={popData || this.props.BData}/> : null}
{btn.$view === 'CustomPage' ? <CustomPage Tab={btn} MenuName={btn.label} MenuID={btn.uuid} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
+ {btn.$view === 'popview' ? <PopView Tab={btn} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
<div className="close-drawer">
<Button onClick={this.popclose}>
鍏抽棴
--
Gitblit v1.8.0