@xingtukeji/micro 1.1.20 → 1.1.22

package/dist/index.js

@@ -1,13 +1,13 @@
 (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 $ = Object.defineProperty, x = Object.defineProperties;
 var X = Object.getOwnPropertyDescriptors;
-var E = Object.getOwnPropertySymbols;
+var O = Object.getOwnPropertySymbols;
 var k = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
 var M = (t, e, n) => e in t ? $(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, m = (t, e) => {
   for (var n in e || (e = {}))
     k.call(e, n) && M(t, n, e[n]);
-  if (E)
-    for (var n of E(e))
+  if (O)
+    for (var n of O(e))
       H.call(e, n) && M(t, n, e[n]);
   return t;
 }, R = (t, e) => x(t, X(e));
@@ -15,21 +15,21 @@ var h = (t, e, n) => (M(t, typeof e != "symbol" ? e + "" : e, n), n);
 var w = (t, e, n) => new Promise((o, r) => {
   var a = (d) => {
     try {
-      s(n.next(d));
+      c(n.next(d));
     } catch (y) {
       r(y);
     }
   }, l = (d) => {
     try {
-      s(n.throw(d));
+      c(n.throw(d));
     } catch (y) {
       r(y);
     }
-  }, s = (d) => d.done ? o(d.value) : Promise.resolve(d.value).then(a, l);
-  s((n = n.apply(t, e)).next());
+  }, c = (d) => d.done ? o(d.value) : Promise.resolve(d.value).then(a, l);
+  c((n = n.apply(t, e)).next());
 });
-import { ref as C, defineComponent as j, watch as F, onMounted as K, onUnmounted as N, openBlock as Y, createElementBlock as B, mergeProps as V } from "vue";
-const c = {
+import { ref as b, defineComponent as j, watch as F, onMounted as K, onUnmounted as Y, openBlock as N, createElementBlock as V, mergeProps as B } from "vue";
+const s = {
   KEY: "$xtm",
   // 父应用注入子应用实例的key
   IS_MICRO: "__XT_MICRO",
@@ -48,13 +48,13 @@ const c = {
   // 微应用在 url 参数中的前缀
   MICRO_VERSION: "__XT_MICRO_VERSION"
   // 微应用版本
-}, _ = "1.1.20";
-function g(t, e = window.location.href) {
+}, f = "1.1.22";
+function _(t, e = window.location.href) {
   t = t.replace(/[\[\]]/g, "\\$&");
   var n = new RegExp("[?&]" + t + "(=([^&#]*)|&|#|$)"), o = n.exec(e);
   return o ? o[2] ? decodeURIComponent(o[2].replace(/\+/g, " ")).trim() : "" : null;
 }
-function b(t, e, n) {
+function S(t, e, n) {
   try {
     return t && (n && t.startsWith("#") ? t : new URL(t, e).href);
   } catch (o) {
@@ -78,15 +78,15 @@ function W(t, e) {
     }, e);
   };
 }
-function S(t, e, n) {
+function U(t, e, n) {
   const [o, r] = t.split("#"), a = new URL(o), l = a.searchParams;
-  return e = c.URL_PARAM_PREFIX + e, l.has(e) ? l.set(e, n) : l.append(e, n), r && (a.hash = r), a.search = l.toString(), i.trace("urlObj", a), a.origin + a.pathname + a.search + a.hash;
+  return e = s.URL_PARAM_PREFIX + e, l.has(e) ? l.set(e, n) : l.append(e, n), r && (a.hash = r), a.search = l.toString(), i.trace("urlObj", a), a.origin + a.pathname + a.search + a.hash;
 }
-const U = (t) => w(void 0, null, function* () {
+const E = (t) => w(void 0, null, function* () {
   return new Promise((e) => {
     window.addEventListener("message", (n) => {
-      i.debug("child ipcSyncAppInfo receive message", n.data), n.data.cmd === "$xt/micro/info" && (n.data.data.mainMicroVersion !== _ && i.warn(
-        `子应用版本与主应用版本不一致，${t}子应用版本：${_}，主应用版本：${n.data.data.mainMicroVersion}`
+      i.debug("child ipcSyncAppInfo receive message", n.data), n.data.cmd === "$xt/micro/info" && (n.data.data.mainMicroVersion !== f && i.warn(
+        `子应用版本与主应用版本不一致，${t}子应用版本：${f}，主应用版本：${n.data.data.mainMicroVersion}`
       ), e(n.data.data));
     }), i.debug("child ipcSyncAppInfo send message", t), window.parent.postMessage(
       {
@@ -131,8 +131,8 @@ const U = (t) => w(void 0, null, function* () {
         return "unknown location";
       const r = o[0].trim(), a = r.match(/(?:http[s]?:\/\/.*?\/|)([^:]+):(\d+):(\d+)/);
       if (a) {
-        const [, l, s] = a;
-        return `[${l.split("/").slice(-2).join("/")}:${s}]`;
+        const [, l, c] = a;
+        return `[${l.split("/").slice(-2).join("/")}:${c}]`;
       }
       return `[${r}]`;
     } catch (e) {
@@ -185,43 +185,43 @@ let i = u;
 const de = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   ConsoleUtil: i,
-  addOrReplaceUrlParam: S,
+  addOrReplaceUrlParam: U,
   anchorElementGenerator: D,
   debounce: W,
-  getAbsolutePath: b,
+  getAbsolutePath: S,
   getAnchorElementQueryMap: G,
-  getQueryParameter: g,
-  ipcSyncAppInfo: U
-}, Symbol.toStringTag, { value: "Module" })), O = C(!1);
-Object.defineProperty(window, c.IS_MICRO, {
+  getQueryParameter: _,
+  ipcSyncAppInfo: E
+}, Symbol.toStringTag, { value: "Module" })), C = b(!1);
+Object.defineProperty(window, s.IS_MICRO, {
   get: function() {
-    return O.value;
+    return C.value;
   },
   set: function(t) {
-    O.value = t;
+    C.value = t;
   }
 });
-const P = (t) => `${c.DOM_ID_PREFIX}${t}`, L = (t, e = !1) => {
-  function n(s) {
-    return s !== null && typeof s == "object" && !Array.isArray(s);
+const P = (t) => `${s.DOM_ID_PREFIX}${t}`, L = (t, e = !1) => {
+  function n(c) {
+    return c !== null && typeof c == "object" && !Array.isArray(c);
   }
   const o = typeof t.params == "function" ? t.params() : n(t.params) ? t.params : {}, r = typeof t.token == "function" ? t.token() : n(t.token) ? t.token : "", a = new URL(
     t.url.indexOf("http") > -1 ? t.url : window.location.origin + t.url
-  ), l = g(c.URL_PARAM_PREFIX + t.name);
+  ), l = _(s.URL_PARAM_PREFIX + t.name);
   if (!e && l) {
-    const s = b(l, t.url, !0);
-    if (s) {
-      const d = new URL(s, t.url);
+    const c = S(l, t.url, !0);
+    if (c) {
+      const d = new URL(c, t.url);
       d.searchParams.forEach((A, v) => {
         a.searchParams.set(v, A);
       }), a.hash = d.hash;
     }
-    f(t.name);
+    g(t.name);
   }
-  if (a.searchParams.set(c.IS_MICRO, !0 + ""), a.searchParams.set(c.MICRO_NAME, t.name), r && a.searchParams.set(c.MICRO_TOKEN, r), o)
-    for (let s of Object.keys(o))
-      a.searchParams.set(s, o[s]);
-  return f(t.name), a.href;
+  if (a.searchParams.set(s.IS_MICRO, !0 + ""), a.searchParams.set(s.MICRO_NAME, t.name), r && a.searchParams.set(s.MICRO_TOKEN, r), o)
+    for (let c of Object.keys(o))
+      a.searchParams.set(c, o[c]);
+  return g(t.name), a.href;
 }, q = () => {
   const t = document.createElement("div");
   return t.innerHTML = "应用加载中...", t.style.textAlign = "center", t.style.lineHeight = "100px", t.style.fontSize = "20px", t.style.color = "#999", t.style.position = "absolute", t.style.top = "0", t.style.left = "0", t.style.right = "0", t.style.bottom = "0", t.style.zIndex = "999", t.style.background = "transparent", t.style["mix-blend-mode"] = "difference", t;
@@ -308,7 +308,7 @@ class J {
     i.debug("app onLoad", this.app.name), this.loadingTimer && clearTimeout(this.loadingTimer), this.loading && z(this.loading), Z(this), i.log("this.app.onLoad", this.app.onLoad), this.app.onLoad && this.app.onLoad(e, this);
   }
   onUnload(e) {
-    i.debug("app onUnload", this.app.name), f(this.app.name), this.app.onUnload && this.app.onUnload(e, this);
+    i.debug("app onUnload", this.app.name), g(this.app.name), this.app.onUnload && this.app.onUnload(e, this);
   }
   onError(e) {
     i.error("app onError", this.app.name), this.app.onError && this.app.onError(e, this);
@@ -330,13 +330,13 @@ const Z = (t) => {
     "*"
   );
 }, ee = () => {
-  window[c.MICRO_TYPE] = "parent", window.addEventListener("message", (t) => {
+  window[s.MICRO_TYPE] = "parent", window.addEventListener("message", (t) => {
     if (t.data.cmd === "$xt/micro/sync") {
       i.log("父页面接受子应用同步路由信息", t.data);
       const e = [
-        c.IS_MICRO,
-        c.MICRO_NAME,
-        c.MICRO_TOKEN
+        s.IS_MICRO,
+        s.MICRO_NAME,
+        s.MICRO_TOKEN
       ], n = new URL(
         window.decodeURIComponent(t.data.data.url),
         t.origin
@@ -344,11 +344,11 @@ const Z = (t) => {
       for (let l of e)
         n.searchParams.delete(l);
       i.log("tempUrl", n);
-      const o = f(t.data.data.name), r = new URL(o);
-      r.searchParams.forEach((l, s) => {
-        s.startsWith(c.URL_PARAM_PREFIX) && r.searchParams.delete(s);
+      const o = g(t.data.data.name), r = new URL(o);
+      r.searchParams.forEach((l, c) => {
+        c.startsWith(s.URL_PARAM_PREFIX) && r.searchParams.delete(c);
       }), i.log("mainURL.href", r.href);
-      const a = S(
+      const a = U(
         r.href,
         t.data.data.name,
         n.href
@@ -373,7 +373,7 @@ const Z = (t) => {
               port: window.location.port,
               protocol: window.location.protocol
             },
-            mainMicroVersion: _,
+            mainMicroVersion: f,
             name: e.name,
             url: e.url,
             params: e.params,
@@ -386,56 +386,59 @@ const Z = (t) => {
     }
   });
 }, me = (...e) => w(void 0, [...e], function* (t = {}) {
-  window[c.MICRO_TYPE] = "child";
-  const n = g(c.IS_MICRO), o = g(c.MICRO_NAME);
-  if (i.debug("child microInit", n, o), n && (window[c.IS_MICRO] = n === "true"), o && U(o).then((r) => {
-    window[c.MICRO_APP] = m({
-      microVersion: _
+  window[s.MICRO_TYPE] = "child";
+  const n = _(s.IS_MICRO), o = _(s.MICRO_NAME);
+  if (i.debug("child microInit", n, o), n && (window[s.IS_MICRO] = n === "true"), o && E(o).then((r) => {
+    window[s.MICRO_APP] = m({
+      microVersion: f
     }, r);
-  }), window[c.IS_MICRO]) {
+  }), window[s.IS_MICRO]) {
     let r = function(l) {
-      var s = document.styleSheets[0];
-      if (!s) {
+      var c = document.styleSheets[0];
+      if (!c) {
         var d = document.createElement("style");
-        document.head.appendChild(d), s = d.sheet;
+        document.head.appendChild(d), c = d.sheet;
       }
-      s.insertRule(l, s.cssRules.length);
+      c.insertRule(l, c.cssRules.length);
     };
-    window[c.IS_MICRO] && t.hideHeaderCssSelector && (Array.isArray(t.hideHeaderCssSelector) ? t.hideHeaderCssSelector.forEach((l) => {
+    window[s.IS_MICRO] && t.hideHeaderCssSelector && (Array.isArray(t.hideHeaderCssSelector) ? t.hideHeaderCssSelector.forEach((l) => {
       r(`${l} { display: none !important; }`);
     }) : r(
       `${t.hideHeaderCssSelector} { display: none !important; }`
     )), yield te(o, window), window.addEventListener("message", (l) => w(void 0, null, function* () {
       l.data.cmd === `$xt/micro/${o}` && T(o);
     }));
-    const a = g(c.MICRO_TOKEN);
+    const a = _(s.MICRO_TOKEN);
     t.authHandler && a && (yield t.authHandler(a));
   } else
     i.warn("当前环境非微应用环境");
 });
 function te(t, e) {
   const n = e.history, o = n.pushState, r = n.replaceState;
-  n.pushState = function(a, l, s) {
+  n.pushState = function(a, l, c) {
     const d = R(m(m({}, n.state || {}), a), {
       // 添加新数据
       _patchedByParent: !0
       // 可选：标记这是被父窗口修改的状态
     });
-    o.call(n, d, l, s), T(t);
-  }, n.replaceState = function(a, l, s) {
+    o.call(n, d, l, c), T(t);
+  }, n.replaceState = function(a, l, c) {
     const d = R(m(m({}, n.state || {}), a), {
       // 添加新数据
       _patchedByParent: !0
       // 可选：标记这是被父窗口修改的状态
     });
-    r.call(n, d, l, s);
+    r.call(n, d, l, c);
   };
 }
 function T(t) {
   return w(this, null, function* () {
-    if (i.log("syncUrlToWindow", t, window[c.MICRO_APP]), !window[c.MICRO_APP])
-      return;
-    const { name: e, sync: n, mainLocation: o } = window[c.MICRO_APP], r = window.location.pathname + window.location.search + window.location.hash;
+    i.log("syncUrlToWindow", t, window[s.MICRO_APP]), window[s.MICRO_APP] || (yield E(t).then((a) => {
+      window[s.MICRO_APP] = m({
+        microVersion: f
+      }, a);
+    }));
+    const { name: e, sync: n, mainLocation: o } = window[s.MICRO_APP], r = window.location.pathname + window.location.search + window.location.hash;
     i.log("curUrl", r), window.parent.postMessage(
       {
         cmd: "$xt/micro/sync",
@@ -471,19 +474,19 @@ const ne = {
 }, ue = (t, e = !1) => {
   let n = I(t);
   n && n.instance.reload(e);
-}, f = (t) => {
+}, g = (t) => {
   i.log(
     "clearParentUrl",
     t,
-    c.URL_PARAM_PREFIX + t
+    s.URL_PARAM_PREFIX + t
   );
   const e = window.location.href.split("#");
   i.log("url", e);
   let n = new URL(e[0]);
-  n.searchParams.delete(c.URL_PARAM_PREFIX + t);
+  n.searchParams.delete(s.URL_PARAM_PREFIX + t);
   const o = e.length > 1 ? n.href + "#" + e[1] : n.href;
   return window.history.replaceState({}, "", o), o;
-}, ie = () => window[c.IS_MICRO] === !0, pe = () => window[c.MICRO_TYPE] === "parent", fe = (t, e = ((n) => (n = window.__XT_MICRO_APP) == null ? void 0 : n.name)()) => {
+}, ie = () => window[s.IS_MICRO] === !0, pe = () => window[s.MICRO_TYPE] === "parent", fe = (t, e = ((n) => (n = window.__XT_MICRO_APP) == null ? void 0 : n.name)()) => {
   let o = window.location;
   if (ie())
     o = window.__XT_MICRO_APP.mainLocation;
@@ -498,11 +501,11 @@ const ne = {
     appId: String
   },
   setup(t) {
-    const e = t, n = C(), o = () => {
+    const e = t, n = b(), o = () => {
       e.appId && re(e.appId, {
         el: n.value,
         onUnload(r, a) {
-          i.log("on unload", a.app.name), f(a.app.name);
+          i.log("on unload", a.app.name);
         }
       }).then((r) => {
         i.debug("app mounted", e.appId);
@@ -512,15 +515,15 @@ const ne = {
       r !== a && a && ae(a), o();
     }), K(() => {
       o();
-    }), N(() => {
-      i.debug("「micro」", "app unmount", e.appId), f(e.appId);
-    }), (r, a) => (Y(), B("div", V({
+    }), Y(() => {
+      i.debug("「micro」", "app unmount", e.appId), g(e.appId);
+    }), (r, a) => (N(), V("div", B({
       ref_key: "refPanel",
       ref: n
     }, r.$attrs, { class: "xt-micro" }), null, 16));
   }
 });
-window[c.MICRO_VERSION] = _;
+window[s.MICRO_VERSION] = f;
 window.micro_api = {
   debug: i.setEnable
 };
@@ -531,7 +534,7 @@ const we = {
 };
 export {
   se as XTMicroView,
-  f as clearParentUrl,
+  g as clearParentUrl,
   fe as createAppUrl,
   we as default,
   I as getApp,

package/package.json

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