Commit 0b2f0f78 authored by Andy-bubu's avatar Andy-bubu

fix: 统一侧栏折叠图标

parent 3b3884f8
...@@ -21,8 +21,6 @@ import LeftOutlined from '@ant-design/icons/LeftOutlined'; ...@@ -21,8 +21,6 @@ import LeftOutlined from '@ant-design/icons/LeftOutlined';
import LogoutOutlined from '@ant-design/icons/LogoutOutlined'; import LogoutOutlined from '@ant-design/icons/LogoutOutlined';
import InboxOutlined from '@ant-design/icons/InboxOutlined'; import InboxOutlined from '@ant-design/icons/InboxOutlined';
import InfoCircleOutlined from '@ant-design/icons/InfoCircleOutlined'; import InfoCircleOutlined from '@ant-design/icons/InfoCircleOutlined';
import MenuFoldOutlined from '@ant-design/icons/MenuFoldOutlined';
import MenuUnfoldOutlined from '@ant-design/icons/MenuUnfoldOutlined';
import MoreOutlined from '@ant-design/icons/MoreOutlined'; import MoreOutlined from '@ant-design/icons/MoreOutlined';
import MoonOutlined from '@ant-design/icons/MoonOutlined'; import MoonOutlined from '@ant-design/icons/MoonOutlined';
import OrderedListOutlined from '@ant-design/icons/OrderedListOutlined'; import OrderedListOutlined from '@ant-design/icons/OrderedListOutlined';
...@@ -74,8 +72,42 @@ export const DocumentTextIcon = FileText; ...@@ -74,8 +72,42 @@ export const DocumentTextIcon = FileText;
export const Info = withSize(InfoCircleOutlined); export const Info = withSize(InfoCircleOutlined);
export const Folder = withSize(FolderOpenOutlined); export const Folder = withSize(FolderOpenOutlined);
export const LogOut = withSize(LogoutOutlined); export const LogOut = withSize(LogoutOutlined);
export const MenuFold = withSize(MenuFoldOutlined); export function SidebarPanel({ size = 20, style, ...props }) {
export const MenuUnfold = withSize(MenuUnfoldOutlined); return (
<span
aria-hidden="true"
role="img"
{...props}
style={iconStyle(size, style)}
className={['anticon', props.className].filter(Boolean).join(' ')}
>
<svg
viewBox="0 0 24 24"
width="1em"
height="1em"
fill="none"
focusable="false"
aria-hidden="true"
>
<rect
x="3.5"
y="4"
width="17"
height="16"
rx="3.5"
stroke="currentColor"
strokeWidth="2"
/>
<path
d="M9 4.75V19.25"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
/>
</svg>
</span>
);
}
export const More = withSize(MoreOutlined); export const More = withSize(MoreOutlined);
export const Moon = withSize(MoonOutlined); export const Moon = withSize(MoonOutlined);
export const Project = withSize(ProjectOutlined); export const Project = withSize(ProjectOutlined);
......
import xinyuanLogoRed from '@/assets/xy-logo_small.png'; import xinyuanLogoRed from '@/assets/xy-logo_small.png';
import xinyuanLogoWhite from '@/assets/xy-logo_small_white.png'; import xinyuanLogoWhite from '@/assets/xy-logo_small_white.png';
import { SidebarPanel } from '@/components/AppIcons';
import ApplicationSwitcherDialog from '@/pages/project_manager_xy/ApplicationSwitcherDialog'; import ApplicationSwitcherDialog from '@/pages/project_manager_xy/ApplicationSwitcherDialog';
import { UserContext } from '@/wrapper/Auth'; import { UserContext } from '@/wrapper/Auth';
import { import {
AppstoreOutlined, AppstoreOutlined,
BarsOutlined,
CloseOutlined, CloseOutlined,
DatabaseOutlined, DatabaseOutlined,
FolderOpenOutlined, FolderOpenOutlined,
LogoutOutlined, LogoutOutlined,
MenuFoldOutlined,
MenuUnfoldOutlined,
MoonOutlined, MoonOutlined,
SunOutlined, SunOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
...@@ -299,12 +297,7 @@ export default function ProjectManagerLayout() { ...@@ -299,12 +297,7 @@ export default function ProjectManagerLayout() {
aria-label={isSidebarOpen ? '收起侧栏' : '展开侧栏'} aria-label={isSidebarOpen ? '收起侧栏' : '展开侧栏'}
className="size-8 bg-transparent hover:bg-[var(--default)] max-lg:size-9" className="size-8 bg-transparent hover:bg-[var(--default)] max-lg:size-9"
> >
<span className="hidden lg:inline-grid"> <SidebarPanel />
{isSidebarOpen ? <MenuFoldOutlined /> : <MenuUnfoldOutlined />}
</span>
<span className="inline-grid lg:hidden">
<BarsOutlined />
</span>
</IconButton> </IconButton>
<div className="min-w-0 flex-1 truncate text-xl font-semibold leading-7 tracking-normal text-[var(--foreground)]"> <div className="min-w-0 flex-1 truncate text-xl font-semibold leading-7 tracking-normal text-[var(--foreground)]">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment