From 2fdb5f563f7d9fa00d8e5343d992342ff34e3a5a Mon Sep 17 00:00:00 2001
From: Soybean <honghuangdc@gmail.com>
Date: Sun, 21 Nov 2021 16:31:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(projects):=20=E5=B8=83=E5=B1=80=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9A=E4=BB=8E=E5=A1=AB=E5=85=85=E5=B1=8F=E5=B9=95?=
 =?UTF-8?q?=E9=AB=98=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2=E8=87=B3?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=87=B4=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E5=9D=8D=E5=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/GlobalContent/index.vue | 26 ++++++++-----------
 .../components/common/SettingDrawer/index.vue |  2 +-
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/layouts/BasicLayout/components/common/GlobalContent/index.vue b/src/layouts/BasicLayout/components/common/GlobalContent/index.vue
index 35469951..3948b55d 100644
--- a/src/layouts/BasicLayout/components/common/GlobalContent/index.vue
+++ b/src/layouts/BasicLayout/components/common/GlobalContent/index.vue
@@ -1,19 +1,15 @@
 <template>
-  <div class="flex-1-hidden bg-[#f6f9f8] dark:bg-deep-dark p-16px transition-all duration-300 ease-in-out">
-    <div class="min-h-full" :class="{ 'h-full overflow-hidden': routeProps.fullPage }">
-      <router-view v-slot="{ Component, route }">
-        <transition :name="theme.pageAnimateType" mode="out-in" appear>
-          <keep-alive :include="cacheRoutes">
-            <component
-              :is="Component"
-              v-if="app.reloadFlag"
-              :key="route.fullPath"
-              :class="{ 'h-full': routeProps.fullPage }"
-            />
-          </keep-alive>
-        </transition>
-      </router-view>
-    </div>
+  <div
+    class="flex-1 flex-col-stretch bg-[#f6f9f8] dark:bg-deep-dark p-16px transition-all duration-300 ease-in-out"
+    :class="{ 'overflow-hidden': routeProps.fullPage }"
+  >
+    <router-view v-slot="{ Component, route }">
+      <transition :name="theme.pageAnimateType" mode="out-in" appear>
+        <keep-alive :include="cacheRoutes">
+          <component :is="Component" v-if="app.reloadFlag" :key="route.fullPath" class="flex-1" />
+        </keep-alive>
+      </transition>
+    </router-view>
   </div>
 </template>
 
diff --git a/src/layouts/BasicLayout/components/common/SettingDrawer/index.vue b/src/layouts/BasicLayout/components/common/SettingDrawer/index.vue
index 66e11baa..ec7b6862 100644
--- a/src/layouts/BasicLayout/components/common/SettingDrawer/index.vue
+++ b/src/layouts/BasicLayout/components/common/SettingDrawer/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <n-drawer v-model:show="app.settingDrawer.visible" :width="330">
+  <n-drawer v-model:show="app.settingDrawer.visible" display-directive="show" :width="330">
     <n-drawer-content title="主题配置" :native-scrollbar="false">
       <dark-mode />
       <nav-mode />