feats

config/routes.js

@@ -45,6 +45,19 @@ export default [
               },
             ],
           },
+          {
+            path: '/building',
+            name: '项目管理',
+            icon: 'control',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/building/list',
+                name: '项目列表',
+                component: './building/List',
+              },
+            ],
+          },
           {
             component: './404',
           },

src/layouts/BasicLayout.jsx

@@ -4,7 +4,7 @@
  * https://github.com/ant-design/ant-design-pro-layout
  */
 import ProLayout, { DefaultFooter } from '@ant-design/pro-layout';
-import React, { useEffect } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { Link } from 'umi';
 import { connect } from 'dva';
 import { Icon, Result, Button } from 'antd';
@@ -26,13 +26,16 @@ const noMatch = (
   />
 );
 
-/**
- * use Authorized check all menu item
- */
-const menuDataRender = (menuList) =>
+/** Use Authorized check all menu item */
+const menuDataRender = (menuRoles) => (menuList) =>
   menuList.map((item) => {
-    const localItem = { ...item, children: item.children ? menuDataRender(item.children) : [] };
-    return Authorized.check(item.authority, localItem, null);
+    const needAuth = !!item.menuCode;
+
+    const authority =
+      (menuRoles.filter((x) => x.menuCode === item.menuCode)[0] || {}).roles || [];
+
+    const localItem = { ...item, children: item.children ? menuDataRender(menuRoles)(item.children) : [] };
+    return Authorized.check(needAuth ? authority : undefined, localItem, null);
   });
 
 const footerRender = () => {
@@ -55,6 +58,8 @@ const footerRender = () => {
 
 const BasicLayout = (props) => {
   const {
+    // user,
+    menus,
     dispatch,
     children,
     settings,
@@ -72,9 +77,20 @@ const BasicLayout = (props) => {
     }
   }; // get children authority
 
-  const authorized = getAuthorityFromRouter(props.route.routes, location.pathname || '/') || {
-    authority: undefined,
-  };
+  const authorized = useMemo(() => {
+    const routeItem = getAuthorityFromRouter(props.route.routes, location.pathname || '/')
+    if (!routeItem || !routeItem.menuCode) {
+      return {
+        authority: undefined,
+      };
+    }
+
+    const authority = (menus.filter((x) => x.menuCode === routeItem.menuCode)[0] || {}).roles;
+    return {
+      authority: authority && authority.length ? authority : ['any-string-for-no-right'],
+    };
+  })
+  
 
   return (
     <ProLayout
@@ -112,7 +128,7 @@ const BasicLayout = (props) => {
         );
       }}
       footerRender={footerRender}
-      menuDataRender={menuDataRender}
+      menuDataRender={menuDataRender(menus)}
       formatMessage={formatMessage}
       rightContentRender={() => <RightContent />}
       {...props}
@@ -125,7 +141,9 @@ const BasicLayout = (props) => {
   );
 };
 
-export default connect(({ global, settings }) => ({
+export default connect(({ global, settings, user }) => ({
   collapsed: global.collapsed,
   settings,
+  user: user.currentUser,
+  menus: user.menuList,
 }))(BasicLayout);

src/models/user.js

@@ -1,4 +1,5 @@
 import { fetch, apis } from '@/utils/request';
+import { setAuthority } from '@/utils/authority'
 // import { setAllBtnAuth, setUserBtnAuth } from '@/components/AuthButton';
 
 const getCurrentUser = fetch(apis.user.current)
@@ -28,6 +29,8 @@ const UserModel = {
       // setAllBtnAuth(buttonList)
       // setUserBtnAuth(currentUser.buttons)
 
+      setAuthority(currentUser.roles)
+
       return { ...state, currentUser, menuList, buttonList };
     },
     changeNotifyCount(

src/pages/Welcome.jsx

@@ -13,10 +13,10 @@ const CodePreview = ({ children }) => (
 );
 
 export default (props) => {
-  console.log('--------welcome-----', JSON.stringify(props))
-  useEffect(() => {
-    console.log('------useEffect-------')
-  }, [])
+  // console.log('--------welcome-----', JSON.stringify(props))
+  // useEffect(() => {
+  //   console.log('------useEffect-------')
+  // }, [])
   
   return (
     <PageHeaderWrapper>

src/pages/building/List/index.jsx

@@ -0,0 +1,7 @@
+import React from 'react'
+
+export default (props) => {
+  return (
+    <div></div>
+  )
+}

src/utils/authority.js

@@ -1,33 +1,12 @@
 import { reloadAuthorized } from './Authorized'; // use localStorage to store the authority info, which might be sent from server in actual project.
 
-export function getAuthority(str) {
-  const authorityString =
-    typeof str === 'undefined' && localStorage ? localStorage.getItem('antd-pro-authority') : str; // authorityString could be admin, "admin", ["admin"]
+let roles = []
 
-  let authority;
-
-  try {
-    if (authorityString) {
-      authority = JSON.parse(authorityString);
-    }
-  } catch (e) {
-    authority = authorityString;
-  }
-
-  if (typeof authority === 'string') {
-    return [authority];
-  } // preview.pro.ant.design only do not use in your production.
-  // preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
-
-  if (!authority && ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site') {
-    return ['admin'];
-  }
-
-  return authority;
+export function getAuthority() {
+  return roles || [];
 }
-export function setAuthority(authority) {
-  const proAuthority = typeof authority === 'string' ? [authority] : authority;
-  localStorage.setItem('antd-pro-authority', JSON.stringify(proAuthority)); // auto reload
-
+export function setAuthority(authority = []) {
+  roles = typeof authority === 'string' ? [authority] : authority;
+  
   reloadAuthorized();
 }