From 5e10fcecf06a880f9b12dd77657b513b3b892b95 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 10 Jun 2025 09:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=A0=B7=E5=BC=8F=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/sidebar.scss    | 16 ++++++++--------
 src/layout/components/AppMain.vue |  6 ++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 334d5d90..98848948 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,13 +1,13 @@
 #app {
 
   .main-container {
-    height: calc(100%-80px); 
-    // width: calc(100%-240px);
+    height: 90%;  
+    // overflow-y: auto;
     width: -webkit-fill-available;
     transition: margin-left .28s;
     margin-left: $base-sidebar-width;
-    position: absolute;
-    top: 84px;
+    // position: absolute;
+    // top: 84px;
   }
 
   .sidebarHide {
@@ -19,16 +19,16 @@
     transition: width 0.28s;
     width: $base-sidebar-width !important;
     background-color: $base-menu-background;
-    height: inherit;
+    height: 90%;
     position: absolute;
     font-size: 0px;
     top: 84px;
     bottom: 0;
     left: 0;
     z-index: 1001;
-    overflow: hidden;
-    // -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    // box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    // overflow: hidden;
+    -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    box-shadow: 2px 0 6px rgba(0,21,41,.35);
 
     // reset element-ui css
     .horizontal-collapse-transition {
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index a25c5625..c212d1fb 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -29,7 +29,8 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
+  height: 85vh;
+  overflow-y: auto;
   width: 100%;
   position: relative;
   overflow: hidden;
@@ -42,7 +43,8 @@ export default {
 .hasTagsView {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
+    height: 85vh;
+    overflow-y: auto;
   }
 
   .fixed-header + .app-main {