@lambo-design/pro-layout 1.0.0-beta.240 → 1.0.0-beta.241

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.240",
+  "version": "1.0.0-beta.241",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,8 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/core": "^4.7.1-beta.59",
-    "@lambo-design/shared": "^1.0.0-beta.43"
+    "@lambo-design/shared": "^1.0.0-beta.43",
+    "@lambo-design/core": "^4.7.1-beta.59"
   },
   "scripts": {}
 }

package/src/components/pro-layout-nav.vue

@@ -132,61 +132,21 @@ export default {
 
 <style scoped lang="less">
 @import '@lambo-design/core/src/styles/default.less';
-
 .pro-layout-nav-wrapper {
   .ivu-menu {
     .ivu-menu-item {
       &:hover {
-        //background: linear-gradient(to bottom, rgba(255, 255, 255, 0.4) 0%, rgba(255, 255, 255, 0) 100%);
-
         .line {
-          border-bottom: 3.35px solid var(--primary-color-tint-5, @_primary-color-tint-5);
           position: absolute;
           left: 0;
           right: 0;
         }
       }
-
       &.ivu-menu-item-active, &.ivu-menu-item-selected {
-        //background: linear-gradient(to bottom, rgba(255, 255, 255, 0.4) 0%, rgba(255, 255, 255, 0) 100%);
-
         .line {
-          border-bottom: 3.35px solid var(--primary-color-tint-5, @_primary-color-tint-5);
           position: absolute;
           left: 0;
           right: 0;
-          //bottom: 0;
-        }
-      }
-    }
-
-    /deep/ .ivu-menu-submenu {
-      //background: var(--menu-dark-title, @_menu-dark-title);
-      //color: var(--heading-color-dark, @_heading-color-dark);
-      .ivu-menu-submenu-title > i {
-        &.ivu-menu-submenu-title-icon {
-
-        }
-      }
-
-      .ivu-select-dropdown {
-        //background: var(--menu-dark-title, @_menu-dark-title);
-        //color: var(--heading-color-dark, @_heading-color-dark);
-
-        .ivu-menu-drop-list {
-          .ivu-menu-item {
-            //color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
-
-            &:hover {
-              //background: rgba(255, 255, 255, 0.2);
-              //color: var(--heading-color-dark, @_heading-color-dark);
-            }
-
-            &.ivu-menu-item-active, &.ivu-menu-item-selected {
-              //background: rgba(255, 255, 255, 0.2);
-              //color: var(--heading-color-dark, @_heading-color-dark);
-            }
-          }
         }
       }
     }

package/src/components/pro-layout-sider-menu-item.vue

@@ -101,5 +101,4 @@ export default {
 
 <style scoped lang="less">
 @import '../styles/other-menu.less';
-
 </style>

package/src/components/pro-layout-sider-search.vue

@@ -158,7 +158,6 @@ export default {
     .sideInput{
       width: 240px;
       transform: translateX(-13px);
-      //background-color: var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
       /deep/.ivu-input-prefix{
         top:1px;
       }
@@ -170,20 +169,16 @@ export default {
       height: 40px;
       font-weight: 400;
       border: none;
-      //background-color: var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
       text-align:left; /* 确保文本默认左对齐 */
-      //color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
       padding-right: 99px;
       padding-left: 58px;
       &::placeholder{
         font-size: 14px;
         font-weight: 400;
-        //color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
       }
     }
     /deep/.ivu-icon-ios-search:before {
       margin-right: -54px; /* 向右移动10像素 */
-      //color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
       line-height: 1.6
     }
   }
@@ -200,7 +195,6 @@ export default {
     margin-left: -13px;
     overflow-x: hidden;
     overflow-y: auto;
-    //background-color:  var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
     -ms-overflow-style: none;  /* Internet Explorer 10+ */
     scrollbar-width: none;  /* Firefox */
     &::-webkit-scrollbar {
@@ -210,7 +204,6 @@ export default {
       font-size: 14px;
       font-weight: 400;
       width: 200px;
-      //color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
       margin-bottom: 8px;
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -225,7 +218,6 @@ export default {
       &:hover {
         overflow: visible;
         cursor: pointer;
-        //color: var(--primary-color-tint-20,@_primary-color-tint-20);
         .text {
           animation-play-state: running;
         }
@@ -243,7 +235,6 @@ export default {
     margin-left: 0px;
     margin-top: 1px;
     .ivu-modal-content{
-      //background-color: var(--menu-dark-active-bg  ,@_menu-dark-active-bg );
       width: 218px;
       margin-top: -18px;
       height: 270px;

package/src/components/pro-layout-sider.vue

@@ -341,14 +341,8 @@ export default {
 <style scoped lang="less">
 @import "@lambo-design/core/src/styles/default";
 @import '../styles/other-menu.less';
-
 .pro-layout-sider-wrapper{
   margin-bottom: 50px;
-  /deep/.ivu-menu-submenu{
-    .ivu-menu{
-      //background: #1A1A1A;
-    }
-  }
   .menu-collapsed {
     padding-top: 10px;
     /deep/a.drop-menu-a{
@@ -357,17 +351,8 @@ export default {
       width: 100%;
       text-align: center;
       font-weight: normal;
-      //color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
-      &:hover{
-        //color: var(--heading-color-dark, @_heading-color-dark);
-      }
-      &.selected-parent{
-        //  color: #ffffff !important;
-        //background: #306BE3 !important;
-      }
     }
     overflow: hidden;
-
   }
 }
 </style>

package/src/components/pro-layout-tools-user.vue

@@ -206,46 +206,12 @@ export default {
 </script>
 <style lang="less" scoped>
 @import '@lambo-design/core/src/styles/default.less';
-
-.font-color {
-  //color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
-}
-
 .font-padding {
   padding-right: 10px
 }
-
 .user-avatar-dropdown {
   cursor: pointer;
   vertical-align: middle;
-  //color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
   font-size: var(--font-size-base, @_font-size-base);
-
-  /deep/ .ivu-dropdown-rel {
-    &:hover {
-      //color: var(--heading-color-dark, @_heading-color-dark);
-    }
-  }
-
-  /deep/ .ivu-select-dropdown {
-    //background: var(--menu-dark-title, @_menu-dark-title);
-    //color: var(--heading-color-dark, @_heading-color-dark);
-
-    .ivu-dropdown-menu {
-      .ivu-dropdown-item {
-        //color: var(--menu-dark-subsidiary-color, @_menu-dark-subsidiary-color);
-
-        &:hover {
-          //background: rgba(255, 255, 255, 0.2);
-          //color: var(--heading-color-dark, @_heading-color-dark);
-        }
-
-        &.ivu-menu-item-active, &.ivu-menu-item-selected {
-          //background: rgba(255, 255, 255, 0.2);
-          //color: var(--heading-color-dark, @_heading-color-dark);
-        }
-      }
-    }
-  }
 }
 </style>

package/src/components/pro-layout-trigger.vue

@@ -23,7 +23,6 @@ export default {
 </script>
 
 <style scoped lang="less">
-@import "@lambo-design/core/src/styles/default";
 .trans{
   transition: transform .2s ease;
 }
@@ -35,7 +34,6 @@ export default {
   height: @size;
   display: inline-block;
   text-align: center;
-  color: var(--layout-header-color ,@_layout-header-color);
   margin-top: 12px;
   i{
     .trans;

package/src/styles/color.less

@@ -1,14 +1,18 @@
 @import "@lambo-design/core/src/styles/default";
 .pro-layout{
   color: var(--layout-color ,@_layout-color);
-  .active {
-    color: var(--layout-active-color ,@_layout-active-color);
-  }
   .pro-layout-header{
     background: var(--layout-header-background,@_layout-header-background);
     color: var(--layout-header-color ,@_layout-header-color);
-    .active {
-      color: var(--layout-header-active-color,@_layout-header-active-color);
+    .pro-layout-header-wrapper{
+      .sider-trigger-a{
+        color: var(--layout-color ,@_layout-color);
+      }
+    }
+    .pro-layout-logo-wrapper{
+      .system-name{
+        color: var(--layout-color ,@_layout-color);
+      }
     }
     .pro-layout-nav-wrapper{
       background: var(--layout-header-background,@_layout-header-background);
@@ -16,13 +20,47 @@
       .ivu-menu-dark{
         background: var(--layout-header-background,@_layout-header-background);
         color: var(--layout-header-nav-color,@_layout-header-nav-color);
+        .ivu-menu-item {
+          &:hover {
+            .line {
+              border-bottom: 3.35px solid var(--primary-color-tint-5, @_primary-color-tint-5);
+            }
+          }
+        }
         .ivu-menu-item-active,.ivu-menu-item-selected{
           background: linear-gradient(to bottom, var(--layout-header-nav-active-background-begin,@_layout-header-nav-active-background-begin) 0%, var(--layout-header-nav-active-background-end,@_layout-header-nav-active-background-end) 100%);
           color: var(--layout-header-nav-active-color,@_layout-header-nav-active-color);
+          .line {
+            border-bottom: 3.35px solid var(--primary-color-tint-5, @_primary-color-tint-5);
+          }
+        }
+        .ivu-menu-submenu {
+          .ivu-select-dropdown {
+            background: var(--layout-header-background,@_layout-header-background);
+            color: var(--layout-header-nav-color,@_layout-header-nav-color);
+            .ivu-menu-item {
+              background: var(--layout-header-background,@_layout-header-background);
+              color: var(--layout-header-nav-color,@_layout-header-nav-color);
+              &:hover {
+                background: var(--layout-header-drop-active-background,@_layout-header-drop-active-background);
+                color: var(--layout-header-nav-active-color,@_layout-header-nav-active-color);
+              }
+              &.ivu-menu-item-active, &.ivu-menu-item-selected {
+                background: var(--layout-header-drop-active-background,@_layout-header-drop-active-background);
+                color: var(--layout-header-nav-active-color,@_layout-header-nav-active-color);
+              }
+            }
+          }
         }
       }
     }
     .pro-layout-tools-wrapper{
+      .font-padding{
+        color: var(--layout-header-drop-color,@_layout-header-drop-color);
+        &:hover {
+          color: var(--layout-header-drop-active-color,@_layout-header-drop-active-color);
+        }
+      }
       .user-avatar-dropdown{
         .ivu-select-dropdown{
           background: var(--layout-header-background,@_layout-header-background);
@@ -60,14 +98,30 @@
           .ivu-menu-item{
             background: var(--layout-sider-menuitem-background,@_layout-sider-menuitem-background);
             color: var(--layout-sider-menu-color ,@_layout-sider-menu-color);
-            &.ivu-menu-item-active,&.ivu-menu-item-selected{
+            &.ivu-menu-item-active,&.ivu-menu-item-selected,&:hover{
               background: var(--layout-sider-menuitem-active-background,@_layout-sider-menuitem-active-background);
               color: var(--layout-sider-menu-active-color,@_layout-sider-menu-active-color);
             }
           }
-          &.ivu-menu-item-active,&.ivu-menu-child-item-active{
+          &.ivu-menu-item-selected,&.ivu-menu-opened,&:hover{
             background: var(--layout-sider-submenu-active-background,@_layout-sider-submenu-active-background);
             color: var(--layout-sider-menu-active-color,@_layout-sider-menu-active-color);
+            >.ivu-menu-submenu-title{
+              background: var(--layout-sider-background,@_layout-sider-background);
+              color: var(--layout-sider-menu-active-color ,@_layout-sider-menu-active-color);
+            }
+          }
+        }
+      }
+      .menu-collapsed{
+        a.drop-menu-a{
+          color: var(--layout-sider-menu-color ,@_layout-sider-menu-color);
+          &:hover{
+            color: var(--layout-sider-menu-active-color ,@_layout-sider-menu-active-color);
+          }
+          &.selected-parent{
+            background: var(--layout-sider-menuitem-active-background,@_layout-sider-menuitem-active-background);
+            color: var(--layout-sider-menu-active-color ,@_layout-sider-menu-active-color);
           }
         }
       }
@@ -96,7 +150,16 @@
     }
   }
 }
-
+.collased-menu-dropdown{
+  .ivu-dropdown-rel{
+    a.drop-menu-a{
+      color: var(--text-color ,@_text-color);
+      &:hover{
+        color: var(--text-color ,@_text-color);
+      }
+    }
+  }
+}
 .search-fast-con-side-modal{
   .ivu-modal-content{
     background: var(--layout-sider-menu-background,@_layout-sider-menu-background);