From 0c8e9ad74eda1b3f680c9b48666849c7049e1a1f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 4 Sep 2025 19:58:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BA=E5=AE=9A=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E6=97=B6=E5=87=BA=E7=8E=B0=E7=9A=84=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E5=81=8F=E7=A7=BB=E9=97=AE=E9=A2=98(ICV9OH)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/layout/components/AppMain.vue | 20 +++++++++++---------
 ruoyi-ui/src/layout/index.vue              |  5 +++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index 9209165a6..5273773df 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -53,12 +53,19 @@ export default {
   overflow: hidden;
 }
 
+.fixed-header + .app-main {
+  overflow-y: auto;
+  scrollbar-gutter: auto;
+  height: calc(100vh - 50px);
+  min-height: 0px;
+}
+
 .app-main:has(.copyright) {
   padding-bottom: 36px;
 }
 
 .fixed-header + .app-main {
-  padding-top: 50px;
+  margin-top: 50px;
 }
 
 .hasTagsView {
@@ -68,19 +75,14 @@ export default {
   }
 
   .fixed-header + .app-main {
-    padding-top: 84px;
+    margin-top: 84px;
+    height: calc(100vh - 84px);
+    min-height: 0px;
   }
 }
 </style>
 
 <style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 6px;
-  }
-}
-
 ::-webkit-scrollbar {
   width: 6px;
   height: 6px;
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index 05e2fa91b..e8b7c3866 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -77,6 +77,11 @@ export default {
     }
   }
 
+  .main-container:has(.fixed-header) {
+    height: 100vh;
+    overflow: hidden;
+  }
+
   .drawer-bg {
     background: #000;
     opacity: 0.3;