@lambo-design/pro-layout 1.0.0-beta.367 → 1.0.0-beta.369

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.367",
+  "version": "1.0.0-beta.369",
   "description": "",
   "main": "index.js",
   "author": "lambo",

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

@@ -17,7 +17,7 @@
           >{{ item.name }}
           <div class="line"></div>
         </MenuItem>
-        <Submenu class="ibp-nav-sub-menu" v-else :key="item.name">
+        <Submenu class="ibp-nav-sub-menu" v-else :name="item.name" :key="item.name">
           <template slot="title">
             {{ item.name }}
           </template>
@@ -65,6 +65,7 @@ export default {
   data() {
     return {
       systemInfo: {},
+      originNavList: [], // 原始顶部菜单列表，用于判断是否要重复触发initNav
       navList: [],
       topMenList: [],
       otherList: [],
@@ -109,12 +110,14 @@ export default {
     },
     initNav(data) {
       if (
-        arraysEqual(this.navList, data) &&
+        arraysEqual(this.originNavList, data) &&
         this.topMenuNum === this.lastTopMenuNum
       ) {
         return;
       }
-      _.forEach(data, (app) => {
+      this.originNavList = data;
+      let dataClone = _.cloneDeep(data);
+      _.forEach(dataClone, (app) => {
         let extendProps = app.extendProps;
         let extendPropsL2 = extendProps?.extendProps;
         app.parentName = extendPropsL2
@@ -122,9 +125,9 @@ export default {
           : "";
       });
       // 如果组织了二级菜单展现，则对菜单进行分组
-      if (_.some(data, (app) => app.parentName)) {
+      if (_.some(dataClone, (app) => app.parentName)) {
         let rlt = _.reduce(
-          data,
+          dataClone,
           (acc, cur) => {
             if (cur.parentName) {
               let curApp = _.find(acc, { name: cur.parentName });
@@ -145,12 +148,12 @@ export default {
         );
         this.navList = rlt;
       } else {
-        this.navList = data;
+        this.navList = dataClone;
       }
 
       this.lastTopMenuNum = this.topMenuNum;
-      if (data.length > this.topMenuNum) {
-        let navList = deepCopy(data);
+      if (this.navList.length > this.topMenuNum) {
+        let navList = deepCopy(this.navList);
         this.topMenList = navList.splice(0, this.topMenuNum);
         this.otherList = navList;
       } else {
@@ -228,6 +231,12 @@ export default {
       }
     }
   }
+
+}
+</style>
+
+<style lang="less">
+.pro-layout-nav-wrapper {
   .ibp-nav-sub-menu {
     .ivu-select-dropdown {
       margin-top: 0 !important;
@@ -238,14 +247,14 @@ export default {
       display: flex !important;
     }
     .ivu-menu-item {
-      color: #333 !important;
+      color: var(--layout-header-drop-color, #333) !important;
       border-radius: 4px !important;
-      background-color: var(--ind-bg-color-dark) !important;
-      margin-right: 10px;
+      background-color: var(--background-color-base, #f5f7f9) !important;
+      margin-right: 10px !important;
       &:hover {
-        color: var(--ind-blue) !important;
+        color: var(--layout-active-color, #488aff) !important;
       }
     }
   }
 }
-</style>
+</style>