Merge pull request #890 from LZHD/master

修复点击关闭其他标签页报错
iview · Aug 19, 2018 · 597cf2d · 597cf2d
2 parents 7193bc3 + 10393c4
commit 597cf2d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/view/main/components/tags-nav/tags-nav.vue b/src/view/main/components/tags-nav/tags-nav.vue
@@ -101,7 +101,7 @@ export default {
       } else {
         // 关闭除当前页和home页的其他页
         let res = this.list.filter(item => routeEqual(this.currentRouteObj, item) || item.name === 'home')
-        this.$emit('on-close', res, 'others')
+        this.$emit('on-close', res, 'others', this.currentRouteObj)
         setTimeout(() => {
           this.getTagElementByName(this.currentRouteObj.name)
         }, 100)

diff --git a/src/view/main/main.vue b/src/view/main/main.vue
@@ -119,10 +119,13 @@ export default {
         this.turnToPage('home')
         openName = 'home'
       } else if (routeEqual(this.$route, route)) {
-        const nextRoute = getNextRoute(this.tagNavList, route)
-        this.$router.push(nextRoute)
-        if (type === 'other') openName = route.name
-        else openName = nextRoute.name
+        if (type === 'others') {
+          openName = route.name
+        } else {
+          const nextRoute = getNextRoute(this.tagNavList, route)
+          this.$router.push(nextRoute)
+          openName = nextRoute.name
+        }
       }
       this.setTagNavList(res)
       this.$refs.sideMenu.updateOpenName(openName)