From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26

---
 src/views/rolemanage/index.jsx |   49 ++++++++++++++++++++++++++++++++++---------------
 1 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/views/rolemanage/index.jsx b/src/views/rolemanage/index.jsx
index 06a4db8..e4df34d 100644
--- a/src/views/rolemanage/index.jsx
+++ b/src/views/rolemanage/index.jsx
@@ -101,7 +101,7 @@
     })
   }
 
-  getMenuList = (reset) => {
+  getMenuList = (reset, resolve) => {
     const { app } = this.state
     let param = {
       func: 's_get_app_menus',
@@ -114,9 +114,11 @@
 
     param.secretkey = Utils.encrypt(param.LText, param.timestamp)
 
-    this.setState({
-      loading: true
-    })
+    if (!resolve) {
+      this.setState({
+        loading: true
+      })
+    }
 
     Api.getCloudConfig(param).then(result => {
       if (result.status) {
@@ -130,17 +132,23 @@
             try {
               let pageParam = JSON.parse(window.decodeURIComponent(window.atob(item.menus_rolelist)))
               item.nodes = pageParam
-              if (pageParam.login) {
+              
+              if (pageParam.type) {
+                item.type = pageParam.type
+              }
+
+              if (pageParam.version !== '1.0') {
                 item.nodes = ''
-              } else if (pageParam.type === 'navbar') {
-                item.type = 'navbar'
+              } else if (pageParam.login || pageParam.pass) {
+                item.nodes = ''
               } else if (pageParam.type === 'im') {
-                item.type = 'im'
                 item.nodes = ''
               }
             } catch (e) {
               item.nodes = ''
             }
+
+            delete item.menus_rolelist
           }
 
           if (!ub && app.userbind === item.MenuID) {
@@ -163,7 +171,9 @@
         this.setState({
           menulist: menus
         }, () => {
-          if (reset && (!this.oriTrees || this.oriTrees.length === 0)) {
+          if (resolve) {
+            this.initMenutree(resolve)
+          } else if (reset && (!this.oriTrees || this.oriTrees.length === 0)) {
             this.initMenutree()
           } else if (!reset && this.oriTrees && this.oriTrees.length === 0) {
             this.initMenutree()
@@ -503,14 +513,23 @@
                   try {
                     let pageParam = JSON.parse(window.decodeURIComponent(window.atob(item.menus_rolelist)))
                     item.nodes = pageParam
-                    if (pageParam.login) {
+
+                    if (pageParam.type) {
+                      item.type = pageParam.type
+                    }
+
+                    if (pageParam.version !== '1.0') {
                       item.nodes = ''
-                    } else if (pageParam.type === 'navbar') {
-                      item.type = 'navbar'
+                    } else if (pageParam.login || pageParam.pass) {
+                      item.nodes = ''
+                    } else if (pageParam.type === 'im') {
+                      item.nodes = ''
                     }
                   } catch (e) {
                     item.nodes = ''
                   }
+
+                  delete item.menus_rolelist
                 }
 
                 if (targetKeys.includes(item.MenuID) && item.nodes && item.nodes.popviews && item.nodes.popviews.length > 0) {
@@ -645,10 +664,10 @@
   initTree = () => {
     const _this = this
     confirm({
-      content: '鍒濆鍖栦細鏍规嵁鑿滃崟閲嶇疆鏉冮檺鏍戯紝纭畾鎵ц鍚楋紵',
+      content: '鏉冮檺鏍戜細閲嶆柊鐢熸垚锛岀‘瀹氭墽琛屽悧锛�',
       onOk() {
         return new Promise(resolve => {
-          _this.initMenutree(resolve)
+          _this.getMenuList(true, resolve)
         })
       },
       onCancel() {}
@@ -889,7 +908,7 @@
             </div>
             <div className="right-view">
               <div className="app-action">
-                <Button className="mk-primary" onClick={this.initTree}>鍚屾</Button>
+                <Button className="mk-primary" onClick={this.initTree}>閲嶇疆</Button>
                 {/* <Button className="mk-purple" onClick={this.syncTree}>鍚屾</Button> */}
                 <Button className="mk-green save" onClick={this.saveTree}>淇濆瓨</Button>
               </div>

--
Gitblit v1.8.0