@xingtukeji/micro 1.1.25 → 1.1.27

package/dist/index.js

@@ -17,7 +17,7 @@ const CONSTANT = {
 	DOM_ID_PREFIX: "xt-micro-ifr-",
 	URL_PARAM_PREFIX: "__XT_MICRO_",
 	MICRO_VERSION: "__XT_MICRO_VERSION"
-}, version = "1.1.24";
+}, version = "1.1.27";
 var utils_exports = /* @__PURE__ */ __export({
 	ConsoleUtil: () => ConsoleUtil,
 	addOrReplaceUrlParam: () => addOrReplaceUrlParam,
@@ -63,7 +63,7 @@ function addOrReplaceUrlParam(g, B, V) {
 }
 const ipcSyncAppInfo = async (g) => new Promise((B) => {
 	window.addEventListener("message", (V) => {
-		ConsoleUtil.trace("child ipcSyncAppInfo receive message", V.data), V.data.cmd === "$xt/micro/info" && (V.data.data.mainMicroVersion !== "1.1.24" && ConsoleUtil.warn(`子应用版本与主应用版本不一致，${g}子应用版本：${version}，主应用版本：${V.data.data.mainMicroVersion}`), B(V.data.data));
+		ConsoleUtil.trace("child ipcSyncAppInfo receive message", V.data), V.data.cmd === "$xt/micro/info" && (V.data.data.mainMicroVersion !== "1.1.27" && ConsoleUtil.warn(`子应用版本与主应用版本不一致，${g}子应用版本：${version}，主应用版本：${V.data.data.mainMicroVersion}`), B(V.data.data));
 	}), ConsoleUtil.trace("child ipcSyncAppInfo send message", g), window.parent.postMessage({
 		cmd: "$xt/micro/info",
 		data: g
@@ -149,9 +149,10 @@ var generateId = (g) => `${CONSTANT.DOM_ID_PREFIX}${g}`, generateURL = (g, B = !
 	}
 	let H = typeof g.params == "function" ? g.params() : V(g.params) ? g.params : {}, U = typeof g.token == "function" ? g.token() : V(g.token) ? g.token : "", W = new URL(g.url.indexOf("http") > -1 ? g.url : window.location.origin + g.url), G = getQueryParameter(CONSTANT.URL_PARAM_PREFIX + g.name);
 	if (!B && G) {
-		let B = getAbsolutePath(G, g.url, !0);
+		let B = getAbsolutePath(G, W.origin, !0);
 		if (B) {
-			let V = new URL(B, g.url);
+			ConsoleUtil.log("获取绝对路径", B, g), console.log("123123123================>");
+			let V = new URL(B, W.origin);
 			V.searchParams.forEach((g, B) => {
 				W.searchParams.set(B, g);
 			}), W.hash = V.hash;
@@ -189,7 +190,7 @@ var generateId = (g) => `${CONSTANT.DOM_ID_PREFIX}${g}`, generateURL = (g, B = !
 	loading;
 	loadingTimer;
 	constructor(g) {
-		return this.app = g, this.dom = void 0, this.panel = void 0, g.preload && this.preload(), this;
+		return this.app = g, this.dom = void 0, this.panel = void 0, this;
 	}
 	mount(g, B = !1) {
 		let V;
@@ -293,8 +294,8 @@ const mainMicroInit = () => {
 	});
 }, microInit = async (g = {}) => {
 	window[CONSTANT.MICRO_TYPE] = "child";
-	let B = getQueryParameter(CONSTANT.IS_MICRO), V = getQueryParameter(CONSTANT.MICRO_NAME);
-	if (ConsoleUtil.trace("child microInit", B, V), B && (window[CONSTANT.IS_MICRO] = B === "true", V && await syncAppInfo(V)), window[CONSTANT.IS_MICRO]) {
+	let B = getQueryParameter(CONSTANT.IS_MICRO), V = getQueryParameter(CONSTANT.MICRO_NAME), H = getQueryParameter(CONSTANT.MICRO_TOKEN);
+	if (g.authHandler && await g.authHandler(H), ConsoleUtil.trace("child microInit", B, V), B && (window[CONSTANT.IS_MICRO] = B === "true", V && await syncAppInfo(V)), window[CONSTANT.IS_MICRO]) {
 		function B(g) {
 			var B = document.styleSheets[0];
 			if (!B) {
@@ -308,8 +309,6 @@ const mainMicroInit = () => {
 		}) : B(`${g.hideHeaderCssSelector} { display: none !important; }`)), await patchIframeHistory(V, window), window.addEventListener("message", async (g) => {
 			g.data.cmd === `$xt/micro/${V}` && syncUrlToWindow(V);
 		});
-		let H = getQueryParameter(CONSTANT.MICRO_TOKEN);
-		g.authHandler && H && await g.authHandler(H);
 	} else ConsoleUtil.warn("当前环境非微应用环境");
 };
 function patchIframeHistory(g, B) {
@@ -337,7 +336,7 @@ var syncAppInfo = async (g) => await ipcSyncAppInfo(g).then((g) => {
 	};
 });
 async function syncUrlToWindow(g) {
-	ConsoleUtil.trace("syncUrlToWindow", g, window[CONSTANT.MICRO_APP]), window[CONSTANT.MICRO_APP] || syncAppInfo(g);
+	console.log("syncUrlToWindow", g, window[CONSTANT.MICRO_APP], window.location.href.match(/__XT_MICRO_([^=]+)=/), getQueryParameter(CONSTANT.MICRO_NAME)), ConsoleUtil.trace("syncUrlToWindow", g, window[CONSTANT.MICRO_APP]), window[CONSTANT.MICRO_APP] || await syncAppInfo(g);
 	let { name: B, sync: V, mainLocation: H } = window[CONSTANT.MICRO_APP], U = window.location.pathname + window.location.search + window.location.hash;
 	ConsoleUtil.trace("curUrl", U), ConsoleUtil.trace("child", "「$xt/micro/sync」", "send", B, U), window.parent.postMessage({
 		cmd: "$xt/micro/sync",

package/package.json

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