cloud-web-corejs 1.0.258 → 1.0.259

package/src/permission.js

@@ -13,123 +13,148 @@ import settingConfig from "@/settings";
 
 import {
   saveAccessMenuLog
-} from "./api/user";
-import indexUtil from "./utils/index.js"
-
-NProgress.configure({
-  showSpinner: false,
-}); // NProgress Configuration
-
+} from "./api/user";
+import indexUtil from "./utils/index.js"
+
+NProgress.configure({
+  showSpinner: false,
+}); // NProgress Configuration
+
 const whiteList = [
-  "/login",
-  "/auth-redirect",
-  "/report/vform/out_render",
+  "/login",
+  "/auth-redirect",
+  "/report/vform/out_render",
   "/report/xform/out_render",
 ]; // no redirect whitelist
 
+// qiankun 保活：子应用容器被隐藏期间暂停一切路由响应（配合包入口 update 生命周期）
+router.beforeEach((to, from, next) => {
+  if (store.state.micro && store.state.micro.routerPaused) {
+    next(false);
+    return;
+  }
+  next();
+});
+
 router.beforeEach((to, from, next) => {
   // start progress bar
   NProgress.start();
-
-  store.dispatch("user/initLoginConfig").then(() => {
-    const hasToken = getToken();
-
-    if (hasToken) {
-      if (to.path === "/login") {
-        // if is logged in, redirect to the home page
-        next({
-          path: "/",
-        });
-        NProgress.done(); // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
-      } else {
-        // determine whether the user has obtained his permission roles through getInfo
-        const hasRoles =
-          store.getters.roles &&
-          store.getters.roles.length > 0;
-        if (to.meta.checkToken === false || hasRoles) {
-          next();
-        } else {
-          try {
-            store
-              .dispatch("user/getInfo2")
-              .then((res) => {
-                if (res && res.type == "success") {
-                  store
-                    .dispatch("permission/generateRoutes2", res.objx)
-                    .then((accessRoutes) => {
-                      // 根据roles权限生成可访问的路由表
-                      // router.addRoutes(accessRoutes); // 动态添加可访问路由表
-                      next({
-                        ...to,
-                        replace: true,
-                      }); // hack方法 确保addRoutes已完成
-                    });
-                } else {
-                  store.dispatch("user/resetToken").then(() => {
-                    next("/login");
-                    NProgress.done();
-                  });
-                }
-              })
-              .catch((error) => {
-                store.dispatch("user/resetToken").then(() => {
-                  next("/login");
-                  NProgress.done();
-                });
-              });
-          } catch (error) {
-            // remove token and go to login page to re-login
-            //await store.dispatch('user/resetToken')
-            Message.error(error || "Has Error");
-            next("/login");
-            NProgress.done();
-          }
-        }
-      }
-    } else {
-      /* has no token*/
-      if (to.meta.checkToken === false) {
-        next();
-      } else if (whiteList.indexOf(to.path) !== -1) {
-        // in the free login whitelist, go directly
-        next();
-      } else {
-        // other pages that do not have permission to access are redirected to the login page.
-        next("/login");
-        NProgress.done();
-      }
-    }
-  })
-
+
+  store.dispatch("user/initLoginConfig").then(() => {
+    const hasToken = getToken();
+
+    if (hasToken) {
+      if (to.path === "/login") {
+        // if is logged in, redirect to the home page
+        next({
+          path: "/",
+        });
+        NProgress.done(); // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
+      } else {
+        // determine whether the user has obtained his permission roles through getInfo
+        const hasRoles
+          = store.getters.roles
+          && store.getters.roles.length > 0;
+        if (to.meta.checkToken === false || hasRoles) {
+          next();
+        } else {
+          try {
+            store
+              .dispatch("user/getInfo2")
+              .then((res) => {
+                if (res && res.type == "success") {
+                  // qiankun 子应用模式：菜单由主应用 props 下发，不自拉；
+                  // 自治嵌入模式（selfManaged，主应用未下发菜单）仍走自拉全量菜单
+                  let microState = store.state.micro || {};
+                  let generateAction = microState.isMicro && !microState.selfManaged
+                    ? store.dispatch("permission/generateRoutesFromProps", microState.menus || [])
+                    : store.dispatch("permission/generateRoutes2", res.objx);
+                  generateAction
+                    .then((accessRoutes) => {
+                      // 根据roles权限生成可访问的路由表
+                      // router.addRoutes(accessRoutes); // 动态添加可访问路由表
+                      next({
+                        ...to,
+                        replace: true,
+                      }); // hack方法 确保addRoutes已完成
+                    });
+                } else {
+                  store.dispatch("user/resetToken").then(() => {
+                    next("/login");
+                    NProgress.done();
+                  });
+                }
+              })
+              .catch((error) => {
+                store.dispatch("user/resetToken").then(() => {
+                  next("/login");
+                  NProgress.done();
+                });
+              });
+          } catch (error) {
+            // remove token and go to login page to re-login
+            //await store.dispatch('user/resetToken')
+            Message.error(error || "Has Error");
+            next("/login");
+            NProgress.done();
+          }
+        }
+      }
+    } else {
+      /* has no token*/
+      if (to.meta.checkToken === false) {
+        next();
+      } else if (whiteList.indexOf(to.path) !== -1) {
+        // in the free login whitelist, go directly
+        next();
+      } else {
+        // other pages that do not have permission to access are redirected to the login page.
+        next("/login");
+        NProgress.done();
+      }
+    }
+  })
+
 
 });
 
 router.onError((error) => {
   // finish progress bar
   console.error(error);
-  NProgress.done();
-});
-
-router.afterEach((to, from, next) => {
-  if (settingConfig.i18nEnabled === true && to.path !== "/login" && to.meta.checkToken !== false) {
-    indexUtil.initI18nMessage("business");
-  }
-  if (settingConfig.accessLogEnabled === true && to.meta.title && to.name !== 'home') {
-    let visitedViews = store.getters.visitedViews;
-    let item = visitedViews.find(visitedView => visitedView.fullPath == to.fullPath)
-    if (!item) {
-      let treePathName = to.meta.treePathName || "";
-      let content = treePathName ?
-        treePathName + to.meta.title + "," :
-        to.meta.title;
-      saveAccessMenuLog({
-        data: {
-          businessCode: content,
-          content: content,
-          path: to.path
-        },
-      });
-    }
-  }
-  NProgress.done();
-});
+  NProgress.done();
+});
+
+router.afterEach((to, from, next) => {
+  // qiankun 子应用模式：页签壳被隐藏，没有 TagsView 组件维护 cachedViews，这里补 addView，
+  // 否则 BaseKeepAlive 的 include 恒为空，子应用内部页面切换全部重建（切页签必刷新）。
+  // 自治嵌入模式壳可见，TagsView 自己维护，无需补
+  if (
+    store.state.micro
+    && store.state.micro.isMicro
+    && !store.state.micro.selfManaged
+    && to.name
+  ) {
+    store.dispatch("tagsView/addView", to);
+  }
+  if (settingConfig.i18nEnabled === true && to.path !== "/login" && to.meta.checkToken !== false) {
+    indexUtil.initI18nMessage("business");
+  }
+  if (settingConfig.accessLogEnabled === true && to.meta.title && to.name !== 'home') {
+    let visitedViews = store.getters.visitedViews;
+    let item = visitedViews.find(visitedView => visitedView.fullPath == to.fullPath)
+    if (!item) {
+      let treePathName = to.meta.treePathName || "";
+      let content = treePathName
+        ? treePathName + to.meta.title + ","
+        : to.meta.title;
+      saveAccessMenuLog({
+        data: {
+          businessCode: content,
+          content: content,
+          path: to.path
+        },
+      });
+    }
+  }
+  NProgress.done();
+});

package/src/public-path.js

@@ -0,0 +1,38 @@
+/* eslint-disable camelcase, no-undef */
+/**
+ * qiankun 子应用模式下修正 webpack 运行时 publicPath，
+ * 必须在入口文件的第一行 import，早于其余任何模块。
+ */
+if (window.__POWERED_BY_QIANKUN__) {
+  __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+}
+
+/**
+ * API base 运行时解析：解决"被外部域名的主应用嵌入时，相对 baseURL 会误打主应用域名"。
+ * 消费应用的 vue.config.js 经 DefinePlugin 把每个 process.env.VUE_APP_BASE_API 编译成
+ * window.__resolveApiBase__("<原值>") 的调用，于是 request.js 及一切读该值的模块运行时按下述规则求值：
+ *   独立运行            → 原值（相对地址命中自身域名，行为不变）
+ *   子应用挂载：
+ *     原值是域名(绝对)  → 原值（含协议相对 //host）
+ *     原值不是域名      → 子应用自身 origin + 原值（"" → origin；"/gapi" → origin+"/gapi"）
+ * 前提：API 与子应用静态资源同源部署（origin 即后端所在域名，路径前缀由原值补齐）。
+ * 该 helper 只接受调用点传入的原值作参数、绝不引用 process.env.VUE_APP_BASE_API，
+ * 以免被 DefinePlugin 递归改写成自我调用。
+ */
+if (!window.__resolveApiBase__) {
+  window.__resolveApiBase__ = function (raw) {
+    raw = raw || "";
+    if (!window.__POWERED_BY_QIANKUN__) return raw;
+    // http:// https:// 以及协议相对 //host 都算"是域名"，原样返回
+    if (/^(https?:)?\/\//.test(raw)) return raw;
+    try {
+      var origin = new URL(
+        window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__,
+        window.location.href
+      ).origin;
+      return origin + raw;
+    } catch (e) {
+      return raw;
+    }
+  };
+}

package/src/router/index.js

@@ -3,8 +3,8 @@ import Router from "vue-router";
 
 Vue.use(Router);
 
-import {constantRoutes as route1s} from "@base/router/modules/system";
-import {constantRoutes as route2s} from "@/router/modules/customer";
+import { constantRoutes as route1s } from "@base/router/modules/system";
+import { constantRoutes as route2s } from "@/router/modules/customer";
 
 export const constantRoutes = [...route1s, ...route2s];
 
@@ -14,7 +14,7 @@ const createRouter = () =>
     scrollBehavior: () => ({
       y: 0,
     }),
-    routes: constantRoutes
+    routes: constantRoutes,
   });
 
 const router = createRouter();

package/src/store/modules/micro.js

@@ -0,0 +1,57 @@
+/**
+ * qiankun 微前端运行态。
+ * 子应用模式下（window.__POWERED_BY_QIANKUN__）由主应用经 props 注入，
+ * 见 src/index.js 的 mount 生命周期；独立运行时保持初始值。
+ */
+const state = {
+  isMicro: false,
+  appCode: "",
+  // 主应用下发的菜单快照。首次挂载时权限守卫会在用户信息加载完成后读取该值生成路由，
+  // 因此不能只用它计算 selfManaged 而不持久化
+  menus: null,
+  // 主应用回调（openTab / closeTab / navigate）：包内不消费，供子应用业务代码
+  // （表单脚本跳主应用路由）读取，不得直接摸主应用 router
+  mainAdapter: null,
+  // 自治嵌入模式：主应用未下发菜单（props.menus 非数组）时置 true，
+  // 子应用自拉菜单、保留自身侧边栏/页签壳，整站运行在容器内（含登录页）
+  selfManaged: false,
+  // 保活隐藏期间置 true：路由守卫直接 next(false)，防止隐藏的子应用响应主应用的 URL 变化
+  routerPaused: false,
+  // 主应用经本地调试覆盖装载本应用时为 true：启用"URL 直达未配菜单页面"的兜底路由。
+  // 正式注册表装载时为 false——菜单即权限边界，不能让任意路径都能打开组件
+  debug: false,
+  // 主应用页签"刷新"下发 update({microRefresh}) 时自增，AppMain 据此原地重建当前页组件
+  reloadSeq: 0,
+};
+
+const mutations = {
+  SET_MICRO_CONTEXT: (state, payload = {}) => {
+    state.isMicro = true;
+    state.appCode = payload.appCode || state.appCode;
+    state.menus = Array.isArray(payload.menus) ? payload.menus : null;
+    state.selfManaged = !Array.isArray(payload.menus);
+    state.mainAdapter = payload.mainAdapter || null;
+    state.debug = !!payload.debug;
+  },
+  BUMP_RELOAD_SEQ: (state) => {
+    state.reloadSeq = state.reloadSeq + 1;
+  },
+  SET_ROUTER_PAUSED: (state, paused) => {
+    state.routerPaused = !!paused;
+  },
+  CLEAR_MICRO_CONTEXT: (state) => {
+    state.isMicro = false;
+    state.appCode = "";
+    state.menus = null;
+    state.mainAdapter = null;
+    state.selfManaged = false;
+    state.routerPaused = false;
+    state.debug = false;
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+};