From 74f42024805abe7850dbeeb03dae48a0d9ef0b79 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 二月 2020 13:10:17 +0800
Subject: [PATCH] 2020-02-05

---
 src/tabviews/commontable/index.jsx |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index efc7193..7861c7e 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -36,6 +36,7 @@
     searchlist: null,     // 鎼滅储鏉′欢
     actions: null,        // 鎸夐挳闆�
     columns: null,        // 鏄剧ず鍒�
+    logcolumns: null,     // 鏃ュ織涓樉绀虹殑鍒椾俊鎭�
     arr_field: '',        // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
     setting: null,        // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
     data: null,           // 鍒楄〃鏁版嵁闆�
@@ -98,8 +99,9 @@
 
       let _arrField = []     // 瀛楁闆�
       let _columns = []      // 鏄剧ず鍒�
+      let _logcolumns = []   // 鏃ュ織鏄剧ず鍒�
       let _hideCol = []      // 闅愯棌鍙婂悎骞跺垪涓瓧娈电殑uuid闆�
-      let colMap = new Map()
+      let colMap = new Map() // 鐢ㄤ簬瀛楁杩囨护
 
       // 鏉冮檺杩囨护
       config.action = config.action.filter(item => permAction[item.uuid])
@@ -108,10 +110,16 @@
       //   config[group] = config[group].filter(tab => permAction[tab.uuid])
       // })
 
+
       // 1銆佺瓫閫夊瓧娈甸泦锛�2銆佽繃婊ら殣钘忓垪鍙婂悎骞跺垪涓殑瀛楁uuid
       config.columns.forEach(col => {
         if (col.field) {
           _arrField.push(col.field)
+
+          // 绛涢�夊嚭鏃ュ織涓殑鏄剧ず鍒楋紝鍙栧墠鍥涗釜
+          if (col.Hide !== 'true' && _logcolumns.length < 4) {
+            _logcolumns.push(col)
+          }
         }
         if (col.type === 'colspan' && col.sublist) { // 绛涢�夐殣钘忓垪
           _hideCol = _hideCol.concat(col.sublist)
@@ -180,6 +188,7 @@
         searchlist: config.search,
         actions: _actions,
         columns: _columns,
+        logcolumns: _logcolumns,
         isLinkMain: _isLinkMain,
         arr_field: _arrField.join(','),
         search: Utils.initMainSearch(config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
@@ -770,6 +779,7 @@
             type="main"
             setting={setting}
             actions={actions}
+            logcolumns={this.state.logcolumns}
             dict={this.state.dict}
             MenuID={this.props.MenuID}
             refreshdata={this.refreshbyaction}

--
Gitblit v1.8.0