Merge branch 'master' of http://192.168.1.41:3000/outaozhen/cldV2react

src/app.tsx

@@ -4,6 +4,7 @@ import RightContent from '@/components/RightContent'
 import { PERMISSION_NEED_PATH } from './utils/consts/customer'
 import { message } from 'antd'
 import logo from '../public/logo.svg'
+import BasicModal, { BasicDrawer } from '@/components/Modal'
 
 const loginPath = '/user/login'
 
@@ -26,7 +27,7 @@ export async function getInitialState() {
     } catch (error) {
       message.error('获取数据权限失败，请联系管理员')
     }
-    return undefined
+    return {}
   }
   // 如果是登录页面，不执行
   if (history.location.pathname !== loginPath) {
@@ -67,6 +68,13 @@ export const layout = ({ initialState, setInitialState }) => {
         permData && setInitialState({ ...initialState, permData })
       }
     },
+    childrenRender: children => (
+      <>
+        {children}
+        <BasicDrawer />
+        <BasicModal />
+      </>
+    ),
     // menuHeaderRender: false,
     ...initialState?.settings
   }

src/components/RightContent/index.tsx

@@ -6,7 +6,6 @@ import { useModel, SelectLang } from 'umi'
 import Avatar from './AvatarDropdown'
 // import HeaderSearch from '../HeaderSearch'
 import styles from './index.less'
-import BasicModal, { BasicDrawer } from '@/components/Modal'
 
 const ENVTagColor = {
   dev: 'orange',
@@ -61,8 +60,6 @@ const GlobalHeaderRight: React.FC = () => {
         <QuestionCircleOutlined />
       </span> */}
       <Avatar />
-      <BasicDrawer />
-      <BasicModal />
       {REACT_APP_ENV && REACT_APP_ENV !== 'prod' && (
         <span>
           <Tag color={ENVTagColor[REACT_APP_ENV]}>{REACT_APP_ENV}</Tag>

src/pages/user/login/index.jsx

@@ -40,8 +40,9 @@ const Login = () => {
 
   const fetchUserInfo = async () => {
     const userInfo = await initialState?.fetchUserInfo?.()
+    const permData = await initialState?.fetchPermData?.()
     if (userInfo) {
-      setInitialState({ ...initialState, ...userInfo })
+      setInitialState({ ...initialState, ...userInfo, permData })
     }
   }