Pre Merge pull request !422 from root/N/A

ruoyi-ui/src/layout/components/AppMain.vue

@@ -53,19 +53,12 @@ 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 {
-  margin-top: 50px;
+  padding-top: 50px;
 }
 
 .hasTagsView {
@@ -75,14 +68,19 @@ export default {
   }
 
   .fixed-header + .app-main {
-    margin-top: 84px;
+    padding-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;

ruoyi-ui/src/layout/index.vue

@@ -77,11 +77,6 @@ export default {
     }
   }
 
-  .main-container:has(.fixed-header) {
-    height: 100vh;
-    overflow: hidden;
-  }
-
   .drawer-bg {
     background: #000;
     opacity: 0.3;