fix: #97

d3george · Nov 8, 2024 · 771be2f · 771be2f
1 parent dd4b555
commit 771be2f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/layouts/dashboard/header.tsx b/src/layouts/dashboard/header.tsx
@@ -15,7 +15,7 @@ import SearchBar from '../_common/search-bar';
 import SettingButton from '../_common/setting-button';
 
 import { NAV_COLLAPSED_WIDTH, NAV_WIDTH, HEADER_HEIGHT, OFFSET_HEADER_HEIGHT } from './config';
-import Nav from './nav/nav-vertical';
+import NavVertical from './nav/nav-vertical';
 
 import { ThemeLayout } from '#/enum';
 
@@ -102,7 +102,7 @@ export default function Header({ className = '', offsetTop = false }: Props) {
         }}
         width="auto"
       >
-        <Nav closeSideBarDrawer={() => setDrawerOpen(false)} />
+        <NavVertical closeSideBarDrawer={() => setDrawerOpen(false)} />
       </Drawer>
     </>
   );

diff --git a/src/layouts/dashboard/index.tsx b/src/layouts/dashboard/index.tsx
@@ -47,9 +47,9 @@ function DashboardLayout() {
     <ScrollbarStyleWrapper $themeMode={themeMode}>
       <ProgressBar />
       <Layout className={layoutClassName}>
-        <Header offsetTop={themeLayout === ThemeLayout.Vertical ? offsetTop : undefined} />
         <Suspense fallback={<CircleLoading />}>
           <Layout>
+            <Header offsetTop={themeLayout === ThemeLayout.Vertical ? offsetTop : undefined} />
             <Nav />
             <Main ref={mainEl} offsetTop={offsetTop} />
           </Layout>

diff --git a/src/layouts/dashboard/nav/nav-vertical.tsx b/src/layouts/dashboard/nav/nav-vertical.tsx
@@ -97,6 +97,7 @@ export default function NavVertical(props: Props) {
       width={NAV_WIDTH}
       theme={sidebarTheme}
       style={{
+        height: '100vh',
         borderRight: `1px dashed ${Color(colorBorder).alpha(0.6).toString()}`,
       }}
     >