@lambo-design/pro-layout 1.0.0-beta.294 → 1.0.0-beta.296

package/package.json

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

package/src/components/pro-layout-header/pro-layout-nav/components/pro-layout-nav-slide-menu.vue

@@ -1,185 +1,188 @@
-<template>
-  <div class="menu-list" >
-    <ul class="top-menu" :style="layoutSize === 'default' ? {height: '64px'} : {height: '50px'}" ref="topNav">
-      <li class="top-menu-item" :class="{ 'active': activeName === item.appId }" v-for="(item,index) in topMenList"  :key="item.appId"  @click="selectApp(item.appId)">
-        <div class="menu-item" :style="layoutSize === 'default' ? {paddingTop: '10px'} : {paddingTop: '2px'}"  v-show="pointer <= index && index < pointer + topMenuNum && flag">
-          <p class="menu-icon"><Icon :type="item.icon" :size="20"></Icon></p>
-          <p class="menu-txt">{{ item.name }}</p>
-        </div>
-      </li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import Bus from '@lambo-design/shared/utils/bus'
-import { deepCopy } from '@lambo-design/shared/utils/assist'
-
-export default {
-  props: {
-    acceptInt: {
-      type: Number,
-      default: 0
-    },
-    topMenListNum: {
-      type: Number,
-      default: 0
-    }
-  },
-  data() {
-    return {
-      systemInfo:{},
-      pointer:0,
-      flag:true,
-      arrowFlag: true,
-      acceptAppId: '',
-      navList: [],
-      topMenList: [],
-      topTqmMenList:[],
-      otherList: [],
-      activeName: '',
-      topMenuNum: 7,
-      lastTopMenuNum:-1,
-      originMenuList: [],
-      layoutSize:"default"
-    }
-  },
-  methods: {
-    initListener() {
-      Bus.$on('system-info',(data) => {
-        this.initSystemInfo(data);
-      })
-      Bus.$on('nav-list', (data) => {
-        this.initNav(data)
-      })
-      Bus.$on('change-app', ({ appId, appInfo }) => {
-        this.changeApp(appId, appInfo)
-      })
-    },
-    destroyListener() {
-      Bus.$off('system-info')
-      Bus.$off('nav-list')
-      Bus.$off('change-app')
-    },
-    initSystemInfo(data) {
-      if (data) {
-        this.layoutSize = data.layoutSize ? data.layoutSize : 'default';
-        this.topMenuNum = data.topMenuNum ? data.topMenuNum : 4;
-        this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
-        if (!this.activeName) {
-          this.activeName = this.acceptAppId
-        }
-        this.initNav(this.navList)
-      }
-    },
-    initNav(data) {
-      if (data.toString() === this.navList.toString() && this.topMenuNum === this.lastTopMenuNum) {
-        return
-      }
-      this.navList = data
-      this.lastTopMenuNum = this.topMenuNum
-      if (data.length > this.topMenuNum) {
-        let navList = deepCopy(data)
-        this.topMenList = navList
-        this.$emit('topMen-list', this.topMenList);
-        this.$emit('topMen-num', this.topMenuNum);
-        this.$emit('topMen-true', true);
-        // this.topMenList = navList.splice(0, this.topMenuNum)
-        // this.otherList = navList
-      } else {
-        this.topMenList = this.navList
-        this.$emit('topMen-true', false);
-      }
-      if (this.topMenList.length > 0) {
-        let appId = this.topMenList[0].appId
-        for (let i = 0; i < this.topMenList.length; i++) {
-          if (this.topMenList[i].selected == true) {
-            appId = this.topMenList[i].appId
-          }
-        }
-        if (this.activeName) {
-          appId = this.activeName
-        }
-        this.selectApp(appId)
-      }
-    },
-    selectApp(appId) {
-      if (appId) {
-        this.activeName = appId
-        let res = this.navList.filter(app => app.appId == appId)
-        Bus.$emit('change-app', { appId, appInfo: res[0] })
-      }
-    },
-    changeApp(appId, appInfo){
-      if (appId) {
-        this.activeName = appId
-      }
-    }
-  },
-  watch: {
-    acceptInt(val){
-      this.pointer = val;
-    }
-  },
-  created() {
-    this.initListener()
-  },
-  beforeDestroy() {
-    this.destroyListener()
-  }
-}
-</script>
-
-<style scoped lang="less">
-@import '@lambo-design/core/src/styles/default.less';
-.menu-list {
-  height: 100%;
-  line-height: 24px;
-  //color: #ffffff;
-  cursor: pointer;
-  font-size: 16px;
-  margin-left: 53px;
-  .top-menu {
-    overflow: hidden;
-    .top-menu-item {
-      margin-left: 34px;
-      position: relative;
-      height: 100%;
-      //color: #FFFFFF;
-      list-style: none;
-      float: left;
-      &:hover {
-        //background: transparent;
-        .menu-item {
-          //color: #fff;
-        }
-      }
-      &.active {
-        //background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0)) !important;
-        //border-bottom: 2px solid var(--primary-color-tint-5, @_primary-color-tint-5);
-        .menu-item {
-          //color: #fff;
-        }
-      }
-      .menu-item {
-        display: flex;
-        margin-top: 10px;
-        padding-right: 10px;
-      }
-      .menu-icon {
-        height: 20px;
-        line-height: 20px;
-        text-align: center;
-        margin-right: 10px;
-        margin-left: 10px;
-        margin-top: 3px;
-      }
-      .menu-txt {
-        text-align: center;
-        font-size: 14px;
-        line-height: 2;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="menu-list" >
+    <ul class="top-menu" :style="layoutSize === 'default' ? {height: '64px'} : {height: '50px'}" ref="topNav">
+      <li class="top-menu-item" v-show="pointer <= index && index < pointer + topMenuNum && flag" :class="{ 'active': activeName === item.appId }" v-for="(item,index) in topMenList"  :key="item.appId"  @click="selectApp(item.appId)">
+        <div class="menu-item" :style="layoutSize === 'default' ? {paddingTop: '10px'} : {paddingTop: '2px'}">
+          <p class="menu-icon"><Icon :type="item.icon" :size="20"></Icon></p>
+          <p class="menu-txt">{{ item.name }}</p>
+        </div>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import Bus from '@lambo-design/shared/utils/bus'
+import { deepCopy } from '@lambo-design/shared/utils/assist'
+
+export default {
+  props: {
+    acceptInt: {
+      type: Number,
+      default: 0
+    },
+    topMenListNum: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      systemInfo:{},
+      pointer:0,
+      flag:true,
+      arrowFlag: true,
+      acceptAppId: '',
+      navList: [],
+      topMenList: [],
+      topTqmMenList:[],
+      otherList: [],
+      activeName: '',
+      topMenuNum: 7,
+      lastTopMenuNum:-1,
+      originMenuList: [],
+      layoutSize:"default"
+    }
+  },
+  methods: {
+    initListener() {
+      Bus.$on('system-info',(data) => {
+        this.initSystemInfo(data);
+      })
+      Bus.$on('nav-list', (data) => {
+        this.initNav(data)
+      })
+      Bus.$on('change-app', ({ appId, appInfo }) => {
+        this.changeApp(appId, appInfo)
+      })
+    },
+    destroyListener() {
+      Bus.$off('system-info')
+      Bus.$off('nav-list')
+      Bus.$off('change-app')
+    },
+    initSystemInfo(data) {
+      if (data) {
+        this.layoutSize = data.layoutSize ? data.layoutSize : 'default';
+        this.topMenuNum = data.topMenu ? data.topMenu : 4;
+        this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
+        if (!this.activeName) {
+          this.activeName = this.acceptAppId
+        }
+        this.initNav(this.navList)
+      }
+    },
+    initNav(data) {
+      if (data.toString() === this.navList.toString() && this.topMenuNum === this.lastTopMenuNum) {
+        return
+      }
+      this.navList = data
+      this.lastTopMenuNum = this.topMenuNum
+      if (data.length > this.topMenuNum) {
+        let navList = deepCopy(data)
+        this.topMenList = navList
+        this.$emit('topMen-list', this.topMenList);
+        this.$emit('topMen-num', this.topMenuNum);
+        this.$emit('topMen-true', true);
+        // this.topMenList = navList.splice(0, this.topMenuNum)
+        // this.otherList = navList
+      } else {
+        this.topMenList = this.navList
+        this.$emit('topMen-true', false);
+      }
+      if (this.topMenList.length > 0) {
+        let appId = this.topMenList[0].appId
+        for (let i = 0; i < this.topMenList.length; i++) {
+          if (this.topMenList[i].selected == true) {
+            appId = this.topMenList[i].appId
+          }
+        }
+        if (this.activeName) {
+          appId = this.activeName
+        }
+        this.selectApp(appId)
+      }
+    },
+    selectApp(appId) {
+      if (appId) {
+        this.activeName = appId
+        let res = this.navList.filter(app => app.appId == appId)
+        Bus.$emit('change-app', { appId, appInfo: res[0] })
+      }
+    },
+    changeApp(appId, appInfo){
+      if (appId) {
+        this.activeName = appId
+      }
+    }
+  },
+  watch: {
+    acceptInt(val){
+      this.pointer = val;
+    }
+  },
+  created() {
+    this.initListener()
+  },
+  beforeDestroy() {
+    this.destroyListener()
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '@lambo-design/core/src/styles/default.less';
+.menu-list {
+  height: 100%;
+  line-height: 24px;
+  //color: #ffffff;
+  cursor: pointer;
+  font-size: 16px;
+  margin-left: 15px;
+  .top-menu {
+    overflow: hidden;
+    .top-menu-item {
+      margin-left: 34px;
+      position: relative;
+      height: 100%;
+      //color: #FFFFFF;
+      list-style: none;
+      float: left;
+      &:hover {
+        //background: transparent;
+        .menu-item {
+          //color: #fff;
+        }
+      }
+      &.active {
+        //background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0)) !important;
+        //border-bottom: 2px solid var(--primary-color-tint-5, @_primary-color-tint-5);
+        .menu-item {
+          //color: #fff;
+          width: 135px;
+        }
+      }
+      .menu-item {
+        display: flex;
+        margin-top: 10px;
+        padding-right: 10px;
+        width: 135px;
+
+      }
+      .menu-icon {
+        height: 20px;
+        line-height: 20px;
+        text-align: center;
+        margin-right: 10px;
+        margin-left: 10px;
+        margin-top: 3px;
+      }
+      .menu-txt {
+        text-align: center;
+        font-size: 14px;
+        line-height: 2;
+      }
+    }
+  }
+}
+</style>

package/src/styles/color.less

@@ -141,18 +141,6 @@
               color: var(--layout-sider-submenu-hover-color ,@_layout-sider-submenu-hover-color);
             }
           }
-          .ivu-menu-item{
-            background: var(--layout-sider-menuitem-background,@_layout-sider-menuitem-background)!important;
-            color: var(--layout-sider-menuitem-color ,@_layout-sider-menuitem-color);
-            &.ivu-menu-item-active,&.ivu-menu-item-selected{
-              background: var(--layout-sider-menuitem-active-background,@_layout-sider-menuitem-active-background)!important;
-              color: var(--layout-sider-menuitem-active-color,@_layout-sider-menuitem-active-color);
-            }
-            &:hover{
-              background: var(--layout-sider-menuitem-hover-background,@_layout-sider-menuitem-hover-background)!important;
-              color: var(--layout-sider-menuitem-hover-color,@_layout-sider-menuitem-hover-color);
-            }
-          }
           &.ivu-menu-opened{
             background: var(--layout-sider-submenu-active-background,@_layout-sider-submenu-active-background)!important;
             color: var(--layout-sider-submenu-active-color ,@_layout-sider-submenu-active-color);
@@ -166,6 +154,18 @@
             }
           }
         }
+        .ivu-menu-item{
+          background: var(--layout-sider-menuitem-background,@_layout-sider-menuitem-background)!important;
+          color: var(--layout-sider-menuitem-color ,@_layout-sider-menuitem-color);
+          &.ivu-menu-item-active,&.ivu-menu-item-selected{
+            background: var(--layout-sider-menuitem-active-background,@_layout-sider-menuitem-active-background)!important;
+            color: var(--layout-sider-menuitem-active-color,@_layout-sider-menuitem-active-color);
+          }
+          &:hover{
+            background: var(--layout-sider-menuitem-hover-background,@_layout-sider-menuitem-hover-background)!important;
+            color: var(--layout-sider-menuitem-hover-color,@_layout-sider-menuitem-hover-color);
+          }
+        }
       }
       .menu-collapsed{
         a.drop-menu-a{