From 0c439ced2c97905cb2b02f5f689a37b19369fb8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 22 七月 2022 15:00:58 +0800
Subject: [PATCH] 2022-07-22

---
 src/tabviews/formtab/index.jsx |   39 ++++++++++++++++++++++++---------------
 1 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx
index de39406..9c15dfd 100644
--- a/src/tabviews/formtab/index.jsx
+++ b/src/tabviews/formtab/index.jsx
@@ -103,15 +103,26 @@
         config.tabgroups = _tabgroups
       }
 
-      config.action = config.action.filter(item => permAction[item.uuid])
-      config.tabgroups.forEach(group => {
-        group.sublist = group.sublist.filter(tab => {
-          if (tab.supMenu === 'mainTable') {
-            tab.supMenu = MenuID
-          }
-          return permAction[tab.linkTab]
+      if (!window.GLOB.mkHS) {
+        config.action = config.action.filter(item => permAction[item.uuid])
+        config.tabgroups.forEach(group => {
+          group.sublist = group.sublist.filter(tab => {
+            if (tab.supMenu === 'mainTable') {
+              tab.supMenu = MenuID
+            }
+            return permAction[tab.linkTab]
+          })
         })
-      })
+      } else {
+        config.tabgroups.forEach(group => {
+          group.sublist = group.sublist.filter(tab => {
+            if (tab.supMenu === 'mainTable') {
+              tab.supMenu = MenuID
+            }
+            return true
+          })
+        })
+      }
 
       // 鎸夐挳绫诲瀷鍏煎
       config.action = config.action.map(item => {
@@ -185,7 +196,7 @@
           item.options.unshift({
             key: Utils.getuuid(),
             Value: '',
-            Text: this.state.dict['main.all']
+            Text: '鍏ㄩ儴'
           })
         }
   
@@ -203,7 +214,7 @@
           param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
           param.secretkey = Utils.encrypt(param.LText, param.timestamp)
 
-          if (this.props.menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+          if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
             param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
 
             if (item.database === 'sso' && options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
@@ -427,7 +438,7 @@
     param.secretkey = Utils.encrypt(param.LText, param.timestamp)
     param.DateCount = ''
 
-    if (this.props.menuType !== 'HS') { // 浜戠鏁版嵁楠岃瘉
+    if (!window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
       param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
     }
 
@@ -445,7 +456,7 @@
     if (setting.interType === 'inner') {
       param.func = setting.innerFunc
     } else {
-      if (this.props.menuType === 'HS') {
+      if (window.GLOB.mkHS) {
         if (setting.sysInterface === 'true' && options.cloudServiceApi) {
           param.rduri = options.cloudServiceApi
         } else if (setting.sysInterface !== 'true') {
@@ -611,7 +622,6 @@
         }
         {hasform ?
           <FormAction
-            menuType={this.props.menuType}
             setting={setting}
             actions={actions}
             dict={this.state.dict}
@@ -650,7 +660,7 @@
             )
           })
         }
-        {this.props.menuType !== 'HS' && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+        {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
         {viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
       </div>
     )
@@ -659,7 +669,6 @@
 
 const mapStateToProps = (state) => {
   return {
-    menuType: state.editLevel,
     permAction: state.permAction
   }
 }

--
Gitblit v1.8.0