develop #30

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

View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { Layout, Dropdown } from 'antd'; import { Layout, Dropdown } from 'antd';
import type { MenuProps } from 'antd'; import type { MenuProps } from 'antd';
import { history } from '@umijs/max'; import { useLocation } from '@umijs/max';
import AvatarProps from './AvatarProps'; import AvatarProps from './AvatarProps';
import { useMyState } from '@/common'; import { useMyState } from '@/common';
@ -14,7 +14,7 @@ interface CustomHeaderProps {
export const CustomHeader: React.FC<CustomHeaderProps> = ({ collapsed, toggle }) => { export const CustomHeader: React.FC<CustomHeaderProps> = ({ collapsed, toggle }) => {
const { snap } = useMyState(); const { snap } = useMyState();
const { pathname } = history.useLocation(); const { pathname } = useLocation();
// 在登录页面不显示header // 在登录页面不显示header
if (pathname === '/login') { if (pathname === '/login') {