From 78eed586f6a0d15162c89878c53a301e7b142a8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 十月 2022 00:07:06 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/zshare/settingcomponent/index.jsx |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/tabviews/zshare/settingcomponent/index.jsx b/src/tabviews/zshare/settingcomponent/index.jsx
index c877b05..ce4540b 100644
--- a/src/tabviews/zshare/settingcomponent/index.jsx
+++ b/src/tabviews/zshare/settingcomponent/index.jsx
@@ -17,7 +17,6 @@
     dict: PropTypes.object,           // 瀛楀吀琛�
     config: PropTypes.object,         // 椤甸潰閰嶇疆淇℃伅
     shortcuts: PropTypes.any,         // 鑷畾涔夎缃�
-    permAction: PropTypes.object,     // 鎸夐挳鏉冮檺
   }
 
   state = {
@@ -183,7 +182,7 @@
   }
 
   getPageConfig = () => {
-    const { shortcuts, permAction } = this.props
+    const { shortcuts } = this.props
     let config = fromJS(this.props.config).toJS()
     let userConfig = {}
     let components = []
@@ -262,7 +261,7 @@
           let _comp = {title: res.tab.label, uuid: res.tab.uuid, action: []}
 
           subconfig.action.forEach(item => {
-            if (!permAction[item.uuid]) return
+            if (!window.GLOB.mkActions[item.uuid]) return
 
             item.$expanded = false
             if (item.OpenType === 'funcbutton' && item.funcType === 'print') {

--
Gitblit v1.8.0