This commit is contained in:
asp_ly 2024-12-27 21:12:19 +08:00
parent 72de966d0c
commit f03bcbdc80
2 changed files with 20 additions and 11 deletions

View File

@ -12,8 +12,8 @@ const Sidebar = React.forwardRef<HTMLDivElement, SidebarProps>(
<div
ref={ref}
className={cn(
"flex h-full flex-col border-r bg-background transition-all duration-300",
"min-w-[240px] w-60",
"flex flex-col border-r bg-background transition-all duration-300",
"min-w-[240px] w-60 h-screen",
"dark:border-slate-700 dark:bg-slate-900",
className
)}
@ -33,7 +33,7 @@ const SidebarHeader = React.forwardRef<
<div
ref={ref}
className={cn(
"flex h-14 items-center border-b px-4",
"flex h-14 items-center border-b px-4 sticky top-0 z-10",
"dark:border-slate-700 dark:bg-slate-900/50",
"bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60",
className

View File

@ -177,16 +177,23 @@ const BasicLayout: React.FC = () => {
}
return (
<Layout style={{minHeight: '100vh', display: 'flex', flexDirection: 'row'}}>
<Layout style={{
height: '100vh',
display: 'flex',
flexDirection: 'row',
overflow: 'hidden'
}}>
<AppMenu openKeys={openKeys} onOpenChange={handleOpenChange} />
<Layout style={{flex: 1, overflow: 'hidden'}}>
<Layout style={{flex: 1, overflow: 'hidden', display: 'flex', flexDirection: 'column'}}>
<Header style={{
padding: '0 24px',
background: '#fff',
display: 'flex',
justifyContent: 'flex-end',
alignItems: 'center',
boxShadow: '0 1px 4px rgba(0,21,41,.08)'
boxShadow: '0 1px 4px rgba(0,21,41,.08)',
height: 64,
flexShrink: 0
}}>
<Space size={24}>
<Space size={16}>
@ -220,11 +227,13 @@ const BasicLayout: React.FC = () => {
</Space>
</Header>
<Content style={{
margin: '24px 16px',
padding: 24,
background: '#fff',
minHeight: 280,
overflow: 'auto'
margin: '24px 16px',
padding: 24,
background: '#fff',
flex: 1,
overflow: 'auto',
display: 'flex',
flexDirection: 'column'
}}>
<Outlet/>
</Content>