From 9fb641f71e74e054c84cda8e18969d1168ef2903 Mon Sep 17 00:00:00 2001
From: Soybean <honghuangdc@gmail.com>
Date: Sun, 28 Nov 2021 12:16:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(components):=20=E4=BF=AE=E5=A4=8DHorizontal?=
 =?UTF-8?q?Layout=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicLayout/components/HorizontalLayout/index.vue  | 10 ++++------
 src/plugins/assets.ts                                  |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/layouts/BasicLayout/components/HorizontalLayout/index.vue b/src/layouts/BasicLayout/components/HorizontalLayout/index.vue
index b9239911..5b0ce8ca 100644
--- a/src/layouts/BasicLayout/components/HorizontalLayout/index.vue
+++ b/src/layouts/BasicLayout/components/HorizontalLayout/index.vue
@@ -1,19 +1,17 @@
 <template>
-  <n-layout :native-scrollbar="false" :content-style="scrollbarContentStyle" class="h-full">
+  <n-layout ref="scrollbar" :native-scrollbar="false" :content-style="scrollbarContentStyle" class="h-full">
     <n-layout-header :inverted="headerInverted" :position="headerPosition" :class="{ 'z-11': theme.fixedHeaderAndTab }">
       <global-header :show-logo="true" :show-menu-collape="false" :show-menu="true" class="relative z-2" />
       <global-tab v-if="theme.multiTabStyle.visible" />
     </n-layout-header>
     <space-placeholder />
-    <n-layout-content ref="scrollbar" class="flex-1" :native-scrollbar="false" :content-style="scrollbarContentStyle">
-      <global-content />
-      <global-footer />
-    </n-layout-content>
+    <global-content />
+    <global-footer />
   </n-layout>
 </template>
 
 <script setup lang="ts">
-import { NLayout, NLayoutContent, NLayoutHeader } from 'naive-ui';
+import { NLayout, NLayoutHeader } from 'naive-ui';
 import { useThemeStore } from '@/store';
 import { useLayoutConfig } from '@/composables';
 import { GlobalHeader, GlobalContent, GlobalFooter, GlobalTab, SpacePlaceholder } from '@/layouts/common';
diff --git a/src/plugins/assets.ts b/src/plugins/assets.ts
index 7e30ad8a..04c8a700 100644
--- a/src/plugins/assets.ts
+++ b/src/plugins/assets.ts
@@ -1,8 +1,8 @@
 import 'virtual:windi.css';
-import '../styles/css/global.css';
 import 'swiper/css';
 import 'swiper/css/navigation';
 import 'swiper/css/pagination';
+import '../styles/css/global.css';
 
 /** 引入静态资源 */
 export default function setupAssets() {}