x-essential-lib 0.10.15 → 0.10.17

package/dist/index.js

@@ -623,10 +623,7 @@ function onBeforeChange(toPath, fromPath, lastAppPath) {
 	if (fromPath === "/") fromPath = lastAppPath;
 	const toRouteMeta = matchRouteMeta(toPath);
 	const fromRouteMeta = matchRouteMeta(fromPath);
-	if (!toRouteMeta) {
-		console.assert(false);
-		return;
-	}
+	if (!toRouteMeta) return;
 	console.info(`~~~~routeChange~~~~ ${fromPath} -> ${toPath}`);
 	if (!fromRouteMeta) return;
 	const sameApp = toRouteMeta.app === fromRouteMeta.app;
@@ -662,30 +659,27 @@ async function onBeforeEach(to, from, lastAppPath) {
 	const toRouteMeta = matchRouteMeta(to.path);
 	if (!toRouteMeta) return;
 	if (toRouteMeta.requireAuth && !hasAccessToken) return { path: `/passport/login` };
-	if (hasAccessToken && to.path.startsWith("/passport/")) return { path: `/main` };
-	const orgId = to.query.orgId;
+	if (hasAccessToken && to.path.startsWith("/passport/")) return {
+		path: `/main/${Date.now()}`,
+		query: { orgId: "public" }
+	};
 	if (to.path.startsWith("/passport/")) onBeforeChange(to.path, from.path, lastAppPath);
-	else if (to.path.startsWith("/main")) try {
+	else {
+		const orgId = to.query.orgId;
 		if (!orgId) return {
 			path: `/main/${Date.now()}`,
 			query: { orgId: "public" }
 		};
-		await syncOrg(orgId);
-		await syncPermission(orgId);
-		onBeforeChange(to.path, from.path, lastAppPath);
-	} catch {
-		return {
-			path: `/main/${Date.now()}`,
-			query: { orgId: "public" }
-		};
-	}
-	else try {
-		if (!orgId) throw new Error(`orgId not specified`);
-		await syncOrg(orgId);
-		await syncPermission(orgId);
-		onBeforeChange(to.path, from.path, lastAppPath);
-	} catch {
-		return { path: `/main` };
+		try {
+			await syncOrg(orgId);
+			await syncPermission(orgId);
+			onBeforeChange(to.path, from.path, lastAppPath);
+		} catch {
+			return {
+				path: `/main/${Date.now()}`,
+				query: { orgId: "public" }
+			};
+		}
 	}
 }
 
@@ -828,34 +822,6 @@ function useMicroApp(globalStates, base, customBack) {
 			syncStatusBar();
 		}, { immediate: true });
 	}
-	async function handleBack() {
-		if (!isEmpty(views)) {
-			if (!hasView(views, "waitDlg")) popView(views);
-			return;
-		}
-		const routeMeta = matchRouteMeta(route.path);
-		if (!routeMeta) return;
-		if (routeMeta.level === 0) navigator?.Backbutton?.goHome(() => {}, () => {});
-		else if (customBack) customBack(routeMeta);
-		else if (routeMeta.back) await router.replace({
-			path: routeMeta.back,
-			query: { orgId: activeOrg.value }
-		});
-	}
-	async function onKeyDown(e) {
-		if (e.key === "Escape") {
-			await handleBack();
-			return;
-		}
-	}
-	if (base) {
-		onMounted(() => {
-			window.addEventListener("keydown", onKeyDown);
-		});
-		onBeforeUnmount(() => {
-			window.removeEventListener("keydown", onKeyDown);
-		});
-	}
 	let handle;
 	async function syncPermission() {
 		if (!running.value) return;
@@ -890,6 +856,34 @@ function useMicroApp(globalStates, base, customBack) {
 			stopTimer();
 		});
 	}
+	async function handleBack() {
+		if (!isEmpty(views)) {
+			if (!hasView(views, "waitDlg")) popView(views);
+			return;
+		}
+		const routeMeta = matchRouteMeta(route.path);
+		if (!routeMeta) return;
+		if (routeMeta.level === 0) navigator?.Backbutton?.goHome(() => {}, () => {});
+		else if (customBack) customBack(routeMeta);
+		else if (routeMeta.back) await router.replace({
+			path: routeMeta.back,
+			query: { orgId: activeOrg.value }
+		});
+	}
+	async function onKeyDown(e) {
+		if (e.key === "Escape") {
+			await handleBack();
+			return;
+		}
+	}
+	if (!base) {
+		onMounted(() => {
+			window.addEventListener("keydown", onKeyDown);
+		});
+		onBeforeUnmount(() => {
+			window.removeEventListener("keydown", onKeyDown);
+		});
+	}
 	function onUpdateDark(val) {
 		dark.value = val;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x-essential-lib",
-  "version": "0.10.15",
+  "version": "0.10.17",
   "files": [
     "dist"
   ],