feats

src/layouts/BasicLayout.jsx

@@ -6,24 +6,16 @@
 import ProLayout from '@ant-design/pro-layout';
 import React, { useEffect } from 'react';
 import Link from 'umi/link';
+import Redirect from 'umi/redirect';
 import { connect } from 'dva';
 import { formatMessage } from 'umi-plugin-react/locale';
 import Authorized from '@/utils/Authorized';
 import RightContent from '@/components/GlobalHeader/RightContent';
 import { isAntDesignPro } from '@/utils/utils';
 import logo from '../assets/logo.png';
-
-/**
- * use Authorized check all menu item
- */
-const menuDataRender = menuList =>
-  menuList.map(item => {
-    const localItem = { ...item, children: item.children ? menuDataRender(item.children) : [] };
-    return Authorized.check(item.authority, localItem, null);
-  });
+  
 const footerRender = () => {
   return (
-
     <div
       style={{
         padding: ' 44px 0',
@@ -32,14 +24,13 @@ const footerRender = () => {
         fontFamily: 'monospace',
         fontWeight: '200',
         color: 'rgba(102, 102, 102, 1)',
-    
-
       }}
     >
       copy Right @ 知与行
     </div>
   )
 }
+
 const BasicLayout = props => {
   const { dispatch, children, settings } = props;
   /**
@@ -69,6 +60,26 @@ const BasicLayout = props => {
     }
   };
 
+  const findAuthority = (path) => {
+    return ((props.user.menuList || []).filter(x => x.code === path)[0] || {}).roles || []
+  }
+  
+  /**
+   * use Authorized check all menu item
+   */
+  const menuDataRender = menuList =>
+    menuList.map(item => {
+      const localItem = { ...item, children: item.children ? menuDataRender(item.children) : [] };
+      const authority = findAuthority(item.path);
+      // return Authorized.check(item.authority, localItem, null);
+      return Authorized.check(authority, localItem, null);
+    });
+
+  const checkRights = (children) => {
+    const authority = findAuthority(props.location.pathname);
+    return Authorized.check(authority, children, <Redirect to="/exception/403" />);
+  }
+
   return (
     <ProLayout
       logo={logo}
@@ -106,12 +117,13 @@ const BasicLayout = props => {
       {...settings}
     // pageTitleRender={()=><></>}
     >
-      {children}
+      {checkRights(children)}
     </ProLayout>
   );
 };
 
-export default connect(({ global, settings }) => ({
+export default connect(({ global, settings, user }) => ({
   collapsed: global.collapsed,
   settings,
+  user
 }))(BasicLayout);

src/models/user.js

@@ -26,8 +26,11 @@ const UserModel = {
     },
   },
   reducers: {
-    saveCurrentUser(state, { payload = {} }) {
-      return { ...state, currentUser: payload.taUser || {}, menuList: payload.menuList || [] };
+    saveCurrentUser(state, { payload }) {
+      const { taUser = {} , menuList = [] } = payload || {}
+      const currentUser = { ...taUser, roles: (taUser.roles || []).map(x => x.roleId) }
+
+      return { ...state, currentUser, menuList };
     },
     changeNotifyCount(
       state = {

src/pages/activity/editActivity.jsx

@@ -27,6 +27,7 @@ const { TextArea } = Input;
  */
 const Edit = (props) => {
   const [tab, changeTab] = useState('poster')
+
   // const [tab, changeTab] = useState('basic')
   const dynamicId = props.location.query.dynamicId
   const [dynamicData, setDynamicData] = useState({})
@@ -173,6 +174,7 @@ const Edit = (props) => {
     const [inputValue, changeInput] = useState('')
     const [textAreaValue, changeTextArea] = useState('')
     const [imgValue, changeImg] = useState('')
+
     return <div>
       <div style={{ display: 'flex' }}>
         <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>