From eda6fc2b5d21d70213484f5fee8abfdbfc559566 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 17:06:25 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/layout/MyMenu.jsx |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/zy-acs-flow/src/layout/MyMenu.jsx b/zy-acs-flow/src/layout/MyMenu.jsx
index 695c6ea..1add22b 100644
--- a/zy-acs-flow/src/layout/MyMenu.jsx
+++ b/zy-acs-flow/src/layout/MyMenu.jsx
@@ -28,12 +28,6 @@
     const { isPending, permissions } = usePermissions();
 
     useEffect(() => {
-        const currentPath = location.pathname;
-        const parentRoutes = findParentRoutes(currentPath, permissions)
-        for (const parentRoute of parentRoutes) {
-            setState(state => ({ ...state, [parentRoute]: true }));
-        }
-
         // default open sub menu
         const defaultExpandMenu = ["menu.warehouse", "menu.dispatcher", "menu.equipment"];
         permissions.forEach(item => {
@@ -41,7 +35,17 @@
                 setState(state => ({ ...state, [item.route]: true }));
             }
         });
-    }, [location.pathname, permissions]);
+    }, [permissions]);
+
+    useEffect(() => {
+        // expand this parent menu
+        const currentPath = location.pathname;
+        const parentRoutes = findParentRoutes(currentPath, permissions)
+        for (const parentRoute of parentRoutes) {
+            setState(state => ({ ...state, [parentRoute]: true }));
+        }
+
+    }, [location.pathname]);
 
     const handleToggle = (menu) => {
         setState(state => ({ ...state, [menu]: !state[menu] }));

--
Gitblit v1.9.1