Pre Merge pull request !436 from mpaster/cherry-pick-1759037399

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -149,7 +149,7 @@
 			<if test="visible != null">visible = #{visible},</if>
 			<if test="status != null">status = #{status},</if>
 			<if test="perms !=null">perms = #{perms},</if>
-			<if test="icon !=null and icon != ''">icon = #{icon},</if>
+			icon = #{icon},
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = sysdate()

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

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

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

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

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

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

ruoyi-ui/src/views/system/menu/index.vue

@@ -139,7 +139,7 @@
                 @show="$refs['iconSelect'].reset()"
               >
                 <IconSelect ref="iconSelect" @selected="selected" :active-icon="form.icon" />
-                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
+                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" clearable>
                   <svg-icon
                     v-if="form.icon"
                     slot="prefix"