liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9.7 同步master版本，解决冲突

Browse Source
This commit is contained in:
jl-zhoujl2
2022-09-07 14:03:12 +08:00
parent 90c5085fc8 53940f64ce
commit e0f3fd574b
36 changed files with 1410 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/layouts/BasicLayout.tsx
View File

@ -12,7 +12,7 @@ import { ConnectState } from '@/models/connect';
import { getMatchMenu } from '@umijs/route-utils';
import { getMenu } from './services'
import logo from '../assets/logo.svg';
import { getSessionRoleData } from '@/utils/session';
import { getSessionRoleData, getSessionUserData } from '@/utils/session';
import {
HomeOutlined,
@ -105,6 +105,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
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();//当前登录人信息
useEffect(() => {
if (getSessionRoleData()?.roleId) {
let params = {
@ -161,7 +163,9 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
} else if (menuItemProps.frame && menuItemProps.frame == 'Y') {
return <Link onClick={() => window.open(menuItemProps.path)} to="#">{defaultDom}</Link>;
} else if (menuItemProps.frame && menuItemProps.frame == 'S') {
return <Link onClick={() => window.open(menuItemProps.path + '&mall3_token=' + sessionStorage.getItem('Authorization'))} to="#">{defaultDom}</Link>;
const initPath = menuItemProps.path;
const rePath = initPath?.replace("{mall3_token}", mall3_token).replace("{loginName}", userData.loginName).replace("{organizationId}", userData.organizationId);
return <Link onClick={() => window.open(rePath)} to="#">{defaultDom}</Link>;
} else {
return <Link to={menuItemProps.path}>{defaultDom}</Link>;
}