develop #30

Merged
zsq merged 33 commits from develop into main 2026-03-31 17:43:07 +08:00
Showing only changes of commit ac6967024f - Show all commits

View File

@ -2,6 +2,7 @@
import { MyIcons, MyIconsType, PermissionsType, useMyState } from '@/common'; import { MyIcons, MyIconsType, PermissionsType, useMyState } from '@/common';
import { Link, RuntimeConfig, history } from '@umijs/max'; import { Link, RuntimeConfig, history } from '@umijs/max';
import AvatarProps from '../../components/layout/AvatarProps'; import AvatarProps from '../../components/layout/AvatarProps';
import { CustomHeader, CustomLogo } from '@/common/components/layout';
const loopMenu = (permissions: PermissionsType[] | undefined) => { const loopMenu = (permissions: PermissionsType[] | undefined) => {
let tree: PermissionsType[] = []; let tree: PermissionsType[] = [];
@ -38,6 +39,17 @@ export const LayoutConfig: RuntimeConfig['layout'] = () => {
colorPrimary: '#1890ff', colorPrimary: '#1890ff',
siderWidth: 220, siderWidth: 220,
pure: history.location.pathname === '/login', pure: history.location.pathname === '/login',
// 新增自定义Header渲染
headerRender: () => {
return <CustomHeader />;
},
// 新增自定义Logo渲染
logoRenderer: (collapsed: boolean) => {
return <CustomLogo collapsed={collapsed} />;
},
avatarProps: { avatarProps: {
render: () => <AvatarProps user={snap.session.user} />, render: () => <AvatarProps user={snap.session.user} />,
}, },