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/verupmanage/subtabtable/index.jsx |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/tabviews/verupmanage/subtabtable/index.jsx b/src/tabviews/verupmanage/subtabtable/index.jsx
index 522dfb7..46fafe4 100644
--- a/src/tabviews/verupmanage/subtabtable/index.jsx
+++ b/src/tabviews/verupmanage/subtabtable/index.jsx
@@ -39,7 +39,6 @@
     searchlist: null,     // 鎼滅储鏉′欢
     actions: null,        // 鎸夐挳闆�
     columns: null,        // 鏄剧ず鍒�
-    logcolumns: null,     // 鏃ュ織涓樉绀虹殑鍒椾俊鎭� (澧炲姞鑷冲叏閮ㄥ垪锛岄櫎鍘诲悎骞跺垪)
     arr_field: '',        // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
     setting: null,        // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
     data: null,           // 鍒楄〃鏁版嵁闆�
@@ -84,7 +83,6 @@
 
     let _arrField = []     // 瀛楁闆�
     let _columns = []      // 鏄剧ず鍒�
-    let _logcolumns = []   // 鏃ュ織鏄剧ず鍒�
     let _hideCol = []      // 闅愯棌鍙婂悎骞跺垪涓瓧娈电殑uuid闆�
     let colMap = new Map()
 
@@ -92,13 +90,9 @@
     config.columns.forEach(col => {
       if (col.field) {
         _arrField.push(col.field)
-
-        _logcolumns.push(col)
       }
       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)
     })
@@ -107,10 +101,13 @@
     config.columns.forEach(col => {
       if (_hideCol.includes(col.uuid)) return
 
-      if (col.type === 'colspan' && col.sublist) {
-        let _col = JSON.parse(JSON.stringify(col))
+      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))
           }
@@ -137,7 +134,6 @@
         return item
       }),
       columns: _columns,
-      logcolumns: _logcolumns,
       arr_field: _arrField.join(','),
       search: Utils.initMainSearch(config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
     }, () => {
@@ -439,7 +435,7 @@
   }
 
   render() {
-    const { config, setting, searchlist, actions, columns, pickup, selectedData } = this.state
+    const { setting, searchlist, actions, columns, pickup, selectedData } = this.state
 
     return (
       <div className="verup-subtable" id={'subtable' + this.props.MenuID}>
@@ -456,13 +452,13 @@
               type="sub"
               setting={setting}
               actions={actions}
+              columns={columns}
               Tab={this.props.Tab}
               BID={this.props.BID}
               BData={this.props.BData}
               dict={this.state.dict}
               selectedData={selectedData}
               MenuID={this.props.SupMenuID}
-              logcolumns={this.state.logcolumns}
               refreshdata={this.refreshbyaction}
               ContainerId={this.props.ContainerId}
               getexceloutparam={this.getexceloutparam}
@@ -477,7 +473,6 @@
             <SubTable
               tableId={this.props.Tab.uuid}
               pickup={pickup}
-              config={config}
               setting={setting}
               columns={columns}
               dict={this.state.dict}

--
Gitblit v1.8.0