From 771be2f3bbc6b28d7f9952673790ceb1fa07554a Mon Sep 17 00:00:00 2001
From: d3george <dingsheng@dingshengdeMacBook-Pro.local>
Date: Fri, 8 Nov 2024 18:24:52 +0800
Subject: [PATCH] fix: https://github.com/d3george/slash-admin/issues/97

---
 src/layouts/dashboard/header.tsx           | 4 ++--
 src/layouts/dashboard/index.tsx            | 2 +-
 src/layouts/dashboard/nav/nav-vertical.tsx | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/layouts/dashboard/header.tsx b/src/layouts/dashboard/header.tsx
index 65b6a127..2bf06146 100644
--- 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
index 2c617230..1d294788 100644
--- 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
index 2e5bd4f6..d25005a7 100644
--- 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()}`,
       }}
     >