From 6d0137932fcc8f9848123743c1aad5cff8172d8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 09 二月 2020 13:09:39 +0800
Subject: [PATCH] 2020-02-09
---
src/tabviews/subtable/index.jsx | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index cf38080..ad821f1 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -24,6 +24,7 @@
BData: PropTypes.any, // 涓婄骇鏁版嵁
MenuID: PropTypes.string, // 鑿滃崟Id
SupMenuID: PropTypes.string, // 涓婄骇鑿滃崟Id
+ ContainerId: PropTypes.any, // 涓夌骇鑿滃崟Container(html) ID
handleTableId: PropTypes.func, // 鎺у埗琛ㄦ牸鏁版嵁鍒囨崲鏃讹紝鏇存柊鍦ㄤ富琛ㄤ腑鐨刬d
handleMainTable: PropTypes.func // 鎺у埗琛ㄦ牸鏁版嵁鍒囨崲鏃讹紝鏇存柊鍦ㄤ富琛ㄤ腑鐨刬d
}
@@ -37,7 +38,7 @@
searchlist: null, // 鎼滅储鏉′欢
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- logcolumns: null, // 鏃ュ織涓樉绀虹殑鍒椾俊鎭�
+ logcolumns: null, // 鏃ュ織涓樉绀虹殑鍒椾俊鎭� (澧炲姞鑷冲叏閮ㄥ垪锛岄櫎鍘诲悎骞跺垪)
arr_field: '', // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: null, // 鍒楄〃鏁版嵁闆�
@@ -117,10 +118,7 @@
if (col.field) {
_arrField.push(col.field)
- // 绛涢�夊嚭鏃ュ織涓殑鏄剧ず鍒楋紝鍙栧墠鍥涗釜
- if (col.Hide !== 'true' && _logcolumns.length < 4) {
- _logcolumns.push(col)
- }
+ _logcolumns.push(col)
}
if (col.type === 'colspan' && col.sublist) { // 绛涢�夐殣钘忓垪
_hideCol = _hideCol.concat(col.sublist)
@@ -659,6 +657,7 @@
dict={this.state.dict}
MenuID={this.props.SupMenuID}
logcolumns={this.state.logcolumns}
+ ContainerId={this.props.ContainerId}
refreshdata={this.refreshbyaction}
triggerPopview={this.triggerPopview}
gettableselected={this.gettableselected}
@@ -691,7 +690,15 @@
]}
destroyOnClose
>
- {<SubTabTable SupMenuID={this.props.MenuID} MenuID={this.state.popAction.linkTab} BID={this.props.BID} ID={this.state.popData ? this.state.popData[setting.primaryKey] : ''} refreshSupView={this.reloadtable} />}
+ {<SubTabTable
+ BID={this.props.BID}
+ BData={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>
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
--
Gitblit v1.8.0