x-essential-lib 0.9.26 → 0.9.28

package/dist/index.js

@@ -334,37 +334,42 @@ function isHasAccessToken() {
 function isHasActiveOrg() {
 	return !!api.get("activeOrg");
 }
-function onBeforeEach(e, T, E, D) {
-	let O = isHasAccessToken(), k = isHasActiveOrg(), A = matchRouteMeta(e.path);
-	if (!A) {
-		console.assert(!1), E();
+function onBeforeEach(e, T, E) {
+	let D = isHasAccessToken(), O = isHasActiveOrg(), k = matchRouteMeta(e.path);
+	if (!k) throw Error("to route meta invalid");
+	if (k.requiredState === "auth") if (D) if (O) {
+		let e = "/main";
+		return onBeforeChange(e, T.path, E), { path: e };
+	} else {
+		onBeforeChange(e.path, T.path, E);
 		return;
 	}
-	if (A.requiredState === "auth") if (O) if (k) {
-		let e = "/main";
-		onBeforeChange(e, T.path, D), E({ path: e });
-	} else onBeforeChange(e.path, T.path, D), E();
 	else {
 		let e = "/passport/login";
-		onBeforeChange(e, T.path, D), E({ path: e });
+		return onBeforeChange(e, T.path, E), { path: e };
 	}
-	else if (A.requiredState === "org") if (O) if (k) onBeforeChange(e.path, T.path, D), E();
-	else {
+	else if (k.requiredState === "org") if (D) if (O) {
+		onBeforeChange(e.path, T.path, E);
+		return;
+	} else {
 		let e = "/org/joinOrCreate";
-		onBeforeChange(e, T.path, D), E({ path: e });
+		return onBeforeChange(e, T.path, E), { path: e };
 	}
 	else {
 		let e = "/passport/login";
-		onBeforeChange(e, T.path, D), E({ path: e });
+		return onBeforeChange(e, T.path, E), { path: e };
 	}
-	else if (O) if (k) {
+	else if (D) if (O) {
 		let e = "/main";
-		onBeforeChange(e, T.path, D), E({ path: e });
+		return onBeforeChange(e, T.path, E), { path: e };
 	} else {
 		let e = "/org/joinOrCreate";
-		onBeforeChange(e, T.path, D), E({ path: e });
+		return onBeforeChange(e, T.path, E), { path: e };
+	}
+	else {
+		onBeforeChange(e.path, T.path, E);
+		return;
 	}
-	else onBeforeChange(e.path, T.path, D), E();
 }
 const types = [
 	"string",
@@ -420,7 +425,7 @@ function clearViews(e) {
 function useMicroApp(T, E, D, O, k, A) {
 	let j = useRoute(), M = useRouter(), N = usePreferredDark(), P = ref(!1);
 	watchEffect(() => {
-		let e = !1;
+		let e;
 		e = typeof T.value == "boolean" ? T.value : N.value, P.value = e;
 	}), provideDark(P), provideLocale(E), providePermissionObjects(D), providePermissionChecksum(O), provideLastAppPath(k), provideViews(A);
 	let F = useTheme();
@@ -479,10 +484,10 @@ function useSystem() {
 	return {
 		sysBarAvail: E,
 		compactWidth: computed(() => O.width.value <= 1280 ? O.width.value + "px" : O.width.value <= 1920 ? "768px" : "1024px"),
-		isCurvedScreen: computed(() => O.xs.value),
+		isCurvedScreen: computed(() => !1),
 		isMobile: () => /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),
 		nameList: (E, D) => {
-			let O = "", k = E.map((e) => T(e));
+			let O, k = E.map((e) => T(e));
 			return O = D ? `${k.join("/")} <${D.join("/")}>` : e.value === "en" ? k.join(" ") : k.join(""), O;
 		},
 		sentenceOfAsk: (E, O, k) => e.value === "en" ? T("dlg.common.ask", {
@@ -842,7 +847,7 @@ var confirmDlg_default = /* @__PURE__ */ defineComponent({
 			}, 8, ["modelValue"]);
 		};
 	}
-}), _hoisted_1 = { class: "ma-auto" }, _hoisted_2 = { class: "w-100 h-100 d-flex align-center justify-center" }, _hoisted_3 = { class: "text-body-1" }, waitDlg_default = /* @__PURE__ */ defineComponent({
+}), _hoisted_1 = { class: "ma-auto" }, _hoisted_2 = { class: "w-100 h-100 d-flex align-center justify-center" }, _hoisted_3 = { class: "text-body-large" }, waitDlg_default = /* @__PURE__ */ defineComponent({
 	__name: "index",
 	setup(e) {
 		let { t: T } = useI18n(), E = ref(""), D = (e) => {

package/dist/utils/router.d.ts

@@ -1,4 +1,4 @@
-import { RouteLocationNormalized, NavigationGuardNext } from 'vue-router';
+import { RouteLocationNormalized } from 'vue-router';
 interface RouteMeta {
     app: 'x-app-mf' | 'x-compute-mf' | 'x-data-mf' | 'x-main-mf' | 'x-mine-mf' | 'x-org-mf' | 'x-passport-mf' | 'x-resource-mf';
     path: string;
@@ -8,5 +8,7 @@ interface RouteMeta {
 }
 export declare function matchRouteMeta(path: string): RouteMeta | undefined;
 export declare const routeTransName: import("vue").Ref<string, string>;
-export declare function onBeforeEach(to: RouteLocationNormalized, from: RouteLocationNormalized, next: NavigationGuardNext, lastAppPath: string): void;
+export declare function onBeforeEach(to: RouteLocationNormalized, from: RouteLocationNormalized, lastAppPath: string): {
+    path: string;
+} | undefined;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "x-essential-lib",
   "private": false,
-  "version": "0.9.26",
+  "version": "0.9.28",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",