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/custom/components/table/normal-table/index.jsx | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index e073a75..6dc10dc 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -34,7 +34,6 @@
searchlist: null, // 鎼滅储鏉′欢
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- logcolumns: null, // 鏃ュ織涓樉绀虹殑鍒椾俊鎭� (澧炲姞鑷冲叏閮ㄥ垪锛岄櫎鍘诲悎骞跺垪)
arr_field: '', // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: null, // 鍒楄〃鏁版嵁闆�
@@ -83,8 +82,6 @@
}
return item
})
- } else if (column.type === 'colspan') {
- column.unfold = 'true'
} else if (column.type === 'action') {
column.operations = column.elements
}
@@ -458,10 +455,10 @@
render() {
const { MenuName } = this.props
- const { BID, setting, searchlist, pageSize, actions, columns, pickup, config, selectedData } = this.state
+ const { BID, setting, searchlist, pageSize, actions, config, columns, pickup, selectedData } = this.state
return (
- <div className="commontable">
+ <div className="custom-normal-table">
{searchlist && searchlist.length > 0 ?
<MainSearch
BID={BID}
@@ -476,11 +473,11 @@
BID={BID}
setting={setting}
actions={actions}
+ columns={config.columns}
MenuName={MenuName}
dict={this.state.dict}
MenuID={this.props.MenuID}
selectedData={selectedData}
- logcolumns={this.state.logcolumns}
refreshdata={this.refreshbyaction}
getexceloutparam={this.getexceloutparam}
/>
@@ -493,18 +490,17 @@
tableId="mainTable"
BID={BID}
pickup={pickup}
- config={config}
setting={setting}
columns={columns}
MenuName={MenuName}
pageSize={pageSize}
dict={this.state.dict}
data={this.state.data}
+ fields={config.columns}
total={this.state.total}
MenuID={this.props.MenuID}
loading={this.state.loading}
refreshdata={this.refreshbytable}
- logcolumns={this.state.logcolumns}
statFValue={this.state.statFValue}
handleTableId={this.handleTableId}
refreshbyaction={this.refreshbyaction}
--
Gitblit v1.8.0