module-menu 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "城市大数据平台公共头部及尾部",
   "main": "src/pages/index.jsx",
   "scripts": {

package/src/pages/ModuleMenu/index.jsx

@@ -7,49 +7,38 @@ import _ from 'lodash';
 import './index.less';
 
 const ModuleMenu = ({ sysName, stash }) => {
-  // stash = 'ii';
-  const [sessionMenu, setsessionMenu] = useState([]);
+  const [sessionMenu, setSessionMenu] = useState([]);
   const [showMenuList, setshowMenuList] = useState(false);
   const [menuList, setMenuList] = useState([]);
-  const [menuListServer, setMenuListServer] = useState([]);
 
   useEffect(() => {
-    let newSessionMenu = getSessionMenu();
-    setsessionMenu(newSessionMenu);
-    let newMenuList = getNewMenuList();
-    setMenuList(newMenuList);
+    getSessionMenu();
   }, []);
 
-  const getUserMenusList = async () => {
-    const res = await Axios(
-      'get',
-      '/admin-api/system/user/getUserMenusList',
-      '',
-      {},
-    );
-    let menuListServers = [];
-    if (res.data.code === 0) {
-      menuListServers =
-        res.data.data &&
-        res.data.data.map((item) => {
-          return {
-            ...item,
-            path: item.path.indexOf('/') !== -1 ? item.path : '/' + item.path,
-          };
-        });
-    }
-    return menuListServers;
-  };
-
-  const getSessionMenu = async () => {
+  const getSessionMenu = () => {
     if (!stash) {
       const menuObj = JSON.parse(sessionStorage.getItem('bigdata-menu'));
-      if (menuObj) {
-        return menuObj.content || [];
-      }
-      return [];
+      let menuGet = menuObj?.content || [];
+      setSessionMenu(menuGet);
+      getNewMenuList(menuGet);
     } else {
-      return (await getUserMenusList()) || [];
+      Axios('get', '/admin-api/system/user/getUserMenusList', '', {})
+        .then((res) => {
+          if (res.data.code === 0) {
+            let menuGet =
+              res.data.data &&
+              res.data.data.map((item) => {
+                return {
+                  ...item,
+                  path:
+                    item.path.indexOf('/') !== -1 ? item.path : '/' + item.path,
+                };
+              });
+            setSessionMenu(menuGet);
+            getNewMenuList(menuGet);
+          }
+        })
+        .catch((e) => console.log('e', e));
     }
   };
 
@@ -127,11 +116,10 @@ const ModuleMenu = ({ sysName, stash }) => {
       window.location.href = '/#/index';
     }
   };
-  const getNewMenuList = () => {
-    const sessionMenu = getSessionMenu();
+  const getNewMenuList = (menuGet) => {
     let newMenuList = _.cloneDeep(menuListInit(stash));
-    if (sessionMenu) {
-      const pathList = sessionMenu.map((item) => item.path);
+    if (menuGet) {
+      const pathList = menuGet.map((item) => item.path);
       // 过滤掉没有权限的子菜单(PS：如果模块下面子菜单都没有，则不显示该模块)
       for (let index = newMenuList.length - 1; index >= 0; index--) {
         const menuItem = newMenuList[index];