umi-tablayout
This commit is contained in:
@ -4,7 +4,7 @@ import ProLayout, {
|
||||
Settings,
|
||||
} from '@ant-design/pro-layout';
|
||||
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Link, useIntl, connect, Dispatch, history } from 'umi';
|
||||
import { Link, connect, Dispatch, history, Outlet, useLocation, useKeepOutlets } from '@umijs/max';
|
||||
import { Result, Button, message } from 'antd';
|
||||
import Authorized from '@/utils/Authorized';
|
||||
import RightContent from '@/components/GlobalHeader/RightContent';
|
||||
@ -96,17 +96,15 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
|
||||
const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
|
||||
const {
|
||||
dispatch,
|
||||
children,
|
||||
settings,
|
||||
location = {
|
||||
pathname: '/',
|
||||
},
|
||||
} = props;
|
||||
const location = useLocation()
|
||||
const [menuData, setMenuData] = React.useState<any>();
|
||||
const [menuShow, setmenuShow] = React.useState<any>(false);
|
||||
const menuDataRef = useRef<MenuDataItem[]>([]);
|
||||
const mall3_token: any = sessionStorage.getItem('Authorization');//当前登录token
|
||||
const userData: any = getSessionUserData();//当前登录人信息
|
||||
const children = useKeepOutlets();
|
||||
useEffect(() => {
|
||||
if (getSessionRoleData()?.roleId) {
|
||||
// let params = {
|
||||
@ -429,7 +427,13 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
|
||||
}
|
||||
]
|
||||
}
|
||||
setMenuData( res.data || [])
|
||||
setMenuData(res.data || [])
|
||||
if (dispatch) {
|
||||
dispatch({
|
||||
type: 'user/saveMenuData',
|
||||
payload: res.data || [],
|
||||
});
|
||||
}
|
||||
setmenuShow(true)
|
||||
// getMenu(params).then(res => {
|
||||
// if (res.code == 1) {
|
||||
@ -463,7 +467,6 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
|
||||
},
|
||||
[location.pathname],
|
||||
);
|
||||
const { formatMessage } = useIntl();
|
||||
return menuShow ? (<ProLayout
|
||||
menuDataRender={() => menuICon(menuData)}
|
||||
logo={logo}
|
||||
@ -492,7 +495,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
|
||||
breadcrumbRender={(routers = []) => [
|
||||
{
|
||||
path: '/',
|
||||
breadcrumbName: formatMessage({ id: 'menu.home' }),
|
||||
breadcrumbName: '首页',
|
||||
},
|
||||
...routers,
|
||||
]}
|
||||
@ -509,6 +512,9 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
|
||||
menuDataRef.current = menuData || [];
|
||||
return menuData || [];
|
||||
}}
|
||||
contentStyle={{
|
||||
backgroundColor: '#F5F7FA',
|
||||
}}
|
||||
{...props}
|
||||
{...settings}
|
||||
>
|
||||
|
Reference in New Issue
Block a user