@lambo-design/pro-layout 1.0.0-beta.92 → 1.0.0-beta.94

package/package.json

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

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

@@ -65,6 +65,11 @@ export default {
       }
       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;
         }
@@ -96,6 +101,10 @@ export default {
   created(){
     this.initListener();
   },
+  // 数据更新时执行
+  activated() {
+    this.initListener()
+  },
   beforeDestroy(){
     this.destroyListener();
   }

package/src/index.vue

@@ -51,10 +51,6 @@ export default {
         }
       }
     },
-    acceptAppId:{
-      type: String,
-      default: ''
-    },
     userInfo: {
       type: Object,
       default: () => {}
@@ -114,7 +110,6 @@ export default {
     allData: {
       handler() {
         this.initEmit();
-        this.initApp();
       },
       immediate: true,
       deep: true
@@ -166,29 +161,9 @@ export default {
     triggerChange(data){
       this.collapsed = data;
     },
-    initApp(){
-      let appInfo = {}
-      console.log('初始化')
-      console.log('acceptAppId:',this.acceptAppId)
-      console.log('navList',this.navList)
-      if (this.acceptAppId !== ''){
-        console.log('执行了')
-        appInfo = this.navList.filter(item => item.appId == this.acceptAppId)[0];
-      }
-      this.appId = this.acceptAppId;
-      let appId;
-      appId = this.appId
-      console.log("lambodesign-appId:",appId)
-      console.log("lambodesign-appInfo:",appInfo)
-      this.$emit('change-app',{appId,appInfo})
-    },
     changeApp(appId,appInfo) {
       if (!appInfo) {
-        if (this.appId !== ''){
-          appInfo = this.navList.filter(item => item.appId == this.appId)[0];
-        }else {
           appInfo = this.navList.filter(item => item.appId == appId)[0];
-        }
       }
       this.appId = appId;
       this.$emit('change-app',{appId,appInfo})
@@ -239,7 +214,6 @@ export default {
     }
   },
   mounted(){
-    // this.initApp();
     this.initTags();
   },
   created(){