@lambo-design/pro-layout 1.0.0-beta.286 → 1.0.0-beta.288

package/package.json

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

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

@@ -66,6 +66,9 @@ export default {
         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)
       }
     },
@@ -100,21 +103,22 @@ export default {
         this.selectApp(appId)
       }
     },
-    changeApp(appId, appInfo){
-      this.activeName = appId
-    },
     selectApp(appId) {
-      this.activeName = appId
-      let res = this.navList.filter(app => app.appId == appId)
-      Bus.$emit('change-app', { appId, appInfo: res[0] })
+      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;
-    },
-    acceptAppId(val) {
-      this.selectApp(val)
     }
   },
   created() {

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

@@ -22,7 +22,7 @@ import Bus from '@lambo-design/shared/utils/bus'
 import { deepCopy } from '@lambo-design/shared/utils/assist'
 
 export default {
-  name: 'pro-layout-',
+  name: 'pro-layout-nav',
   props: {
 
   },
@@ -64,6 +64,9 @@ export default {
       if (data) {
         this.topMenuNum = data.topMenu ? data.topMenu : 4;
         this.acceptAppId = data.acceptAppId ? data.acceptAppId : '';
+        if (!this.activeName) {
+          this.activeName = this.acceptAppId;
+        }
         this.initNav(this.navList)
       }
     },
@@ -98,15 +101,20 @@ export default {
       this.originMenuList = deepCopy(data)
     },
     selectApp(appId) {
-      this.activeName = appId
-      let res = this.navList.filter(app => app.appId == appId)
-      Bus.$emit('change-app', { appId, appInfo: res[0] })
+      if (appId) {
+        let res = this.navList.filter(app => app.appId == appId)
+        if (res && res.length > 0) {
+          Bus.$emit('change-app', { appId, appInfo: res[0] })
+        }
+      }
     },
     changeApp(appId, appInfo) {
-      this.activeName = appId
-      this.$nextTick(() => {
-        this.$refs.topNav.updateActiveName()
-      })
+      if (appId) {
+        this.activeName = appId
+        this.$nextTick(() => {
+          this.$refs.topNav.updateActiveName()
+        })
+      }
     }
   },
   watch: {
@@ -114,11 +122,6 @@ export default {
       this.$nextTick(() => {
         this.$refs.topNav.updateActiveName()
       })
-    },
-    acceptAppId(val) {
-      if (val) {
-        this.selectApp(val)
-      }
     }
   },
   created() {

package/src/components/pro-layout-tabs/index.vue

@@ -204,8 +204,6 @@ export default {
       this.emitTags(res, value);
     },
     handleClick(item) {
-      this.value = item.name
-      Bus.$emit('menu-click', item.name , item)
       if (item.meta && item.meta.appId
           && item.meta.appId != this.appId
           && item.meta.appId != config.homeRouter.meta.appId) {
@@ -216,6 +214,8 @@ export default {
           Bus.$emit('change-app', {appId:item.meta.appId,appInfo:null})
         }
       }
+      this.value = item.name
+      Bus.$emit('menu-click', item.name , item);
     },
     showTitleInside(item) {
       return showTitle(item, this)