@xingtukeji/micro 1.1.17 → 1.1.19

package/dist/index.js

@@ -1,34 +1,34 @@
 (function(){"use strict";try{if(typeof document!="undefined"){var e=document.createElement("style");e.appendChild(document.createTextNode('.xt-micro{width:100%;height:100%;overflow:hidden;background-color:transparent}.xt-micro:before{content:"加载中";position:absolute;inset:0;display:flex;justify-content:center;align-items:center;z-index:-1}.micro-iframe{width:100%;height:100%;border:none;margin:0;padding:0}.micro-iframe:after{content:"加载中";position:absolute;inset:0;display:flex;justify-content:center;align-items:center;background:#fff}')),document.head.appendChild(e)}}catch(t){console.error("vite-plugin-css-injected-by-js",t)}})();
-var T = Object.defineProperty, A = Object.defineProperties;
-var x = Object.getOwnPropertyDescriptors;
-var E = Object.getOwnPropertySymbols;
-var $ = Object.prototype.hasOwnProperty, X = Object.prototype.propertyIsEnumerable;
-var R = (e, t, n) => t in e ? T(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, d = (e, t) => {
+var x = Object.defineProperty, X = Object.defineProperties;
+var k = Object.getOwnPropertyDescriptors;
+var M = Object.getOwnPropertySymbols;
+var H = Object.prototype.hasOwnProperty, j = Object.prototype.propertyIsEnumerable;
+var R = (e, t, n) => t in e ? x(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, d = (e, t) => {
   for (var n in t || (t = {}))
-    $.call(t, n) && R(e, n, t[n]);
-  if (E)
-    for (var n of E(t))
-      X.call(t, n) && R(e, n, t[n]);
+    H.call(t, n) && R(e, n, t[n]);
+  if (M)
+    for (var n of M(t))
+      j.call(t, n) && R(e, n, t[n]);
   return e;
-}, y = (e, t) => A(e, x(t));
+}, y = (e, t) => X(e, k(t));
 var p = (e, t, n) => (R(e, typeof t != "symbol" ? t + "" : t, n), n);
 var h = (e, t, n) => new Promise((o, r) => {
   var a = (l) => {
     try {
       i(n.next(l));
-    } catch (_) {
-      r(_);
+    } catch (g) {
+      r(g);
     }
   }, c = (l) => {
     try {
       i(n.throw(l));
-    } catch (_) {
-      r(_);
+    } catch (g) {
+      r(g);
     }
   }, i = (l) => l.done ? o(l.value) : Promise.resolve(l.value).then(a, c);
   i((n = n.apply(e, t)).next());
 });
-import { ref as C, defineComponent as k, watch as H, onMounted as j, onUnmounted as N, openBlock as V, createElementBlock as B, mergeProps as F } from "vue";
+import { ref as O, defineComponent as N, watch as F, onMounted as B, onUnmounted as V, openBlock as D, createElementBlock as K, mergeProps as Y } from "vue";
 const s = {
   KEY: "$xtm",
   // 父应用注入子应用实例的key
@@ -48,28 +48,28 @@ const s = {
   // 微应用在 url 参数中的前缀
   MICRO_VERSION: "__XT_MICRO_VERSION"
   // 微应用版本
-}, u = "1.1.17";
+}, w = "1.1.19";
 function f(e, t = window.location.href) {
   e = e.replace(/[\[\]]/g, "\\$&");
   var n = new RegExp("[?&]" + e + "(=([^&#]*)|&|#|$)"), o = n.exec(t);
   return o ? o[2] ? decodeURIComponent(o[2].replace(/\+/g, " ")).trim() : "" : null;
 }
-function S(e, t, n) {
+function E(e, t, n) {
   try {
     return e && (n && e.startsWith("#") ? e : new URL(e, t).href);
   } catch (o) {
     return e;
   }
 }
-function D(e) {
+function W(e) {
   const t = window.document.createElement("a");
   return t.href = e, t.href = t.href, t;
 }
-function K(e) {
+function z(e) {
   const t = e.search || "";
   return [...new URLSearchParams(t).entries()].reduce((n, o) => (n[o[0]] = o[1], n), {});
 }
-function Y(e, t) {
+function q(e, t) {
   let n = null;
   return function(...o) {
     const r = this;
@@ -78,15 +78,15 @@ function Y(e, t) {
     }, t);
   };
 }
-function U(e, t, n) {
+function C(e, t, n) {
   const [o, r] = e.split("#"), a = new URL(o), c = a.searchParams;
-  return t = s.URL_PARAM_PREFIX + t, c.has(t) ? c.set(t, n) : c.append(t, n), r && (a.hash = r), a.search = c.toString(), a.toString();
+  return t = s.URL_PARAM_PREFIX + t, c.has(t) ? c.set(t, n) : c.append(t, n), r && (a.hash = r), a.search = c.toString(), console.trace("urlObj", a), a.origin + a.pathname + a.search + a.hash;
 }
-const P = (e) => h(void 0, null, function* () {
+const S = (e) => h(void 0, null, function* () {
   return new Promise((t) => {
     window.addEventListener("message", (n) => {
-      console.debug("child ipcSyncAppInfo receive message", n.data), n.data.cmd === "$xt/micro/info" && (n.data.data.mainMicroVersion !== u && console.warn(
-        `子应用版本与主应用版本不一致，${e}子应用版本：${u}，主应用版本：${n.data.data.mainMicroVersion}`
+      console.debug("child ipcSyncAppInfo receive message", n.data), n.data.cmd === "$xt/micro/info" && (n.data.data.mainMicroVersion !== w && console.warn(
+        `子应用版本与主应用版本不一致，${e}子应用版本：${w}，主应用版本：${n.data.data.mainMicroVersion}`
       ), t(n.data.data));
     }), console.debug("child ipcSyncAppInfo send message", e), window.parent.postMessage(
       {
@@ -96,25 +96,25 @@ const P = (e) => h(void 0, null, function* () {
       "*"
     );
   });
-}), ie = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), he = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  addOrReplaceUrlParam: U,
-  anchorElementGenerator: D,
-  debounce: Y,
-  getAbsolutePath: S,
-  getAnchorElementQueryMap: K,
+  addOrReplaceUrlParam: C,
+  anchorElementGenerator: W,
+  debounce: q,
+  getAbsolutePath: E,
+  getAnchorElementQueryMap: z,
   getQueryParameter: f,
-  ipcSyncAppInfo: P
-}, Symbol.toStringTag, { value: "Module" })), O = C(!1);
+  ipcSyncAppInfo: S
+}, Symbol.toStringTag, { value: "Module" })), P = O(!1);
 Object.defineProperty(window, s.IS_MICRO, {
   get: function() {
-    return O.value;
+    return P.value;
   },
   set: function(e) {
-    O.value = e;
+    P.value = e;
   }
 });
-const I = (e) => `${s.DOM_ID_PREFIX}${e}`, b = (e, t = !1) => {
+const I = (e) => `${s.DOM_ID_PREFIX}${e}`, U = (e, t = !1) => {
   function n(i) {
     return i !== null && typeof i == "object" && !Array.isArray(i);
   }
@@ -122,29 +122,30 @@ const I = (e) => `${s.DOM_ID_PREFIX}${e}`, b = (e, t = !1) => {
     e.url.indexOf("http") > -1 ? e.url : window.location.origin + e.url
   ), c = f(s.URL_PARAM_PREFIX + e.name);
   if (!t && c) {
-    const i = S(c, e.url, !0);
+    const i = E(c, e.url, !0);
     if (i) {
-      const l = new URL(i);
-      l.searchParams.forEach((v, L) => {
-        a.searchParams.set(L, v);
+      const l = new URL(i, e.url);
+      l.searchParams.forEach((A, $) => {
+        a.searchParams.set($, A);
       }), a.hash = l.hash;
     }
+    m(e.name);
   }
   if (a.searchParams.set(s.IS_MICRO, !0 + ""), a.searchParams.set(s.MICRO_NAME, e.name), r && a.searchParams.set(s.MICRO_TOKEN, r), o)
     for (let i of Object.keys(o))
       a.searchParams.set(i, o[i]);
-  return w(e.name), a.href;
-}, W = () => {
+  return m(e.name), a.href;
+}, G = () => {
   const e = document.createElement("div");
   return e.innerHTML = "应用加载中...", e.style.textAlign = "center", e.style.lineHeight = "100px", e.style.fontSize = "20px", e.style.color = "#999", e.style.position = "absolute", e.style.top = "0", e.style.left = "0", e.style.right = "0", e.style.bottom = "0", e.style.zIndex = "999", e.style.background = "transparent", e.style["mix-blend-mode"] = "difference", e;
-}, q = (e) => {
+}, Q = (e) => {
   e.style.opacity = "0", setTimeout(() => {
     e.remove();
   }, 500);
-}, z = (e) => {
+}, J = (e) => {
   const t = document.createElement("iframe");
   t.id = I(e.app.name);
-  const n = b(e.app);
+  const n = U(e.app);
   t.src = n, t.style.width = "100%", t.style.height = "100%", t.style.border = "none", t.style.margin = "0", t.style.padding = "0", t.style.backgroundColor = "transparent", t.style["color-scheme"] = "unset", t.style.visibility = "hidden", t.addEventListener("load", (r) => (t.style.visibility = "visible", e.onLoad.call(e, r))), t.addEventListener(
     "error",
     (r) => e.onError.call(e, r)
@@ -162,7 +163,7 @@ const I = (e) => `${s.DOM_ID_PREFIX}${e}`, b = (e, t = !1) => {
     subtree: !1
   }), t;
 };
-class G {
+class Z {
   constructor(t) {
     p(this, "app");
     p(this, "dom");
@@ -176,8 +177,8 @@ class G {
     if (t ? (typeof t == "string" ? o = document.querySelector(t) : o = t, o.innerHTML = "") : o = document.body, o) {
       this.panel = o;
       let r = document.getElementById(I(this.app.name));
-      r || (r = z(this), this.dom = r), n ? r.style.display = "none" : r.style.removeProperty("display");
-      const a = W();
+      r || (r = J(this), this.dom = r), n ? r.style.display = "none" : r.style.removeProperty("display");
+      const a = G();
       this.loadingTimer = setTimeout(() => {
         this.loading = a, o.appendChild(a);
       }, 1e3), o.appendChild(r);
@@ -209,7 +210,7 @@ class G {
   }
   reload(t = !1) {
     let n = this.dom.src;
-    t && (n = b(this.app, !0), console.log("go home", n)), console.log("reload app", this.app, n);
+    t && (n = U(this.app, !0), console.log("go home", n)), console.log("reload app", this.app, n);
     const o = new URL(n);
     o.searchParams.set("__t", Date.now().toString()), this.dom.style.visibility = "hidden", this.dom.src = o.toString();
   }
@@ -217,16 +218,16 @@ class G {
     console.log("changeOptions", this.app, t), this.app = d(d({}, this.app), t);
   }
   onLoad(t) {
-    console.debug("app onLoad", this.app.name), this.loadingTimer && clearTimeout(this.loadingTimer), this.loading && q(this.loading), Q(this), this.app.onLoad && this.app.onLoad(t, this);
+    console.debug("app onLoad", this.app.name), this.loadingTimer && clearTimeout(this.loadingTimer), this.loading && Q(this.loading), ee(this), console.log("this.app.onLoad", this.app.onLoad), this.app.onLoad && this.app.onLoad(t, this);
   }
   onUnload(t) {
-    console.debug("app onUnload", this.app.name), w(this.app.name), this.app.onUnload && this.app.onUnload(t, this);
+    console.debug("app onUnload", this.app.name), m(this.app.name), this.app.onUnload && this.app.onUnload(t, this);
   }
   onError(t) {
     console.error("app onError", this.app.name), this.app.onError && this.app.onError(t, this);
   }
 }
-const Q = (e) => {
+const ee = (e) => {
   var t, n;
   (n = (t = e.dom) == null ? void 0 : t.contentWindow) == null || n.postMessage(
     {
@@ -241,7 +242,7 @@ const Q = (e) => {
     },
     "*"
   );
-}, J = () => {
+}, te = () => {
   window[s.MICRO_TYPE] = "parent", window.addEventListener("message", (e) => {
     if (e.data.cmd === "$xt/micro/sync") {
       console.log("父页面接受子应用同步路由信息", e.data);
@@ -253,17 +254,23 @@ const Q = (e) => {
         window.decodeURIComponent(e.data.data.url),
         e.origin
       );
-      for (let a of t)
-        n.searchParams.delete(a);
-      const o = w(e.data.data.name), r = U(
-        o,
+      for (let c of t)
+        n.searchParams.delete(c);
+      console.log("tempUrl", n);
+      const o = m(e.data.data.name), r = new URL(o);
+      r.searchParams.forEach((c, i) => {
+        i.startsWith(s.URL_PARAM_PREFIX) && r.searchParams.delete(i);
+      }), console.log("mainURL.href", r.href);
+      const a = C(
+        r.href,
         e.data.data.name,
         n.href
+        // tempUrl.pathname + tempUrl.search + tempUrl.hash
       );
-      window.history.replaceState(null, "", r);
+      console.log("curUrl", a), window.history.replaceState(null, "", a);
     } else if (e.data.cmd === "$xt/micro/info") {
       console.debug("parent 「$xt/micro/info」 receive message", e.data);
-      const t = g(e.data.data);
+      const t = _(e.data.data);
       e.source.postMessage(
         {
           cmd: "$xt/micro/info",
@@ -279,7 +286,7 @@ const Q = (e) => {
               port: window.location.port,
               protocol: window.location.protocol
             },
-            mainMicroVersion: u,
+            mainMicroVersion: w,
             name: t.name,
             url: t.url,
             params: t.params,
@@ -291,12 +298,12 @@ const Q = (e) => {
       );
     }
   });
-}, ce = (...t) => h(void 0, [...t], function* (e = {}) {
+}, ne = (...t) => h(void 0, [...t], function* (e = {}) {
   window[s.MICRO_TYPE] = "child";
   const n = f(s.IS_MICRO), o = f(s.MICRO_NAME);
-  if (console.debug("child microInit", n, o), n && (window[s.IS_MICRO] = n === "true"), o && P(o).then((r) => {
+  if (console.debug("child microInit", n, o), n && (window[s.IS_MICRO] = n === "true"), o && S(o).then((r) => {
     window[s.MICRO_APP] = d({
-      microVersion: u
+      microVersion: w
     }, r);
   }), window[s.IS_MICRO]) {
     let r = function(c) {
@@ -311,15 +318,15 @@ const Q = (e) => {
       r(`${c} { display: none !important; }`);
     }) : r(
       `${e.hideHeaderCssSelector} { display: none !important; }`
-    )), yield Z(o, window), window.addEventListener("message", (c) => h(void 0, null, function* () {
-      c.data.cmd === `$xt/micro/${o}` && M(o);
+    )), yield oe(o, window), window.addEventListener("message", (c) => h(void 0, null, function* () {
+      c.data.cmd === `$xt/micro/${o}` && L(o);
     }));
     const a = f(s.MICRO_TOKEN);
     e.authHandler && a && (yield e.authHandler(a));
   } else
     console.warn("当前环境非微应用环境");
 });
-function Z(e, t) {
+function oe(e, t) {
   const n = t.history, o = n.pushState, r = n.replaceState;
   n.pushState = function(a, c, i) {
     const l = y(d(d({}, n.state || {}), a), {
@@ -327,25 +334,22 @@ function Z(e, t) {
       _patchedByParent: !0
       // 可选：标记这是被父窗口修改的状态
     });
-    o.call(n, l, c, i), M(e);
+    o.call(n, l, c, i), L(e);
   }, n.replaceState = function(a, c, i) {
     const l = y(d(d({}, n.state || {}), a), {
       // 添加新数据
       _patchedByParent: !0
       // 可选：标记这是被父窗口修改的状态
     });
-    r.call(n, l, c, i), M(e);
+    r.call(n, l, c, i);
   };
 }
-function M(e) {
+function L(e) {
   return h(this, null, function* () {
-    console.log("syncUrlToWindow", e, window[s.MICRO_APP]), window[s.MICRO_APP] || (yield P(e).then((a) => {
-      window[s.MICRO_APP] = d({
-        microVersion: u
-      }, a);
-    }));
+    if (console.log("syncUrlToWindow", e, window[s.MICRO_APP]), !window[s.MICRO_APP])
+      return;
     const { name: t, sync: n, mainLocation: o } = window[s.MICRO_APP], r = window.location.pathname + window.location.search + window.location.hash;
-    window.parent.postMessage(
+    console.log("curUrl", r), window.parent.postMessage(
       {
         cmd: "$xt/micro/sync",
         data: {
@@ -357,80 +361,105 @@ function M(e) {
     );
   });
 }
-let m = {};
-const ee = {
+let u = {};
+const re = {
   url: "",
   name: "",
   sync: !0
-}, le = (e) => {
+}, ae = (e) => {
   if (!e.url || e.url === "" || e.url === "undefined") {
     console.error("app url is required", e);
     return;
   }
-  const t = Object.assign({}, ee, e), n = m[e.name];
-  return n ? m[e.name] = d(d({}, n), t) : m[e.name] = y(d({}, t), {
-    instance: new G(e)
-  }), m[e.name];
-}, g = (e) => m[e], te = (e, t) => m[e.name] = d(d({}, e), t), ne = (e, t) => new Promise((n, o) => {
-  let r = g(e);
-  r ? (t && (r.instance.changeOptions(t), r = te(r, t)), r.preload ? r.instance.preloadRender(r.el) : r.instance.mount(r.el), n(r)) : o("app not found, please setup app first");
-}), oe = (e) => {
-  let t = g(e);
+  const t = Object.assign({}, re, e), n = u[e.name];
+  return n ? u[e.name] = d(d({}, n), t) : u[e.name] = y(d({}, t), {
+    instance: new Z(e)
+  }), u[e.name];
+}, _ = (e) => u[e], se = (e, t) => u[e.name] = d(d({}, e), t), b = (e, t) => new Promise((n, o) => {
+  let r = _(e);
+  r ? (t && (r.instance.changeOptions(t), r = se(r, t)), r.preload ? r.instance.preloadRender(r.el) : r.instance.mount(r.el), n(r)) : o("app not found, please setup app first");
+}), T = (e) => {
+  let t = _(e);
   t && t.instance.unmount();
-}, de = (e, t = !1) => {
-  let n = g(e);
+}, ie = (e, t = !1) => {
+  let n = _(e);
   n && n.instance.reload(t);
-}, w = (e) => {
+}, m = (e) => {
   console.log("clearParentUrl", e, s.URL_PARAM_PREFIX + e);
   const t = window.location.href.split("#");
   console.log("url", t);
-  const n = new URL(t[0]);
-  console.log("mainURL", n), n.searchParams.delete(s.URL_PARAM_PREFIX + e);
+  let n = new URL(t[0]);
+  n.searchParams.delete(s.URL_PARAM_PREFIX + e);
   const o = t.length > 1 ? n.href + "#" + t[1] : n.href;
   return window.history.replaceState({}, "", o), o;
-}, re = /* @__PURE__ */ k({
+}, v = () => window[s.IS_MICRO] === !0, ce = () => window[s.MICRO_TYPE] === "parent", le = (e, t = ((n) => (n = window.__XT_MICRO_APP) == null ? void 0 : n.name)()) => {
+  let o = window.location;
+  if (v())
+    o = window.__XT_MICRO_APP.mainLocation;
+  else if (!t) {
+    console.error("在主应用中需要传入应用名称");
+    return;
+  }
+  return `${o.origin}${o.pathname}?__XT_MICRO_${t}=${encodeURIComponent(e)}${o.hash}`;
+}, de = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  clearParentUrl: m,
+  createAppUrl: le,
+  getApp: _,
+  isMicro: v,
+  isParent: ce,
+  microInit: ne,
+  reloadApp: ie,
+  setupApp: ae,
+  startApp: b,
+  stopApp: T
+}, Symbol.toStringTag, { value: "Module" })), me = /* @__PURE__ */ N({
   __name: "XTMicroView",
   props: {
     appId: String
   },
   setup(e) {
-    const t = e, n = C(), o = () => {
-      t.appId && ne(t.appId, {
+    const t = e, n = O(), o = () => {
+      t.appId && b(t.appId, {
         el: n.value,
         onUnload(r, a) {
-          console.log("on unload", a.app.name), w(a.app.name);
+          console.log("on unload", a.app.name), m(a.app.name);
         }
       }).then((r) => {
         console.debug("app mounted", t.appId);
       });
     };
-    return H(() => t.appId, (r, a) => {
-      r !== a && a && oe(a), o();
-    }), j(() => {
+    return F(() => t.appId, (r, a) => {
+      r !== a && a && T(a), o();
+    }), B(() => {
       o();
-    }), N(() => {
-      console.debug("「micro」", "app unmount", t.appId), w(t.appId);
-    }), (r, a) => (V(), B("div", F({
+    }), V(() => {
+      console.debug("「micro」", "app unmount", t.appId), m(t.appId);
+    }), (r, a) => (D(), K("div", Y({
       ref_key: "refPanel",
       ref: n
     }, r.$attrs, { class: "xt-micro" }), null, 16));
   }
 });
-window[s.MICRO_VERSION] = u;
-const pe = {
+window[s.MICRO_VERSION] = w;
+window.api = de;
+const fe = {
   install: (e, t = {}) => {
-    e.component("xt-micro-view", re), J();
+    e.component("xt-micro-view", me), te();
   }
 };
 export {
-  re as XTMicroView,
-  w as clearParentUrl,
-  pe as default,
-  g as getApp,
-  ce as microInit,
-  de as reloadApp,
-  le as setupApp,
-  ne as startApp,
-  oe as stopApp,
-  ie as utils
+  me as XTMicroView,
+  m as clearParentUrl,
+  le as createAppUrl,
+  fe as default,
+  _ as getApp,
+  v as isMicro,
+  ce as isParent,
+  ne as microInit,
+  ie as reloadApp,
+  ae as setupApp,
+  b as startApp,
+  T as stopApp,
+  he as utils
 };

package/dist/types/api.d.ts

@@ -20,4 +20,13 @@ export declare const startApp: (name: string, options?: Partial<AppOption>) => P
 export declare const stopApp: (name: string) => void;
 export declare const reloadApp: (name: string, isGoHome?: boolean) => void;
 export declare const clearParentUrl: (appName: string) => string;
+export declare const isMicro: () => boolean;
+export declare const isParent: () => boolean;
+/**
+ * 创建基于主应用路由的某个子应用的 url
+ * @param appName 应用名称
+ * @param targetUrlHash 应用地址
+ * @returns
+ */
+export declare const createAppUrl: (targetUrlHash: string, appName?: string) => string;
 export { microInit };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xingtukeji/micro",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "private": false,
   "description": "",
   "main": "dist/index.js",