From 0ee24af85eaa28a0b45e124bdf6147d632ae69ac Mon Sep 17 00:00:00 2001
From: "zhigang.li" <lison16new@163.com>
Date: Thu, 27 Dec 2018 15:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E7=BA=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=85=B3=E9=97=AD=E5=90=8E=E5=86=8D=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E8=BF=98=E7=BC=93=E5=AD=98=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/components/tags-nav/tags-nav.vue         |  2 +-
 src/components/main/main.vue                      |  4 +++-
 src/components/parent-view/parent-view.vue        | 15 ++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/components/main/components/tags-nav/tags-nav.vue b/src/components/main/components/tags-nav/tags-nav.vue
index 2dbca44a..6381ed93 100644
--- a/src/components/main/components/tags-nav/tags-nav.vue
+++ b/src/components/main/components/tags-nav/tags-nav.vue
@@ -34,7 +34,7 @@
             :key="`tag-nav-${index}`"
             :name="item.name"
             :data-route-item="item"
-            @on-close="handleClose(item)"
+            @on-close="close(item)"
             @click.native="handleClick(item)"
             :closable="item.name !== $config.homeName"
             :color="isCurrentTag(item) ? 'primary' : 'default'"
diff --git a/src/components/main/main.vue b/src/components/main/main.vue
index 3c1603fa..006da227 100644
--- a/src/components/main/main.vue
+++ b/src/components/main/main.vue
@@ -104,7 +104,8 @@ export default {
       'setTagNavList',
       'addTag',
       'setLocal',
-      'setHomeRoute'
+      'setHomeRoute',
+      'closeTag'
     ]),
     ...mapActions([
       'handleLogin',
@@ -140,6 +141,7 @@ export default {
           this.$router.push(nextRoute)
         }
       }
+      this.closeTag(route)
       this.setTagNavList(res)
     },
     handleClick (item) {
diff --git a/src/components/parent-view/parent-view.vue b/src/components/parent-view/parent-view.vue
index 84259f36..5d475eb6 100644
--- a/src/components/parent-view/parent-view.vue
+++ b/src/components/parent-view/parent-view.vue
@@ -1,19 +1,20 @@
 <template>
-  <keep-alive :exclude="notCacheName">
+  <keep-alive :include="cacheList" :exclude="notCacheName">
     <router-view ref="child"/>
   </keep-alive>
 </template>
 <script>
 export default {
   name: 'ParentView',
-  data () {
-    return {
-      cacheChaildName: ''
-    }
-  },
   computed: {
+    tagNavList () {
+      return this.$store.state.app.tagNavList
+    },
     notCacheName () {
-      return (this.$route.meta && this.$route.meta.notCache) ? this.$route.name : ''
+      return [(this.$route.meta && this.$route.meta.notCache) ? this.$route.name : '']
+    },
+    cacheList () {
+      return ['ParentView', ...this.tagNavList.length ? this.tagNavList.filter(item => !(item.meta && item.meta.notCache)).map(item => item.name) : []]
     }
   }
 }