Pre Merge pull request !439 from ckpaly/springboot3

ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -130,10 +130,12 @@
   border-radius: 4px;
 }
 
-/* horizontal el menu */
+/* el menu */
-.el-menu--horizontal .el-menu-item .svg-icon + span,
+.el-menu-item,
-.el-menu--horizontal .el-submenu__title .svg-icon + span {
+.el-sub-menu {
-  margin-left: 3px;
+  .svg-icon + span {
+    margin-left: 5px;
+  }
 }
 
 .el-menu--horizontal .el-menu--popup {

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -116,17 +116,15 @@
       margin-left: 54px;
     }
 
-    .el-menu:not(.el-menu--horizontal) {
+    .submenu-title-noDropdown {
-      .submenu-title-noDropdown {
+      padding: 0 !important;
+      position: relative;
+
+      .el-tooltip {
         padding: 0 !important;
-        position: relative;
 
-        .el-tooltip {
+        .svg-icon {
-          padding: 0 !important;
+          margin-left: 20px;
-
-          .svg-icon {
-            margin-left: 20px;
-          }
         }
       }
     }

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

@@ -80,39 +80,6 @@ export default {
     min-height: 0px;
   }
 }
-
-/* 移动端fixed-header优化 */
-@media screen and (max-width: 991px) {
-  .fixed-header + .app-main {
-    padding-bottom: max(60px, calc(constant(safe-area-inset-bottom) + 40px));
-    padding-bottom: max(60px, calc(env(safe-area-inset-bottom) + 40px));
-    overscroll-behavior-y: none;
-  }
-
-  .hasTagsView .fixed-header + .app-main {
-    padding-bottom: max(60px, calc(constant(safe-area-inset-bottom) + 40px));
-    padding-bottom: max(60px, calc(env(safe-area-inset-bottom) + 40px));
-    overscroll-behavior-y: none;
-  }
-}
-
-@supports (-webkit-touch-callout: none) {
-  @media screen and (max-width: 991px) {
-    .fixed-header + .app-main {
-      padding-bottom: max(17px, calc(constant(safe-area-inset-bottom) + 10px));
-      padding-bottom: max(17px, calc(env(safe-area-inset-bottom) + 10px));
-      height: calc(100svh - 50px);
-      height: calc(100dvh - 50px);
-    }
-
-    .hasTagsView .fixed-header + .app-main {
-      padding-bottom: max(17px, calc(constant(safe-area-inset-bottom) + 10px));
-      padding-bottom: max(17px, calc(env(safe-area-inset-bottom) + 10px));
-      height: calc(100svh - 84px);
-      height: calc(100dvh - 84px);
-    }
-  }
-}
 </style>
 
 <style lang="scss">

ruoyi-ui/src/layout/components/TopBar/index.vue

@@ -60,22 +60,36 @@ export default {
 </script>
 
 <style lang="scss">
-/* menu item */
+.topbar-menu.el-menu--horizontal > .el-menu-item {
-.topbar-menu.el-menu--horizontal .el-submenu__title, .topbar-menu.el-menu--horizontal .el-menu-item {
+  float: left;
-  padding: 0 10px !important;
+  height: 50px !important;
+  line-height: 50px !important;
+  color: #303133 !important;
+  padding: 0 5px !important;
+  margin: 0 10px !important;
 }
 
-.el-menu--horizontal .el-menu--popup .el-menu-item:hover {
+.el-menu-item.is-active .svg-icon + span, .el-submenu.is-active .svg-icon + span{
-  background-color: #f5f7fa !important;
+  color: v-bind(theme);
+}
+
+.el-menu--horizontal .el-menu .el-menu-item, .el-menu--horizontal .el-menu .el-submenu__title {
+  color: #303133 !important;
 }
 
 /* submenu item */
 .topbar-menu.el-menu--horizontal > .el-submenu .el-submenu__title {
   float: left;
-  height: 47px !important;
+  height: 50px !important;
   line-height: 50px !important;
-  color: #303133;
+  color: #303133 !important;
-  margin: 0 15px !important;
+  padding: 0 5px !important;
+  margin: 0 10px !important;
+}
+
+/* 图标右间距 */
+.topbar-menu .svg-icon {
+  margin-right: 4px;
 }
 
 /* topbar more arrow */ 
@@ -89,10 +103,6 @@ export default {
 /* menu__title el-menu-item */
 .topbar-menu.el-menu--horizontal .el-submenu__title, .topbar-menu.el-menu--horizontal .el-menu-item {
   height: 55px;
-}
+  padding: 0 15px;
-
-.el-menu--horizontal .el-menu .el-menu-item, .el-menu--horizontal .el-menu .el-submenu__title{
-  color: #303133;
 }
 </style>
-

ruoyi-ui/src/settings.js

@@ -32,7 +32,7 @@ module.exports = {
   /**
    * 是否固定头部
    */
-  fixedHeader: true,
+  fixedHeader: false,
 
   /**
    * 是否显示logo