cloud-web-corejs 1.0.54-dev.745 → 1.0.54-dev.747

package/src/permission.js

@@ -1,135 +1,185 @@
-/**version-1.0*/
-import router from "@base/router";
-import store from "./store";
-import {
-  Message
-} from "element-ui";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
-import {
-  getToken
-} from "./utils/auth"; // get token from cookie
-import settingConfig from "@/settings";
-
-import {
-  saveAccessMenuLog
-} from "./api/user";
-import indexUtil from "./utils/index.js"
-
-NProgress.configure({
-  showSpinner: false,
-}); // NProgress Configuration
-
-const whiteList = [
-  "/login",
-  "/auth-redirect",
-  "/report/vform/out_render",
-  "/report/xform/out_render",
-]; // no redirect whitelist
-
-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();
-      }
-    }
-  })
-
-
-});
-
-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();
-});
+/**version-1.0*/
+import router from "@base/router";
+import store from "./store";
+import {
+  Message
+} from "element-ui";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import {
+  getToken
+} from "./utils/auth"; // get token from cookie
+import settingConfig from "@/settings";
+
+import {
+  saveAccessMenuLog
+} from "./api/user";
+import indexUtil from "./utils/index.js"
+
+NProgress.configure({
+  showSpinner: false,
+}); // NProgress Configuration
+
+const whiteList = [
+  "/login",
+  "/auth-redirect",
+  "/report/vform/out_render",
+  "/report/xform/out_render",
+]; // no redirect whitelist
+
+// ===== 临时打点：菜单切换 3s 卡顿定位（定位后移除，勿同步子工程）=====
+let navPerf = { t0: 0, path: "" };
+router.beforeEach((to, from, next) => {
+  navPerf.t0 = performance.now();
+  navPerf.path = to.fullPath;
+  next();
+});
+
+// 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") {
+                  // 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) => {
+  if (navPerf.path !== to.fullPath) return;
+  const tNav = performance.now();
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      const tPaint = performance.now();
+      console.log(
+        "[nav-perf] " + to.fullPath
+        + " | 守卫+组件解析 " + (tNav - navPerf.t0).toFixed(0) + "ms"
+        + " | 渲染上屏 " + (tPaint - tNav).toFixed(0) + "ms"
+        + " | 总计 " + (tPaint - navPerf.t0).toFixed(0) + "ms"
+      );
+    });
+  });
+});
+
+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,8 @@
+/* eslint-disable camelcase, no-undef */
+/**
+ * qiankun 子应用模式下修正 webpack 运行时 publicPath，
+ * 必须在入口文件的第一行 import，早于其余任何模块。
+ */
+if (window.__POWERED_BY_QIANKUN__) {
+  __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+}