From f36141f3075edf9d41928d64f759ad6bd1b1ac60 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 七月 2020 17:43:34 +0800
Subject: [PATCH] 2020-07-14

---
 src/tabviews/zshare/actionList/normalbutton/index.jsx |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index f56f4e5..3627805 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -834,8 +834,8 @@
         } else {
           if (_LongParam.groups.length > 0) {
             _LongParam.groups.forEach(group => {
-              group.sublist = group.sublist.filter(cell => {
-                // 鏁版嵁婧恠ql璇彞锛岄澶勭悊
+              group.sublist = group.sublist.map(cell => {
+                // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛� 鏉冮檺榛戝悕鍗曞瓧娈佃缃负闅愯棌琛ㄥ崟
                 if (['select', 'link', 'multiselect'].includes(cell.type) && cell.resourceType === '1') {
                   let _option = Utils.getSelectQueryOptions(cell)
 
@@ -851,22 +851,22 @@
                 }
 
                 // 瀛楁鏉冮檺榛戝悕鍗�
-                if (!cell.blacklist || cell.blacklist.length === 0) return true
+                if (!cell.blacklist || cell.blacklist.length === 0) return cell
 
                 let _black = cell.blacklist.filter(v => {
                   return this.props.permRoles.indexOf(v) !== -1
                 })
 
                 if (_black.length > 0) {
-                  return false
-                } else {
-                  return true
+                  cell.hidden = 'true'
                 }
+
+                return cell
               })
             })
           } else {
-            _LongParam.fields = _LongParam.fields.filter(cell => {
-              // 鏁版嵁婧恠ql璇彞锛岄澶勭悊
+            _LongParam.fields = _LongParam.fields.map(cell => {
+              // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
               if (['select', 'link', 'multiselect'].includes(cell.type) && cell.resourceType === '1') {
                 let _option = Utils.getSelectQueryOptions(cell)
 
@@ -882,17 +882,17 @@
               }
 
               // 瀛楁鏉冮檺榛戝悕鍗�
-              if (!cell.blacklist || cell.blacklist.length === 0) return true
+              if (!cell.blacklist || cell.blacklist.length === 0) return cell
 
               let _black = cell.blacklist.filter(v => {
                 return this.props.permRoles.indexOf(v) !== -1
               })
 
               if (_black.length > 0) {
-                return false
-              } else {
-                return true
+                cell.hidden = 'true'
               }
+
+              return cell
             })
           }
 

--
Gitblit v1.8.0