Pre Merge pull request !408 from lizhipeng/develop_lizhipeng

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java

@@ -3,7 +3,7 @@ package com.ruoyi.common.core.exception.file;
 import java.util.Arrays;
 
 /**
- * 文件上传 误异常类
+ * 文件上传无效扩展名异常类
  * 
  * @author ruoyi
  */

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;

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;