@lambo-design/pro-layout 1.0.0-beta.2 → 1.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "",
   "main": "index.js",
   "scripts": {

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

@@ -1,11 +1,11 @@
 <template>
   <Dropdown ref="dropdown" :class="hideTitle ? '' : 'collased-menu-dropdown'" :placement="placement"
-            :transfer="hideTitle" @on-click="handleClick">
-    <a :style="{textAlign: !hideTitle ? 'left' : ''}" class="drop-menu-a" type="text"
+            :transfer="!hideTitle" @on-click="handleClick">
+    <a :style="{textAlign: !hideTitle ? 'left' : '',padding: !hideTitle ? '0px' : ''}" class="drop-menu-a" type="text"
        @mouseover="handleMousemove($event, children)">
       <ProLayoutSiderIcon :icon-type="parentItem.meta.icon"></ProLayoutSiderIcon>
       <span v-if="!hideTitle" class="menu-title">{{ showTitle(parentItem) }}</span>
-      <Icon v-if="!hideTitle" :size="20" style="float: right;" type="ios-arrow-forward"/>
+      <Icon v-if="!hideTitle" :size="16"type="ios-arrow-forward"/>
     </a>
     <DropdownMenu ref="dropdown" slot="list">
       <template v-for="child in children">
@@ -73,22 +73,17 @@ export default {
     color: var(--heading-color, @_heading-color);
     background: rgba(26,26,26,0.05);
   }
-  a.drop-menu-a{
-    display: inline-block;
-    width: 100%;
-    font-weight: normal;
-    color: var(--text-color, @_text-color);
-    &:hover{
-      color: var(--heading-color, @_heading-color);
+  /deep/.ivu-dropdown-rel{
+    a.drop-menu-a{
+      display: inline-block;
+      width: 100%;
+      font-weight: normal;
+      color: var(--text-color, @_text-color) !important;
+      text-decoration: none;
+      &:hover{
+        color: var(--heading-color, @_heading-color) !important;
+      }
     }
   }
 }
-</style>
-<style lang="less">
-.ivu-select-dropdown {
-  &.ivu-dropdown-transfer {
-    max-height: 400px;
-    max-width: 150px;
-  }
-}
 </style>

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

@@ -205,6 +205,7 @@ export default {
 <style scoped lang="less">
 @import "@lambo-design/core/src/styles/default";
 .pro-layout-sider{
+  overflow-y: scroll;
   /deep/.ivu-menu-submenu{
     .ivu-menu{
       background: #1A1A1A;

package/src/index.vue

@@ -199,7 +199,7 @@ export default {
 .pro-layout{
   color: #ffffff;
   min-width: 1100px;
-  min-height: 600px;
+  min-height: 550px;
   .ivu-layout-header{
     padding: 0;
   }

package/src/styles/css/main.less

@@ -1,92 +0,0 @@
-.pro-layout{
-  .logo-con{
-    height: 64px;
-    padding: 10px;
-    background-color: #1890ff;
-    position: sticky;
-    top: 0px;
-    z-index: 1000;
-    img{
-      height: 44px;
-      width: 44px;
-      margin-left: 15px;
-      float: left;
-    }
-    .system-title{
-      float: left;
-      font-weight: bolder;
-      font-size: 30px;
-      margin-right: 20px;
-      color: #ffffff;
-    }
-  }
-  .header-con{
-    background: #1890ff;
-    color: #ffffff;
-    padding: 0 0px;
-    width: 100%;
-  }
-  .main-layout-con{
-    height: 100%;
-    overflow: hidden;
-  }
-  .main-content-con{
-    height: ~"calc(100% - 60px)";
-    overflow: hidden;
-  }
-  //tab框样式
-  .tags-nav .scroll-outer {
-    background: #f5f7f9;
-    box-shadow: 0px 0 3px 2px #f5f7f9 inset
-  }
-  .tag-nav-wrapper{
-    padding: 0;
-    height:40px;
-    background:#F0F0F0;
-  }
-  .content-wrapper{
-    height: ~"calc(100% - 80px)";
-    background: #ffffff;
-  }
-  .left-sider{
-    background: #f5f7f9;
-    .ivu-layout-sider-children{
-      overflow-y: scroll;
-      margin-right: -18px;
-    }
-  }
-}
-.ivu-menu-item > i{
-  margin-right: 12px !important;
-}
-.ivu-menu-submenu > .ivu-menu > .ivu-menu-item > i {
-  margin-right: 8px !important;
-}
-.collased-menu-dropdown{
-  width: 100%;
-  margin: 0;
-  line-height: normal;
-  padding: 7px 0 6px 16px;
-  clear: both;
-  font-size: 12px !important;
-  white-space: nowrap;
-  list-style: none;
-  cursor: pointer;
-  transition: background 0.2s ease-in-out;
-  &:hover{
-    background: rgba(100, 100, 100, 0.1);
-  }
-  & * {
-    color: #515a6e;
-  }
-  .ivu-menu-item > i{
-    margin-right: 12px !important;
-  }
-  .ivu-menu-submenu > .ivu-menu > .ivu-menu-item > i {
-    margin-right: 8px !important;
-  }
-}
-
-.ivu-select-dropdown.ivu-dropdown-transfer{
-  max-height: 400px;
-}