From 523cec6c87d88b43954a4409a8dfde6aade095a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 22 五月 2020 11:02:10 +0800
Subject: [PATCH] 2020-05-22
---
src/tabviews/subtable/index.jsx | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index ee34591..f753cea 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -62,7 +62,7 @@
orderBy: '', // 鎺掑簭
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
popAction: false, // 寮规椤甸潰锛屾寜閽俊鎭�
- popData: false, // 寮规椤甸潰锛屾墍閫夌殑琛ㄦ牸鏁版嵁
+ popData: null, // 寮规椤甸潰锛屾墍閫夌殑琛ㄦ牸鏁版嵁
visible: false, // 寮规鏄剧ず闅愯棌鎺у埗
pickup: false, // 瀛愯〃鏁版嵁闅愯棌鏄剧ず鍒囨崲
triggerBtn: null, // 鎸夐挳瑙﹀彂
@@ -935,7 +935,7 @@
<TabPane tab={<Icon type={item.icon} />} key={item.uuid}></TabPane>
))}
</Tabs> : null}
- {config.expand && config.charts.map(item => {
+ {config.charts.map(item => {
if (!config.expand && chartId !== item.uuid) return null
if (item.chartType === 'table') {
return (
@@ -1017,13 +1017,12 @@
destroyOnClose
>
{<SubTabTable
- BID={this.props.BID}
+ BID={this.state.popData ? this.state.popData[setting.primaryKey] : this.props.BID}
menuType={this.props.menuType}
- BData={this.props.BData}
+ BData={this.state.popData || this.props.BData}
SupMenuID={this.props.MenuID}
ContainerId={this.props.ContainerId}
MenuID={this.state.popAction.linkTab}
- ID={this.state.popData ? this.state.popData[setting.primaryKey] : ''}
refreshSupView={this.reloadtable}
/>}
</Modal>
--
Gitblit v1.8.0