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

package/package.json

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

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

@@ -98,15 +98,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: {

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)