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

package/src/microRouter/index.js

@@ -5,6 +5,7 @@
  * 由 permission store 在登录后菜单生成流程中调用（settings.microMainEnabled 门控）。
  */
 import { loadMicroApp } from "qiankun";
+import { Loading } from "element-ui";
 import { getLogicParamValue } from "@base/api/user";
 import {
   getAccessPath,
@@ -248,6 +249,19 @@ function activateMicroApp(key) {
             + "/ 即回到正式环境）"
         );
       }
+      // 子应用是另一套系统，首次装载要下载其全量资源、耗时明显，期间容器空白。
+      // loading 只盖内容区，不遮页签，也不挂子应用容器 el（el 会被 qiankun 写 innerHTML
+      // 清掉，且空 #Appmicro 高度为 0）：挂到有尺寸、qiankun 不碰的 .app-main，
+      // 再把遮罩顶边下移到 #Appmicro 的位置（offsetTop = 固定表头里页签的占位高度，
+      // 动态读取不写死），从而避开顶部的页签栏。挂载成功 / 失败都关闭。
+      const appMain = wrapper.closest(".app-main");
+      const loadingInstance = Loading.service({
+        target: appMain || wrapper,
+        text: "加载中…",
+      });
+      if (appMain && loadingInstance.$el && loadingInstance.$el.style) {
+        loadingInstance.$el.style.top = wrapper.offsetTop + "px";
+      }
       let instance;
       try {
         instance = loadMicroApp({
@@ -257,6 +271,7 @@ function activateMicroApp(key) {
           props: config.props,
         });
       } catch (error) {
+        loadingInstance.close();
         if (el.parentNode) {
           el.parentNode.removeChild(el);
         }
@@ -268,11 +283,17 @@ function activateMicroApp(key) {
       if (
         instance
         && instance.mountPromise
-        && typeof instance.mountPromise.catch === "function"
+        && typeof instance.mountPromise.then === "function"
       ) {
-        instance.mountPromise.catch((error) => {
-          cleanupFailedMicroApp(key, createdAlive, error);
-        });
+        instance.mountPromise
+          .then(() => loadingInstance.close())
+          .catch((error) => {
+            loadingInstance.close();
+            cleanupFailedMicroApp(key, createdAlive, error);
+          });
+      } else {
+        // 理论不会走到（loadMicroApp 恒返回带 mountPromise 的实例），兜底避免遮罩悬挂
+        loadingInstance.close();
       }
       return;
     }
@@ -398,7 +419,12 @@ function createDefaultMainAdapter() {
     navigate(path) {
       const vueRoot = window.$vueRoot;
       if (vueRoot && vueRoot.$router) {
-        vueRoot.$router.push(path).catch(() => {});
+        // vue-router 3.0.2 的 push 返回 undefined（3.1.0 才返回 Promise），
+        // 直接 .catch 会抛 "reading 'catch'"，仅在返回 Promise 时才吞异常
+        const nav = vueRoot.$router.push(path);
+        if (nav && typeof nav.catch === "function") {
+          nav.catch(() => {});
+        }
       }
     },
     openTab(path) {

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/public-path.js

@@ -6,3 +6,33 @@
 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/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 () {