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/commontable/index.jsx |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 038a092..466aca2 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -51,7 +51,6 @@
     searchlist: null,     // 鎼滅储鏉′欢
     actions: null,        // 鎸夐挳闆�
     columns: null,        // 鏄剧ず鍒�
-    logcolumns: null,     // 鏃ュ織涓樉绀虹殑鍒椾俊鎭� (澧炲姞鑷冲叏閮ㄥ垪锛岄櫎鍘诲悎骞跺垪)
     arr_field: '',        // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
     setting: null,        // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
     data: null,           // 鍒楄〃鏁版嵁闆�
@@ -258,7 +257,6 @@
 
       let _arrField = []     // 瀛楁闆�
       let _columns = []      // 鏄剧ず鍒�
-      let _logcolumns = []   // 鏃ュ織鏄剧ず鍒�
       let _hideCol = []      // 闅愯棌鍙婂悎骞跺垪涓瓧娈电殑uuid闆�
       let colMap = new Map() // 鐢ㄤ簬瀛楁杩囨护
       let statFields = []    // 鍚堣瀛楁淇℃伅
@@ -282,7 +280,6 @@
       config.columns.forEach(col => {
         if (col.field) {
           _arrField.push(col.field)
-          _logcolumns.push(col)
 
           col.nameField && _arrField.push(col.nameField) // 閾炬帴鍚嶅瓧娈�
           if (col.Hide !== 'true' && col.type === 'number' && col.sum === 'true') {
@@ -291,8 +288,6 @@
         }
         if (col.type === 'colspan' && col.sublist) { // 绛涢�夐殣钘忓垪
           _hideCol = _hideCol.concat(col.sublist)
-        } else if (col.Hide === 'true') {
-          _hideCol.push(col.uuid)
         }
         colMap.set(col.uuid, col)
       })
@@ -310,10 +305,14 @@
 
         col.sort = index
 
-        if (col.type === 'colspan' && col.sublist) {
+        if (col.type === 'colspan') {
+          if (col.unfold !== 'true') { // 涓嶅睍寮�涓烘棫鐗堝悎骞跺垪
+            col.type = 'old_colspan'
+          }
+
           let _col = fromJS(col).toJS()
           let subcols = []
-          _col.sublist.forEach(sub => {
+          _col.sublist && _col.sublist.forEach(sub => {
             if (colMap.has(sub)) {
               subcols.push(colMap.get(sub))
             }
@@ -367,7 +366,6 @@
         searchlist: config.search,
         actions: _actions,
         columns: _columns,
-        logcolumns: _logcolumns,
         arr_field: _arrField.join(','),
         search: Utils.initMainSearch(initSearch) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
       }, () => {
@@ -946,11 +944,11 @@
                       BID={BID}
                       setting={setting}
                       actions={actions}
+                      columns={columns}
                       MenuName={MenuName}
                       dict={this.state.dict}
                       MenuID={this.props.MenuID}
                       selectedData={selectedData}
-                      logcolumns={this.state.logcolumns}
                       ContainerId={this.state.ContainerId}
                       refreshdata={this.refreshbyaction}
                       getexceloutparam={this.getexceloutparam}
@@ -974,7 +972,6 @@
                       tableId="mainTable"
                       BID={BID}
                       pickup={pickup}
-                      config={config}
                       setting={setting}
                       columns={columns}
                       MenuName={MenuName}
@@ -985,7 +982,6 @@
                       MenuID={this.props.MenuID}
                       loading={this.state.loading}
                       refreshdata={this.refreshbytable}
-                      logcolumns={this.state.logcolumns}
                       statFValue={this.state.statFValue}
                       handleTableId={this.handleTableId}
                       ContainerId={this.state.ContainerId}
@@ -1002,12 +998,12 @@
                     BID={BID}
                     plot={item}
                     config={config}
+                    columns={columns}
                     MenuName={MenuName}
                     tableId="mainTable"
                     data={this.state.data}
                     MenuID={this.props.MenuID}
                     loading={this.state.loading}
-                    logcolumns={this.state.logcolumns}
                     ContainerId={this.state.ContainerId}
                     refreshdata={this.refreshbyaction}
                     getexceloutparam={this.getexceloutparam}

--
Gitblit v1.8.0