From 3659f0773a14b54c18ed0af8b64de4afe8227489 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 十二月 2020 19:31:12 +0800
Subject: [PATCH] 2020-12-04
---
src/tabviews/zshare/cardcomponent/index.jsx | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/zshare/cardcomponent/index.jsx b/src/tabviews/zshare/cardcomponent/index.jsx
index c611f51..9c55d1c 100644
--- a/src/tabviews/zshare/cardcomponent/index.jsx
+++ b/src/tabviews/zshare/cardcomponent/index.jsx
@@ -26,7 +26,7 @@
Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
MenuID: PropTypes.string, // 鑿滃崟ID
setting: PropTypes.object, // 椤甸潰璁惧畾
- logcolumns: PropTypes.array, // 瀛楁鍒�
+ columns: PropTypes.array, // 鏄剧ず鍒�
card: PropTypes.object, // 鍗＄墖璁剧疆淇℃伅
data: PropTypes.object, // 鍗＄墖鏁版嵁
selectKey: PropTypes.string, // 閫夋嫨鍗＄墖鐨勫簭鍙�
@@ -130,7 +130,7 @@
* @description 鑾峰彇鎸夐挳鍏冪礌
*/
getActionList = (actions, show) => {
- const { BID, BData, Tab, setting, logcolumns, ContainerId, data, MenuID, MenuName } = this.props
+ const { BID, BData, Tab, setting, columns, ContainerId, data, MenuID, MenuName } = this.props
return actions.map(item => {
if (['exec', 'prompt', 'pop'].includes(item.OpenType)) {
@@ -143,8 +143,8 @@
show={show}
BData={BData}
setting={setting}
+ columns={columns}
MenuName={MenuName}
- columns={logcolumns}
selectedData={[data]}
ContainerId={ContainerId}
updateStatus={this.props.refreshdata}
@@ -499,7 +499,7 @@
BData={this.props.BData}
setting={this.props.setting}
MenuName={this.props.MenuName}
- columns={this.props.logcolumns}
+ columns={this.props.columns}
selectedData={[]}
ContainerId={this.props.ContainerId}
updateStatus={this.props.refreshdata}
@@ -519,7 +519,7 @@
MenuID: PropTypes.string, // 鑿滃崟ID
MenuName: PropTypes.any, // 鑿滃崟鍚嶇О
config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
- logcolumns: PropTypes.array, // 鏄剧ず鍒�
+ columns: PropTypes.array, // 鏄剧ず鍒�
ContainerId: PropTypes.any, // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
plot: PropTypes.object,
tableId: PropTypes.string,
@@ -762,7 +762,7 @@
}
render() {
- const { plot, data, loading, BID, BData, Tab, MenuID, config, logcolumns, ContainerId, MenuName } = this.props
+ const { plot, data, loading, BID, BData, Tab, MenuID, config, columns, ContainerId, MenuName } = this.props
const { card, colMap, selectKey, actionList } = this.state
return (
@@ -820,9 +820,9 @@
BData={BData}
MenuID={MenuID}
colMap={colMap}
+ columns={columns}
MenuName={MenuName}
selectKey={selectKey}
- logcolumns={logcolumns}
setting={config.setting}
ContainerId={ContainerId}
switchCard={this.switchCard}
--
Gitblit v1.8.0