cloud-web-corejs 1.0.258 → 1.0.259

package/src/store/modules/tagsView.js

@@ -1,5 +1,6 @@
 import store from "../index.js";
 import _ from "lodash";
+import { isRepeatable, viewKey } from "@base/utils/repeatOpen";
 
 let state, mutations, actions;
 state = {
@@ -21,56 +22,69 @@ mutations = {
         }
       });
     }
-    if (state.visitedViews.some((v) => v.path === view.path)) return;
+    const key = viewKey(view);
+    if (state.visitedViews.some((v) => viewKey(v) === key)) return;
+    // 可重复打开时，记录同一菜单的序号，展示时用于区分标签
+    let repeatIndex = 0;
+    if (isRepeatable(view)) {
+      const sameCount = state.visitedViews.filter((v) => v.path === view.path);
+      repeatIndex = sameCount.length + 1;
+    }
     state.visitedViews.push(
       Object.assign({}, view, {
         title: title || "no-name",
+        repeatIndex,
       })
     );
   },
   ADD_CACHED_VIEW: (state, view) => {
-    // if (state.cachedViews.includes(view.name)) return
-    if (state.cachedViews.includes(view.path)) return;
+    // 缓存键与 keepAlive.js 的 getComponentName 保持一致（viewKey）：
+    // 可重复打开的视图按 fullPath 各自独立缓存，其余按 path。
+    const key = viewKey(view);
+    if (state.cachedViews.includes(key)) return;
     if (!view.meta.noCache) {
-      // state.cachedViews.push(view.name)
-      state.cachedViews.push(view.path);
+      state.cachedViews.push(key);
     }
   },
 
   DEL_VISITED_VIEW: (state, view) => {
+    const key = viewKey(view);
     for (const [i, v] of state.visitedViews.entries()) {
-      if (v.path === view.path) {
+      if (viewKey(v) === key) {
         state.visitedViews.splice(i, 1);
         break;
       }
     }
   },
   DEL_CACHED_VIEW: (state, view) => {
-    // const index = state.cachedViews.indexOf(view.name)
-    let realPath = view.path;
+    // 兼容刷新场景（路径带 /redirect 前缀）与仅按 name 传入的情况，
+    // 归一到与缓存键一致的 viewKey 再移除。
+    let target = view;
     let str = "/redirect";
-    if (view.path) {
-      if (view.path.startsWith(str)) {
-        realPath = view.path.substr(str.length);
-      }
-    } else if (view.name) {
+    if (view.path && view.path.startsWith(str)) {
+      let realPath = view.path.substr(str.length);
+      let realFullPath = (view.fullPath || view.path).substr(str.length);
+      target = { ...view, path: realPath, fullPath: realFullPath };
+    } else if (!view.path && view.name) {
       let cView = state.visitedViews.find((item) => item.name == view.name);
-      realPath = cView && cView.path ? cView.path : null;
+      target = cView || view;
     }
-    if (realPath) {
-      const index = state.cachedViews.indexOf(realPath);
+    const key = viewKey(target);
+    if (key) {
+      const index = state.cachedViews.indexOf(key);
       index > -1 && state.cachedViews.splice(index, 1);
     }
   },
 
   DEL_OTHERS_VISITED_VIEWS: (state, view) => {
+    const key = viewKey(view);
     state.visitedViews = state.visitedViews.filter((v) => {
-      return v.meta.affix || v.path === view.path;
+      return v.meta.affix || viewKey(v) === key;
     });
   },
   DEL_OTHERS_CACHED_VIEWS: (state, view) => {
     // const index = state.cachedViews.indexOf(view.name)
-    const index = state.cachedViews.indexOf(view.path);
+    const index = state.cachedViews.indexOf(viewKey(view));
     if (index > -1) {
       state.cachedViews = state.cachedViews.slice(index, index + 1);
     } else {
@@ -89,8 +103,9 @@ mutations = {
   },
 
   UPDATE_VISITED_VIEW: (state, view) => {
+    const key = viewKey(view);
     for (let v of state.visitedViews) {
-      if (v.path === view.path) {
+      if (viewKey(v) === key) {
         v = Object.assign(v, view);
         break;
       }
@@ -183,9 +198,11 @@ actions = {
     commit("UPDATE_VISITED_VIEW", view);
   },
   updateVisitedView2({ commit }, { view, title }) {
-    let newView0 = { ...(view || window.$vueRoot.$route) };
+    let src = view || window.$vueRoot.$route;
+    // 浅拷贝后再拷贝 meta，避免直接改写路由上共享的 meta.title
+    let newView0 = { ...src };
     delete newView0.matched;
-    newView0.meta.title = title;
+    newView0.meta = { ...(src.meta || {}), title };
     let newView = _.cloneDeep(newView0);
 
     commit("UPDATE_VISITED_VIEW", newView);