cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.61

package/src/store/modules/tagsView.js

@@ -1,217 +1,241 @@
-import store from "../index.js";
-import _ from "lodash";
-import { isRepeatable, viewKey } from "@base/utils/repeatOpen";
-
-let state, mutations, actions;
-state = {
-  visitedViews: [],
-  cachedViews: [],
-};
-
-mutations = {
-  ADD_VISITED_VIEW: (state, view) => {
-    let title = view.meta.title;
-    let add_routes = store.getters.add_routes;
-    if (add_routes && add_routes.children && add_routes.children.length > 0) {
-      let syncRoutes = add_routes.children[0].children;
-      let tRoutes = syncRoutes.some((route) => {
-        let flag = view.fullPath == route.path;
-        if (flag) {
-          title = route.meta.title;
-          return flag;
-        }
-      });
-    }
-    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) => {
-    // 缓存键与 keepAlive.js 的 getComponentName 保持一致（viewKey）：
-    // 可重复打开的视图按 fullPath 各自独立缓存，其余按 path。
-    const key = viewKey(view);
-    if (state.cachedViews.includes(key)) return;
-    if (!view.meta.noCache) {
-      state.cachedViews.push(key);
-    }
-  },
-
-  DEL_VISITED_VIEW: (state, view) => {
-    const key = viewKey(view);
-    for (const [i, v] of state.visitedViews.entries()) {
-      if (viewKey(v) === key) {
-        state.visitedViews.splice(i, 1);
-        break;
-      }
-    }
-  },
-  DEL_CACHED_VIEW: (state, view) => {
-    // 兼容刷新场景（路径带 /redirect 前缀）与仅按 name 传入的情况，
-    // 归一到与缓存键一致的 viewKey 再移除。
-    let target = view;
-    let str = "/redirect";
-    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);
-      target = cView || view;
-    }
-    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 || viewKey(v) === key;
-    });
-  },
-  DEL_OTHERS_CACHED_VIEWS: (state, view) => {
-    // const index = state.cachedViews.indexOf(view.name)
-    const index = state.cachedViews.indexOf(viewKey(view));
-    if (index > -1) {
-      state.cachedViews = state.cachedViews.slice(index, index + 1);
-    } else {
-      // if index = -1, there is no cached tags
-      state.cachedViews = [];
-    }
-  },
-
-  DEL_ALL_VISITED_VIEWS: (state) => {
-    // keep affix tags
-    const affixTags = state.visitedViews.filter((tag) => tag.meta.affix);
-    state.visitedViews = affixTags;
-  },
-  DEL_ALL_CACHED_VIEWS: (state) => {
-    state.cachedViews = [];
-  },
-
-  UPDATE_VISITED_VIEW: (state, view) => {
-    const key = viewKey(view);
-    for (let v of state.visitedViews) {
-      if (viewKey(v) === key) {
-        v = Object.assign(v, view);
-        break;
-      }
-    }
-  },
-};
-
-actions = {
-  addView({ dispatch }, view) {
-    dispatch("addVisitedView", view);
-    dispatch("addCachedView", view);
-  },
-  addVisitedView({ commit }, view) {
-    commit("ADD_VISITED_VIEW", view);
-  },
-  addCachedView({ commit }, view) {
-    commit("ADD_CACHED_VIEW", view);
-  },
-
-  delView({ dispatch, state }, view) {
-    return new Promise((resolve) => {
-      dispatch("delVisitedView", view);
-      dispatch("delCachedView", view);
-      resolve({
-        visitedViews: [...state.visitedViews],
-        cachedViews: [...state.cachedViews],
-      });
-    });
-  },
-  delVisitedView({ commit, state }, view) {
-    return new Promise((resolve) => {
-      commit("DEL_VISITED_VIEW", view);
-      resolve([...state.visitedViews]);
-    });
-  },
-  delCachedView({ commit, state }, view) {
-    return new Promise((resolve) => {
-      commit("DEL_CACHED_VIEW", view);
-      resolve([...state.cachedViews]);
-    });
-  },
-
-  delOthersViews({ dispatch, state }, view) {
-    return new Promise((resolve) => {
-      dispatch("delOthersVisitedViews", view);
-      dispatch("delOthersCachedViews", view);
-      resolve({
-        visitedViews: [...state.visitedViews],
-        cachedViews: [...state.cachedViews],
-      });
-    });
-  },
-  delOthersVisitedViews({ commit, state }, view) {
-    return new Promise((resolve) => {
-      commit("DEL_OTHERS_VISITED_VIEWS", view);
-      resolve([...state.visitedViews]);
-    });
-  },
-  delOthersCachedViews({ commit, state }, view) {
-    return new Promise((resolve) => {
-      commit("DEL_OTHERS_CACHED_VIEWS", view);
-      resolve([...state.cachedViews]);
-    });
-  },
-
-  delAllViews({ dispatch, state }, view) {
-    return new Promise((resolve) => {
-      dispatch("delAllVisitedViews", view);
-      dispatch("delAllCachedViews", view);
-      resolve({
-        visitedViews: [...state.visitedViews],
-        cachedViews: [...state.cachedViews],
-      });
-    });
-  },
-  delAllVisitedViews({ commit, state }) {
-    return new Promise((resolve) => {
-      commit("DEL_ALL_VISITED_VIEWS");
-      resolve([...state.visitedViews]);
-    });
-  },
-  delAllCachedViews({ commit, state }) {
-    return new Promise((resolve) => {
-      commit("DEL_ALL_CACHED_VIEWS");
-      resolve([...state.cachedViews]);
-    });
-  },
-
-  updateVisitedView({ commit }, view) {
-    commit("UPDATE_VISITED_VIEW", view);
-  },
-  updateVisitedView2({ commit }, { view, title }) {
-    let src = view || window.$vueRoot.$route;
-    // 浅拷贝后再拷贝 meta，避免直接改写路由上共享的 meta.title
-    let newView0 = { ...src };
-    delete newView0.matched;
-    newView0.meta = { ...(src.meta || {}), title };
-    let newView = _.cloneDeep(newView0);
-
-    commit("UPDATE_VISITED_VIEW", newView);
-  },
-};
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions,
-};
+import store from "../index.js";
+import _ from "lodash";
+import { isRepeatable, viewKey } from "@base/utils/repeatOpen";
+
+/**
+ * 页签是否「不可被批量关闭」：
+ * - meta.affix：菜单本身维护的固定页签；
+ * - meta.user_affix：运行期临时锁（如导出期间锁住当前页签）。
+ * 临时锁不能再写 meta.affix —— affix 会让 isRepeatable 翻转、viewKey 从 fullPath
+ * 塌成 path，页签缓存直接失配。所以这里两个标记都要判。
+ * @param {Object} view 页签对象
+ * @returns {Boolean}
+ */
+function isPinned(view) {
+  const meta = (view && view.meta) || {};
+  return !!(meta.affix || meta.user_affix);
+}
+
+let state, mutations, actions;
+state = {
+  visitedViews: [],
+  cachedViews: [],
+};
+
+mutations = {
+  ADD_VISITED_VIEW: (state, view) => {
+    let title = view.meta.title;
+    let add_routes = store.getters.add_routes;
+    if (add_routes && add_routes.children && add_routes.children.length > 0) {
+      let syncRoutes = add_routes.children[0].children;
+      let tRoutes = syncRoutes.some((route) => {
+        let flag = view.fullPath == route.path;
+        if (flag) {
+          title = route.meta.title;
+          return flag;
+        }
+      });
+    }
+    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,
+        // meta 必须另拷一份：直接浅拷贝的话页签的 meta 与路由记录的 meta 是同一个
+        // 对象，任何往页签 meta 上写状态的代码（如导出锁写 user_affix）都会连带
+        // 改到 $route.meta —— 曾因此把 affix 写进路由，导致 isRepeatable 翻转、
+        // viewKey 从 fullPath 塌成 path，页签缓存失配、切回来整页重建。
+        meta: { ...(view.meta || {}) },
+      })
+    );
+  },
+  ADD_CACHED_VIEW: (state, view) => {
+    // 缓存键与 keepAlive.js 的 getComponentName 保持一致（viewKey）：
+    // 可重复打开的视图按 fullPath 各自独立缓存，其余按 path。
+    const key = viewKey(view);
+    if (state.cachedViews.includes(key)) return;
+    if (!view.meta.noCache) {
+      state.cachedViews.push(key);
+    }
+  },
+
+  DEL_VISITED_VIEW: (state, view) => {
+    const key = viewKey(view);
+    for (const [i, v] of state.visitedViews.entries()) {
+      if (viewKey(v) === key) {
+        state.visitedViews.splice(i, 1);
+        break;
+      }
+    }
+  },
+  DEL_CACHED_VIEW: (state, view) => {
+    // 兼容刷新场景（路径带 /redirect 前缀）与仅按 name 传入的情况，
+    // 归一到与缓存键一致的 viewKey 再移除。
+    let target = view;
+    let str = "/redirect";
+    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);
+      target = cView || view;
+    }
+    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 isPinned(v) || viewKey(v) === key;
+    });
+  },
+  DEL_OTHERS_CACHED_VIEWS: (state, view) => {
+    // const index = state.cachedViews.indexOf(view.name)
+    const index = state.cachedViews.indexOf(viewKey(view));
+    if (index > -1) {
+      state.cachedViews = state.cachedViews.slice(index, index + 1);
+    } else {
+      // if index = -1, there is no cached tags
+      state.cachedViews = [];
+    }
+  },
+
+  DEL_ALL_VISITED_VIEWS: (state) => {
+    // keep affix tags
+    const affixTags = state.visitedViews.filter((tag) => isPinned(tag));
+    state.visitedViews = affixTags;
+  },
+  DEL_ALL_CACHED_VIEWS: (state) => {
+    state.cachedViews = [];
+  },
+
+  UPDATE_VISITED_VIEW: (state, view) => {
+    const key = viewKey(view);
+    for (let v of state.visitedViews) {
+      if (viewKey(v) === key) {
+        // 同 ADD_VISITED_VIEW：meta 走合并而不是整体替换，
+        // 否则一次 update 就把页签 meta 换回路由那个共享对象，
+        // 并且会抹掉只存在于页签上的标记（user_affix 等）。
+        v = Object.assign(v, view, {
+          meta: { ...(v.meta || {}), ...(view.meta || {}) },
+        });
+        break;
+      }
+    }
+  },
+};
+
+actions = {
+  addView({ dispatch }, view) {
+    dispatch("addVisitedView", view);
+    dispatch("addCachedView", view);
+  },
+  addVisitedView({ commit }, view) {
+    commit("ADD_VISITED_VIEW", view);
+  },
+  addCachedView({ commit }, view) {
+    commit("ADD_CACHED_VIEW", view);
+  },
+
+  delView({ dispatch, state }, view) {
+    return new Promise((resolve) => {
+      dispatch("delVisitedView", view);
+      dispatch("delCachedView", view);
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews],
+      });
+    });
+  },
+  delVisitedView({ commit, state }, view) {
+    return new Promise((resolve) => {
+      commit("DEL_VISITED_VIEW", view);
+      resolve([...state.visitedViews]);
+    });
+  },
+  delCachedView({ commit, state }, view) {
+    return new Promise((resolve) => {
+      commit("DEL_CACHED_VIEW", view);
+      resolve([...state.cachedViews]);
+    });
+  },
+
+  delOthersViews({ dispatch, state }, view) {
+    return new Promise((resolve) => {
+      dispatch("delOthersVisitedViews", view);
+      dispatch("delOthersCachedViews", view);
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews],
+      });
+    });
+  },
+  delOthersVisitedViews({ commit, state }, view) {
+    return new Promise((resolve) => {
+      commit("DEL_OTHERS_VISITED_VIEWS", view);
+      resolve([...state.visitedViews]);
+    });
+  },
+  delOthersCachedViews({ commit, state }, view) {
+    return new Promise((resolve) => {
+      commit("DEL_OTHERS_CACHED_VIEWS", view);
+      resolve([...state.cachedViews]);
+    });
+  },
+
+  delAllViews({ dispatch, state }, view) {
+    return new Promise((resolve) => {
+      dispatch("delAllVisitedViews", view);
+      dispatch("delAllCachedViews", view);
+      resolve({
+        visitedViews: [...state.visitedViews],
+        cachedViews: [...state.cachedViews],
+      });
+    });
+  },
+  delAllVisitedViews({ commit, state }) {
+    return new Promise((resolve) => {
+      commit("DEL_ALL_VISITED_VIEWS");
+      resolve([...state.visitedViews]);
+    });
+  },
+  delAllCachedViews({ commit, state }) {
+    return new Promise((resolve) => {
+      commit("DEL_ALL_CACHED_VIEWS");
+      resolve([...state.cachedViews]);
+    });
+  },
+
+  updateVisitedView({ commit }, view) {
+    commit("UPDATE_VISITED_VIEW", view);
+  },
+  updateVisitedView2({ commit }, { view, title }) {
+    let src = view || window.$vueRoot.$route;
+    // 浅拷贝后再拷贝 meta，避免直接改写路由上共享的 meta.title
+    let newView0 = { ...src };
+    delete newView0.matched;
+    newView0.meta = { ...(src.meta || {}), title };
+    let newView = _.cloneDeep(newView0);
+
+    commit("UPDATE_VISITED_VIEW", newView);
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

package/src/store/modules/user.js

@@ -8,10 +8,11 @@ import {
   getLoginConfig,
   getLogicParamValue,
 } from "../../api/user";
-import { getToken, setToken, clearToken } from "../../utils/auth";
-import router, { resetRouter } from "@base/router";
-import { unmountAllMicroApps } from "@base/microRouter";
-import { getDispermissions } from "../../api/menu";
+import { getToken, setToken, clearToken } from "../../utils/auth";
+import { clearBaseDictsCache } from "../../utils/baseDictsCache";
+import router, { resetRouter } from "@base/router";
+import { unmountAllMicroApps } from "@base/microRouter";
+import { getDispermissions } from "../../api/menu";
 import settingConfig from "@/settings";
 import storeConfig from "../config/index";
 
@@ -330,14 +331,17 @@ actions = {
       configUtil.clearToken();
       // qiankun 宿主：登出必须真正卸载保活中的子应用，
       // 否则换账号登录后切回子应用会复活上一个用户的实例（旧角色/旧路由/旧页面数据）
-      unmountAllMicroApps();
-      configUtil.resetRouter();
-      sessionStorage.removeItem("easyweb");
-
-      dispatch("tagsView/delAllViews", null, {
-        root: true,
-      });
-      resolve();
+      unmountAllMicroApps();
+      // 字典缓存按公司隔离，登出通常伴随整页刷新；但 qiankun 场景下 JS 上下文可能存活，
+      // 这里显式清掉，避免换账号后还捧着上一个会话的字典。
+      clearBaseDictsCache();
+      configUtil.resetRouter();
+      sessionStorage.removeItem("easyweb");
+
+      dispatch("tagsView/delAllViews", null, {
+        root: true,
+      });
+      resolve();
     });
   },