feats

src/pages/roles/menus.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { Button, Card, Tree, Modal } from 'antd';
 import useBool from '@/utils/hooks/useBool';
 import arr2Tree from '@/utils/arr2Tree';
+import { getResourceList } from '@/services/role';
 
 export default (props) => {
   const { role } = props;
@@ -9,6 +10,7 @@ export default (props) => {
   const [loading, startLoading, cancelLoading] = useBool();
   const [list, setList] = React.useState([]);
   const [treeData, setTreeData] = React.useState([]);
+  const treeDictRef = React.useRef();
 
   const title = role ? `${role.name} - 授权菜单` : '授权菜单';
 
@@ -19,6 +21,16 @@ export default (props) => {
     console.log('onCheck', checkedKeys, info);
   };
 
+  React.useEffect(() => {
+    startLoading();
+    getResourceList({ pageSize: 500, type: 'menu' }).then((res) => {
+      cancelLoading();
+      setList(res.records || []);
+    }).catch(() => {
+      cancelLoading();
+    })
+  }, []);
+
   React.useEffect(() => {
     if (!role) {
       setList([]);
@@ -29,7 +41,9 @@ export default (props) => {
     // 先转为需要的格式
     const arr = list.map(x => ({ title: x.name, key: x.id, parentId: x.parentId }));
     // 再转为 tree
-    setTreeData(arr2Tree(arr));
+    const [tree, dict] = arr2Tree(arr);
+    setTreeData(tree);
+    treeDictRef.current = dict;
   }, [list]);
 
   return (
@@ -40,7 +54,7 @@ export default (props) => {
     >
       <Tree
         checkable
-        onSelect={onSelect}
+        selectable={false}
         onCheck={onCheck}
         treeData={treeData}
       />

src/routes/routes.jsx

@@ -158,13 +158,6 @@ export default [
               title: '库存维护',
             },
           },
-          {
-            path: 'log',
-            element: <StockLog />,
-            meta: {
-              title: '库存日志',
-            },
-          },
         ],
       },
       {
@@ -178,20 +171,48 @@ export default [
             index: true,
             element: <Navigate to='rotationChart/list' replace />,
           },
+          {
+            path: 'station',
+            element: null,
+            meta: {
+              title: '本站信息',
+            },
+          },
           {
             path: 'rotationChart/list',
             element: <RotationChartList />,
             meta: {
-              title: '轮播图管理',
+              title: '公告内容',
             },
           },
           {
             path: 'rotationChart/edit',
             element: <RotationChartEdit />,
             meta: {
-              title: '轮播图维护',
+              title: '公告维护',
             },
-          }
+          },
+          {
+            path: 'regulation',
+            element: null,
+            meta: {
+              title: '规章制度',
+            },
+          },
+          {
+            path: 'emergency-plan',
+            element: null,
+            meta: {
+              title: '应急预案',
+            },
+          },
+          {
+            path: 'files',
+            element: null,
+            meta: {
+              title: '文件管理',
+            },
+          },
         ],
       },
       {
@@ -227,12 +248,26 @@ export default [
               hideInMenu: true,
             },
           },
+          {
+            path: 'log',
+            element: <StockLog />,
+            meta: {
+              title: '库存操作日志',
+            },
+          },
           {
             path: 'roles',
             element: <Roles />,
             meta: {
               title: '系统角色管理',
             },
+          },
+          {
+            path: 'user',
+            element: null,
+            meta: {
+              title: '系统用户管理',
+            },
           }
         ],
       },

src/services/role.js

@@ -12,6 +12,15 @@ import { restful } from '@/utils/request';
   deleteRole,
  ] = restful('/roles');
 
+ 
+ const [
+  getResourceList,
+  getResourceDetail,
+  saveResource,
+  updateResource,
+  deleteResource,
+ ] = restful('/resources');
+
 
  export {
   getRoleList,
@@ -19,4 +28,10 @@ import { restful } from '@/utils/request';
   saveRole,
   updateRole,
   deleteRole,
+  
+  getResourceList,
+  getResourceDetail,
+  saveResource,
+  updateResource,
+  deleteResource,
  }

src/utils/arr2Tree.js

@@ -1,10 +1,10 @@
 
-export default function arr2Tree(arr = [], parent = 'parentId') {
+export default function arr2Tree(arr = [], parent = 'parentId', key = 'key') {
   // 转换为字典
   const dict = arr.reduce((acc, item) => {
     return {
       ...acc,
-      [item.id]: {
+      [item[key]]: {
         ...item,
         children: []
       }
@@ -18,7 +18,7 @@ export default function arr2Tree(arr = [], parent = 'parentId') {
     const parentNodeId = item[parent];
 
     if (parentNodeId === rootId) {
-      tree.push(item);
+      tree.push(dict[item[key]]);
     } else {
       const parentNode = dict[parentNodeId];
       if (parentNode) {
@@ -27,6 +27,8 @@ export default function arr2Tree(arr = [], parent = 'parentId') {
     }
   }
 
-  return tree;
+  console.log(tree, dict)
+
+  return [tree, dict];
 }