cloud-web-corejs 1.0.54-dev.770 → 1.0.54-dev.771

package/src/permission.js

@@ -1,20 +1,18 @@
-/**version-1.0*/
-import router from "@base/router";
-import store from "./store";
-import Message from "element-ui/lib/message";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
-import {
-  getToken
-} from "./utils/auth"; // get token from cookie
+/**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 {
-  ensureBusinessFeatures,
-  preloadBusinessFeatures,
-} from "@base/bootstrap/business";
-
-import {
-  saveAccessMenuLog
+  saveAccessMenuLog
 } from "./api/user";
 import indexUtil from "./utils/index.js"
 
@@ -26,30 +24,10 @@ const whiteList = [
   "/login",
   "/auth-redirect",
   "/report/vform/out_render",
-  "/report/xform/out_render",
+  "/report/xform/out_render",
 ]; // no redirect whitelist
 
-// 这些页面只依赖登录核心包；其余已登录页面和免登录业务页在进入前加载业务能力。
-const lightweightRoutes = new Set([
-  "/login",
-  "/auth-redirect",
-  "/404",
-]);
-const parallelBusinessRoutes = new Set(["/", "/home"]);
-
-function needsBusinessFeatures(to) {
-  return !lightweightRoutes.has(to.path)
-    && (getToken() || to.meta.checkToken === false);
-}
-
-function handleBusinessFeatureError(error, next) {
-  console.error("[bootstrap] 业务模块加载失败", error);
-  Message.error("业务模块加载失败，请刷新后重试");
-  NProgress.done();
-  next(false);
-}
-
-// qiankun 保活：子应用容器被隐藏期间暂停一切路由响应（配合包入口 update 生命周期）
+// qiankun 保活：子应用容器被隐藏期间暂停一切路由响应（配合包入口 update 生命周期）
 router.beforeEach((to, from, next) => {
   if (store.state.micro && store.state.micro.routerPaused) {
     next(false);
@@ -59,28 +37,8 @@ router.beforeEach((to, from, next) => {
 });
 
 router.beforeEach((to, from, next) => {
-  if (!needsBusinessFeatures(to)) {
-    next();
-    return;
-  }
+  // start progress bar
   NProgress.start();
-
-  // 首页首跳先启动下载，再让鉴权守卫并行拉用户信息和菜单；最终在
-  // beforeResolve 中等待安装完成，确保组件渲染前全局能力已经就绪。
-  if (parallelBusinessRoutes.has(to.path)) {
-    preloadBusinessFeatures();
-    next();
-    return;
-  }
-
-  ensureBusinessFeatures()
-    .then(() => next())
-    .catch((error) => handleBusinessFeatureError(error, next));
-});
-
-router.beforeEach((to, from, next) => {
-  // start progress bar
-  NProgress.start();
 
   store.dispatch("user/initLoginConfig").then(() => {
     const hasToken = getToken();
@@ -157,26 +115,12 @@ router.beforeEach((to, from, next) => {
     }
   })
 
-
-});
-
-router.beforeResolve((to, from, next) => {
-  if (
-    !needsBusinessFeatures(to)
-    || !parallelBusinessRoutes.has(to.path)
-  ) {
-    next();
-    return;
-  }
 
-  ensureBusinessFeatures()
-    .then(() => next())
-    .catch((error) => handleBusinessFeatureError(error, next));
 });
 
 router.onError((error) => {
-  // finish progress bar
-  console.error(error);
+  // finish progress bar
+  console.error(error);
   NProgress.done();
 });
 

package/src/store/modules/permission.js

@@ -1,20 +1,21 @@
 import { constantRoutes } from "@base/router";
 import { asyncRoutes, sidebarRoutes } from "@base/router/modules/system";
+import Layout from "@/layout";
 import { getRouters } from "../../api/menu";
 import router from "@base/router";
 import storeConfig from "../config/index";
 import settings from "@/settings";
 import {
   resolveComponentPath,
-  resolveOwner,
-  dispatchMenus,
-} from "@base/utils/menuAdapter";
-
-const Layout = () => import(/* webpackChunkName: "layout" */ "@/layout");
-const MenuFallback = () =>
-  import(
-    /* webpackChunkName: "menu-fallback" */ "@base/views/user/menuFallback/index.vue"
-  );
+  resolveOwner,
+  dispatchMenus,
+} from "@base/utils/menuAdapter";
+import {
+  getAppRegistry,
+  registerSubApps,
+  buildSubAppRoutes,
+} from "@base/microRouter";
+import MenuFallback from "@base/views/user/menuFallback/index.vue";
 
 // qiankun 宿主态（仅 settings.microMainEnabled 的主应用登录后填充）
 let hostRegistryApps = [];
@@ -235,30 +236,27 @@ const actions = {
     if (!isHost) {
       return dispatch("setSidebarRoute", rows);
     }
-    return import("@base/microRouter").then(
-      ({ getAppRegistry, registerSubApps, buildSubAppRoutes }) =>
-        getAppRegistry().then((apps) => {
-          // 自排除：自身也在注册表时（子应用开宿主形态互访别家应用）不装载自己，
-          // 否则会自嵌套且自身菜单被误判为"派发给子应用"而跳过本地路由
-          let ownAppCode = settings.appCode || "";
-          hostRegistryApps = (apps || []).filter(
-            (app) => app.appCode !== ownAppCode
-          );
-          commit(
-            "SET_REGISTRY_APP_CODES",
-            hostRegistryApps.map((app) => app.appCode)
-          );
-          let subAppMenus = dispatchMenus(rows, hostRegistryApps);
-          hostMicroRoutes = buildSubAppRoutes(hostRegistryApps, subAppMenus);
-          if (hostRegistryApps.length) {
-            registerSubApps(hostRegistryApps, {
-              subAppMenus,
-              userInfo: buildUserInfoSnapshot(rootState.user),
-            });
-          }
-          return dispatch("setSidebarRoute", rows);
-        })
-    );
+    return getAppRegistry().then((apps) => {
+      // 自排除：自身也在注册表时（子应用开宿主形态互访别家应用）不装载自己，
+      // 否则会自嵌套且自身菜单被误判为"派发给子应用"而跳过本地路由
+      let ownAppCode = settings.appCode || "";
+      hostRegistryApps = (apps || []).filter(
+        (app) => app.appCode !== ownAppCode
+      );
+      commit(
+        "SET_REGISTRY_APP_CODES",
+        hostRegistryApps.map((app) => app.appCode)
+      );
+      let subAppMenus = dispatchMenus(rows, hostRegistryApps);
+      hostMicroRoutes = buildSubAppRoutes(hostRegistryApps, subAppMenus);
+      if (hostRegistryApps.length) {
+        registerSubApps(hostRegistryApps, {
+          subAppMenus,
+          userInfo: buildUserInfoSnapshot(rootState.user),
+        });
+      }
+      return dispatch("setSidebarRoute", rows);
+    });
   },
   // qiankun 子应用模式：主应用经 props 下发菜单，替代 getRouters 自拉
   generateRoutesFromProps({ dispatch, rootState }, menus = []) {

package/src/store/modules/settings.js

@@ -1,3 +1,5 @@
+import variables from '@/styles/element-variables.scss'
+
 const state = {
   tagsView: true,
 }

package/src/store/modules/tagsView.js

@@ -1,4 +1,5 @@
 import store from "../index.js";
+import _ from "lodash";
 import { isRepeatable, viewKey } from "@base/utils/repeatOpen";
 
 let state, mutations, actions;
@@ -200,7 +201,7 @@ actions = {
     let newView0 = { ...(view || window.$vueRoot.$route) };
     delete newView0.matched;
     newView0.meta.title = title;
-    let newView = JSON.parse(JSON.stringify(newView0));
+    let newView = _.cloneDeep(newView0);
 
     commit("UPDATE_VISITED_VIEW", newView);
   },

package/src/store/modules/user.js

@@ -8,9 +8,10 @@ import {
   getLoginConfig,
   getLogicParamValue,
 } from "../../api/user";
-import { getToken, setToken, clearToken } from "../../utils/auth";
-import router, { resetRouter } from "@base/router";
-import { getDispermissions } from "../../api/menu";
+import { getToken, setToken, clearToken } from "../../utils/auth";
+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";
 
@@ -329,21 +330,14 @@ actions = {
       configUtil.clearToken();
       // qiankun 宿主：登出必须真正卸载保活中的子应用，
       // 否则换账号登录后切回子应用会复活上一个用户的实例（旧角色/旧路由/旧页面数据）
-      import("@base/microRouter")
-        .then(({ unmountAllMicroApps }) => unmountAllMicroApps())
-        .catch((error) => {
-          // 微前端 chunk 加载失败不能阻断本地登录态清理
-          console.error("[user] 微应用卸载模块加载失败", error);
-        })
-        .then(() => {
-          configUtil.resetRouter();
-          sessionStorage.removeItem("easyweb");
+      unmountAllMicroApps();
+      configUtil.resetRouter();
+      sessionStorage.removeItem("easyweb");
 
-          dispatch("tagsView/delAllViews", null, {
-            root: true,
-          });
-          resolve();
-        });
+      dispatch("tagsView/delAllViews", null, {
+        root: true,
+      });
+      resolve();
     });
   },
 

package/src/utils/pddLog.js

@@ -1,22 +1,8 @@
 import settingConfig from "@/settings";
-import { loadScript } from "@base/utils/externalAssets";
 
-const PDD_LOG_SDK_URL
-  = "https://pfile.pddpic.com/galerie-go/open_sdk/pc.202102201613.js";
-
-export async function initPddLog() {
-  if (!settingConfig.pddLogEnabled) return;
-  if (!window.PDD_OPEN_init) {
-    try {
-      await loadScript(PDD_LOG_SDK_URL);
-    } catch (error) {
-      console.warn("[pddLog] SDK 加载失败", error);
-      return;
-    }
-  }
-  if (typeof window.PDD_OPEN_init === "function") {
-    pddIntfHandle();
-  }
+export function initPddLog() {
+  if (!settingConfig.pddLogEnabled || !window.PDD_OPEN_init) return
+  pddIntfHandle();
 }
 
 function getPageCode(callback) {
@@ -90,7 +76,7 @@ function handleOrderLog(pati) {
 async function pddIntfHandle() {
   getPageCode(async (pageCode) => {
     if (!pageCode) return
-    window.PDD_OPEN_init({
+    PDD_OPEN_init({
       code: pageCode
       // 对于获取 code 接口或未登录态，可不传 code：PDD_OPEN_init({}, function () { ... })
     }, function () {

package/src/views/user/login/indexMixin.js

@@ -1,9 +1,9 @@
 import { encode } from "js-base64";
 import settingConfig from "@/settings";
-import { preloadBusinessFeatures } from "@base/bootstrap/business";
-
-function getUrlParams(url) {
-  let result = {};
+import QRcode from "qrcode";
+
+function getUrlParams(url) {
+  let result = {};
   if (url) {
     let urlStr = url.split("?")[1];
     const urlSearchParams = new URLSearchParams(urlStr);
@@ -89,14 +89,12 @@ export default {
       immediate: true,
     },
   },
-  beforeDestroy() {
-    this.clearQrLoginTimer();
-    this.clearSmsTimer();
-    // 注意：这里不能关跳转期 loading。组件销毁发生在导航确认时，而首页真正渲染上屏
-    // 还在其后，遮罩要撑过这段时间，由 closeRedirectLoading 收口
-  },
-  created() {
-    this.init();
+  beforeDestroy() {
+    this.clearQrLoginTimer();
+    this.clearSmsTimer();
+  },
+  created() {
+    this.init();
   },
   mounted() {
     // if (this.loginForm.username === '') {
@@ -242,25 +240,23 @@ export default {
         }
       }
 
-      // 登录接口、部署前缀、用户信息和菜单请求期间并行下载业务模块，
-      // 路由守卫会复用同一个 Promise，不增加登录结果等待链路。
-      preloadBusinessFeatures();
-
       this.$store
-        .dispatch("user/login2", reqData)
-        .then((res) => {
-          if (res.type == "success") {
-            localStorage.removeItem("currentMenuId");
-            this.rememberPassword();
-            window.removeEventListener("keydown", this.keyDown, false);
-            // 登录成功后的跳转链路（getWebPrefix → 路由守卫拉用户信息/生成动态路由 →
-            // 首页渲染上屏）耗时较长，换成挂在 body 上的全屏遮罩顶住这段时间，
-            // 防止登录页被再次操作；由 closeRedirectLoading 统一收口
-            loadingObj.close();
-            this.openRedirectLoading();
-            this.handleRedirectUrl();
-          } else {
-            setTimeout(function () {
+        .dispatch("user/login2", reqData)
+        .then((res) => {
+          setTimeout(function () {
+            loadingObj.close();
+          }, 200);
+          if (res.type == "success") {
+            localStorage.removeItem("currentMenuId");
+            this.rememberPassword();
+            /*this.$router.push({
+              path: '/'
+            });*/
+            this.loading = false;
+            window.removeEventListener("keydown", this.keyDown, false);
+            this.handleRedirectUrl();
+          } else {
+            setTimeout(function () {
               loadingObj.close();
             }, 200);
           }
@@ -453,41 +449,33 @@ export default {
         clearInterval(this.smsTimer);
         this.smsTimer = null;
       }
-    },
-    mobileLogin() {},
+    },
+    mobileLogin() {},
     handleRedirectUrl(redirect) {
-      // SSO、扫码等非账号密码入口也在跳转前启动预加载。
-      preloadBusinessFeatures();
       redirect = redirect || this.$route.query.redirect;
-      let path = null;
-      if (redirect && redirect.startsWith("/outLinkView")) {
+      let path = null;
+      if (redirect && redirect.startsWith("/outLinkView")) {
         path = this.addParamToUrl(redirect, "hasToken", "true");
       } else {
         path = "/";
       }
       this.getWebPrefix((webPrefix) => {
         let prefix = webPrefix ? "/" + webPrefix : "";
-        let ssotoken = this.searchParam.gatewayToken;
-        let xtoken = this.searchParam.xtoken;
-        if (prefix && prefix !== window.WEB_PREFIX) {
-          // 整页跳转，loading 随页面卸载消失
-          location.href = prefix + "/index.html" + path;
-        } else if (!!ssotoken || !!xtoken) {
-          prefix = prefix || window.WEB_PREFIX;
-          location.href = prefix + "/index.html" + path;
-        } else {
-          // 遮罩不在 push 的回调里收口：守卫内的重定向会让原始导航走 onAbort，
-          // 而真正的导航仍在继续，统一交给 openRedirectLoading 里注册的 afterEach
-          this.$router.push({
-            path: path,
-          });
-        }
-      }, () => {
-        // getWebPrefix 请求失败：恢复登录页可操作，避免 loading 永久卡死
-        this.closeRedirectLoading(true);
-      });
-      /*if (redirect && redirect.startsWith("/outLinkView")) {
-        let path = this.addParamToUrl(redirect, "hasToken", "true");
+        let ssotoken = this.searchParam.gatewayToken;
+        let xtoken = this.searchParam.xtoken;
+        if (prefix && prefix !== window.WEB_PREFIX) {
+          location.href = prefix + "/index.html" + path;
+        } else if (!!ssotoken || !!xtoken) {
+          prefix = prefix || window.WEB_PREFIX;
+          location.href = prefix + "/index.html" + path;
+        } else {
+          this.$router.push({
+            path: path,
+          });
+        }
+      });
+      /*if (redirect && redirect.startsWith("/outLinkView")) {
+        let path = this.addParamToUrl(redirect, "hasToken", "true");
         this.$router.push({
           path: path
         });
@@ -504,104 +492,23 @@ export default {
       } else {
         url +=
           (url.indexOf("?") === -1 ? "?" : "&") + paramKey + "=" + paramValue;
-      }
-      return url;
-    },
-    getWebPrefix(callback, errorCallback) {
-      this.$http({
-        url: USER_PREFIX + "/auth/getWebPrefix",
-        method: `post`,
+      }
+      return url;
+    },
+    getWebPrefix(callback) {
+      this.$http({
+        url: USER_PREFIX + "/auth/getWebPrefix",
+        method: `post`,
         data: {},
         isLoading: true,
         success: (res) => {
-          let webPrefix = res.objx;
-          callback && callback(webPrefix);
-        },
-        fail: () => {
-          errorCallback && errorCallback();
-        },
-        error: () => {
-          errorCallback && errorCallback();
-        },
-      });
-    },
-    /**
-     * 打开登录跳转期的全屏遮罩。
-     * 不能用 fullscreen:true —— element 的全屏 loading 是全局单例（fullscreenLoading），
-     * request.js 里 isLoading 的请求（getWebPrefix 就是）用的正是这个单例，请求结束会把
-     * 它一起 close 掉。这里传 target:body + fullscreen:false 拿独立实例，遮罩挂在 body 上
-     * 不随登录组件销毁而消失，全屏样式手动补。
-     */
-    openRedirectLoading() {
-      this.closeRedirectLoading();
-      let loading = this.$baseLoading({
-        target: document.body,
-        fullscreen: false,
-        lock: true,
-      });
-      let el = loading && loading.$el;
-      if (el) {
-        el.style.position = "fixed";
-        el.style.top = "0";
-        el.style.left = "0";
-        el.style.width = "100%";
-        el.style.height = "100%";
-        el.style.zIndex = 9999;
-      }
-      this.redirectLoadingObj = loading;
-      // 收口挂在 afterEach 上：路由守卫里的重定向会让原始 push 走 onAbort，但新导航
-      // 其实还在继续（实测 onAbort 在 +211ms 触发，首页 +577ms 才绘制完成），所以不能
-      // 用 push 的回调收口。afterEach 只在导航真正确认后触发一次，且带最终目标路由
-      this.redirectAfterEachOff = this.$router.afterEach((to) => {
-        if (String((to && to.path) || "").indexOf("/login") >= 0) {
-          // 兜了一圈又回到登录页（如守卫拉用户信息失败），恢复登录页可操作
-          this.closeRedirectLoading(true);
-        } else {
-          this.closeRedirectLoadingAfterPaint();
-        }
-      });
-      // 兜底：跳转链路既不 complete 也不 abort 时不至于永久锁死
-      this.redirectLoadingTimer = setTimeout(() => {
-        this.closeRedirectLoading(true);
-      }, 20000);
-    },
-    /**
-     * 等目标页真正绘制上屏后再撤遮罩：$nextTick 等 Vue 完成 patch，
-     * 双 rAF 等浏览器完成这一帧的绘制
-     */
-    closeRedirectLoadingAfterPaint() {
-      this.$nextTick(() => {
-        requestAnimationFrame(() => {
-          requestAnimationFrame(() => {
-            this.closeRedirectLoading();
-          });
-        });
-      });
-    },
-    /**
-     * 登录跳转期 loading 统一收口：上屏完成、跳转中止、getWebPrefix 失败、超时兜底时调用。
-     * reenable=true 时恢复登录页可操作（跳转失败仍停留在登录页的场景）
-     */
-    closeRedirectLoading(reenable) {
-      if (this.redirectAfterEachOff) {
-        this.redirectAfterEachOff();
-        this.redirectAfterEachOff = null;
-      }
-      if (this.redirectLoadingTimer) {
-        clearTimeout(this.redirectLoadingTimer);
-        this.redirectLoadingTimer = null;
-      }
-      if (this.redirectLoadingObj) {
-        this.redirectLoadingObj.close();
-        this.redirectLoadingObj = null;
-      }
-      if (reenable) {
-        this.loading = false;
-        window.addEventListener("keydown", this.keyDown, false);
-      }
-    },
-    handleGatewayTokenLogin() {
-      let ssotoken = this.searchParam.gatewayToken;
+          let webPrefix = res.objx;
+          callback && callback(webPrefix);
+        },
+      });
+    },
+    handleGatewayTokenLogin() {
+      let ssotoken = this.searchParam.gatewayToken;
       let companycode = this.searchParam.entCode;
       this.$store
         .dispatch("user/login2", { ssotoken, companycode })
@@ -643,17 +550,18 @@ export default {
         this.qrExpired = false;
         this.qrBase64 = url;
         this.createQrLoginTimer();
-      });
-    },
-    // 生成二维码
-    async createQR(content, options) {
-      const { default: QRCode } = await import(
-        /* webpackChunkName: "login-qrcode" */ "qrcode"
-      );
-      return QRCode.toDataURL(content, options);
-    },
-    changeTab() {
-      // this.initQR();
+      });
+    },
+    // 生成二维码
+    createQR(content, options) {
+      return new Promise((resolve, reject) => {
+        QRcode.toDataURL(content, options).then((url) => {
+          resolve(url);
+        });
+      });
+    },
+    changeTab() {
+      // this.initQR();
       // return
       if (this.activeName == "third") {
         this.initQR();

package/src/bootstrap/business.js

@@ -1,31 +0,0 @@
-let installPromise = null;
-
-/**
- * 登录页只安装认证所需的最小能力。表格、Excel、上传和业务弹框等全局能力
- * 在第一次进入业务路由前按需安装，避免进入 /login 时下载整套后台模块。
- */
-export function ensureBusinessFeatures() {
-  if (!installPromise) {
-    installPromise = import(
-      /* webpackChunkName: "business-core" */ "./businessFeatures"
-    ).catch((error) => {
-      // 网络抖动或发布切换导致 chunk 失败时，允许下一次导航重新尝试
-      installPromise = null;
-      throw error;
-    });
-  }
-  return installPromise;
-}
-
-/**
- * 提前触发业务模块下载和安装，但不阻塞当前交互。
- * 登录提交后会与认证、用户信息和菜单请求并行；真正进入业务路由时
- * ensureBusinessFeatures 会复用同一个 Promise，失败时仍由路由守卫统一提示。
- */
-export function preloadBusinessFeatures() {
-  const promise = ensureBusinessFeatures();
-  promise.catch((error) => {
-    console.warn("[bootstrap] 业务模块预加载失败，将在导航时重试", error);
-  });
-  return promise;
-}