From 89ac6f4b4ade68caef8fb62ebbb7b720c4e5b132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E6=95=8F=E5=8D=8E?= <180657@gree.com.cn>
Date: Sat, 14 Dec 2019 14:43:51 +0800
Subject: [PATCH] fix[TagsView]: fixed CachedView bug (PanJiaChen#406)

---
 src/store/modules/tagsView.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index 57e72421..30f46444 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -13,9 +13,13 @@ const mutations = {
     )
   },
   ADD_CACHED_VIEW: (state, view) => {
-    if (state.cachedViews.includes(view.name)) return
     if (!view.meta.noCache) {
-      state.cachedViews.push(view.name)
+      for (const matchedView of view.matched) {
+        const { name } = matchedView.components.default
+        if (name && state.cachedViews.indexOf(name) === -1) {
+          state.cachedViews.push(name)
+        }
+      }
     }
   },
 
@@ -28,8 +32,9 @@ const mutations = {
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    const index = state.cachedViews.indexOf(view.name)
-    index > -1 && state.cachedViews.splice(index, 1)
+    const deletedViewName = view.matched[view.matched.length - 1].components.default.name
+    const index = state.cachedViews.indexOf(deletedViewName)
+    state.cachedViews.splice(index, 1)
   },
 
   DEL_OTHERS_VISITED_VIEWS: (state, view) => {
@@ -38,9 +43,10 @@ const mutations = {
     })
   },
   DEL_OTHERS_CACHED_VIEWS: (state, view) => {
-    const index = state.cachedViews.indexOf(view.name)
+    const currentViewName = view.matched[view.matched.length - 1].components.default.name
+    const index = state.cachedViews.indexOf(currentViewName)
     if (index > -1) {
-      state.cachedViews = state.cachedViews.slice(index, index + 1)
+      state.cachedViews = view.matched.map(i => i.components.default.name)
     } else {
       // if index = -1, there is no cached tags
       state.cachedViews = []