@skyfox2000/microbase 1.0.6 → 1.0.8

package/lib/microbase.es.js

@@ -1,11 +1,11 @@
-import { deepClone as u } from "@skyfox2000/fapi";
+import { deepClone as l } from "@skyfox2000/fapi";
 import { ref as o, markRaw as p, h as a } from "vue";
 import { createRouter as m, createWebHashHistory as d } from "vue-router";
 var v = /* @__PURE__ */ ((e) => (e.Market = "Market", e.Manual = "Manual", e))(v || {}), y = /* @__PURE__ */ ((e) => (e.App = "App", e.MenuApp = "MenuApp", e.Link = "Link", e.Iframe = "Iframe", e))(y || {});
 const r = (e, n) => {
   if (!(!n || !e))
     for (const t in n)
-      t in e && typeof e[t] == "object" && typeof n[t] == "object" && !Array.isArray(n[t]) ? r(e[t], n[t]) : e[t] = u(n[t]);
+      t in e && typeof e[t] == "object" && typeof n[t] == "object" && !Array.isArray(n[t]) ? r(e[t], n[t]) : e[t] = l(n[t]);
 }, P = (...e) => {
   const n = {};
   for (const t of e)
@@ -13,24 +13,24 @@ const r = (e, n) => {
   for (const t of e)
     t != null && t.Query && !n.Query && (n.Query = {}), r(n.Query, t == null ? void 0 : t.Query);
   for (const t of e)
-    n.Data = t != null && t.Data ? u(t.Data) : {};
+    n.Data = t != null && t.Data ? l(t.Data) : {};
   return n;
 }, I = () => !!window.__MICRO_APP_ENVIRONMENT__, k = () => !!window.__MICRO_APP_BASE_APPLICATION__, i = o(), A = o(), M = o(), R = () => {
   const e = window.microApp.getData(
     !0
   );
-  i.value = e.MainApis, A.value = e.MainEvents, M.value = e.pageUrl;
+  e && (i.value = e.MainApis, A.value = e.MainEvents, M.value = e.pageUrl);
 }, w = [
   {
     path: "/:page(.*)",
     name: "默认页面",
     component: () => import("./assets/modules/index-DQ8DfP_z.js")
   }
-], l = m({
+], u = m({
   history: d(void 0),
   routes: w
 });
-l.afterEach((e) => {
+u.afterEach((e) => {
   if (i.value) {
     const { mainAppPush: n } = i.value;
     n && n(e.hash);
@@ -41,7 +41,7 @@ const C = o({}), c = o(""), f = o({}), s = o(null), _ = async (e) => {
   const n = f.value[`./views/${e}.vue`];
   if (n) {
     const t = await n();
-    s.value = p(t.default), l.replace("/" + e);
+    s.value = p(t.default), u.replace("/" + e);
   } else
     console.error("加载微模块" + e + "失败"), s.value = a(
       "div",
@@ -62,13 +62,13 @@ const C = o({}), c = o(""), f = o({}), s = o(null), _ = async (e) => {
   f.value = e, window.microApp && window.microApp.addDataListener(async (n) => {
     if (n.pageUrl === c.value) return;
     let t = n.pageUrl;
-    _(t);
+    t ? _(t) : console.error("微模块地址为空");
   }, !0);
 };
 export {
   y as AppAction,
   v as AppSource,
-  l as LoaderRouter,
+  u as LoaderRouter,
   P as combineParams,
   R as initMainAppData,
   E as initModuleLoader,

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/microbase",
-   "version": "1.0.6",
+   "version": "1.0.8",
    "description": "微前端通用功能与数据类型定义",
    "type": "module",
    "keywords": [],

package/src/components/loader/index.ts

@@ -64,7 +64,8 @@ export const initModuleLoader = (
       window.microApp.addDataListener(async (data: MainAppData) => {
          if (data.pageUrl === moduleUrl.value) return;
          let page = data.pageUrl as string;
-         loadModule(page);
+         if (page) loadModule(page);
+         else console.error("微模块地址为空");
       }, true);
    }
 };

package/src/utils/micro-app.ts

@@ -100,7 +100,9 @@ export const initMainAppData = () => {
    const mainAppData: MainAppData = window.microApp.getData(
       true
    ) as unknown as MainAppData;
-   mainAppApis.value = mainAppData.MainApis;
-   mainAppEvents.value = mainAppData.MainEvents;
-   mainPageUrl.value = mainAppData.pageUrl;
+   if (mainAppData) {
+      mainAppApis.value = mainAppData.MainApis;
+      mainAppEvents.value = mainAppData.MainEvents;
+      mainPageUrl.value = mainAppData.pageUrl;
+   }
 };