x-essential-lib 0.10.24 → 0.10.26

package/dist/index.d.ts

@@ -272,7 +272,6 @@ declare const routeTransName: import("vue").Ref<string, string>;
 declare function onBeforeEach(to: RouteLocationNormalized, from: RouteLocationNormalized, lastAppPath: string): Promise<{
   path: string;
 } | undefined>;
-declare function switchOrg(orgId: string | undefined): Promise<boolean>;
 //#endregion
 //#region src/utils/type.d.ts
 declare const types: readonly ["string", "number", "boolean", "array", "object", "any"];
@@ -313,6 +312,11 @@ declare function usePermission(): {
   verifyPermission: (permission: Permission, instance?: string) => boolean;
 };
 //#endregion
+//#region src/composables/routeChange.d.ts
+declare function useRouteChange(routeChange: () => Promise<void>): {
+  syncOrg: () => Promise<boolean>;
+};
+//#endregion
 //#region src/composables/system.d.ts
 declare function useSystem(): {
   sysBarAvail: import("vue").ComputedRef<boolean>;
@@ -553,4 +557,4 @@ declare const _default: {
   install: (app: import("vue").App) => void;
 };
 //#endregion
-export { GlobalStates, Permission, PermissionObjects, RouteMeta, Type, addView, appAppear, clearViews, closeWaitDlg, createAxios, _default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectDark, injectLocale, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, switchOrg, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };
+export { GlobalStates, Permission, PermissionObjects, RouteMeta, Type, addView, appAppear, clearViews, closeWaitDlg, createAxios, _default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectDark, injectLocale, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePermission, useRouteChange, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };

package/dist/index.js

@@ -431,25 +431,6 @@ function injectViews() {
 	return inject("viewsKey");
 }
 
-//#endregion
-//#region src/api/orgbase/instance.ts
-const instance = createAxios$1({
-	baseUrl: "http://localhost/orgbase/",
-	onError: (error) => {
-		messageError$1(getErrorMessage(error));
-	}
-});
-if (window.API_URL) instance.defaults.baseURL = window.API_URL + "/orgbase/";
-
-//#endregion
-//#region src/api/orgbase/index.ts
-function GetOrgName(request) {
-	return instance.post("getOrgName", request);
-}
-function PullPermission(request) {
-	return instance.post("pullPermission", request);
-}
-
 //#endregion
 //#region src/utils/router.ts
 const routeMetas = [
@@ -630,31 +611,6 @@ async function onBeforeEach(to, from, lastAppPath) {
 	if (hasAccessToken && to.path.startsWith("/passport/")) return { path: `/main/${Date.now()}` };
 	onBeforeChange(to.path, from.path, lastAppPath);
 }
-async function switchOrg(orgId) {
-	const router = useRouter();
-	if (!orgId) {
-		await router.replace({ path: `/main/${Date.now()}` });
-		return false;
-	}
-	if (orgId === "public") {
-		eventBus.emit("updateActiveOrg", [orgId, ""]);
-		eventBus.emit("updatePermission", [{}, ""]);
-		return true;
-	}
-	try {
-		const { name } = await GetOrgName({ orgId });
-		const { permissions } = await PullPermission({
-			orgId,
-			checksum: ""
-		});
-		eventBus.emit("updateActiveOrg", [orgId, name]);
-		eventBus.emit("updatePermission", [toPermissionObjects(permissions), permissions.checksum ?? ""]);
-		return true;
-	} catch (e) {
-		if (e === "org not found" || e === "org member not found") await router.replace({ path: `/main/${Date.now()}` });
-		return false;
-	}
-}
 
 //#endregion
 //#region src/utils/type.ts
@@ -838,6 +794,64 @@ function usePermission() {
 	return { verifyPermission: verifyPermission$1 };
 }
 
+//#endregion
+//#region src/api/orgbase/instance.ts
+const instance = createAxios$1({
+	baseUrl: "http://localhost/orgbase/",
+	onError: (error) => {
+		messageError$1(getErrorMessage(error));
+	}
+});
+if (window.API_URL) instance.defaults.baseURL = window.API_URL + "/orgbase/";
+
+//#endregion
+//#region src/api/orgbase/index.ts
+function GetOrgName(request) {
+	return instance.post("getOrgName", request);
+}
+function PullPermission(request) {
+	return instance.post("pullPermission", request);
+}
+
+//#endregion
+//#region src/composables/routeChange.ts
+function useRouteChange(routeChange) {
+	const route = useRoute();
+	const router = useRouter();
+	async function syncOrg() {
+		const orgId = route.query.orgId;
+		if (!orgId) {
+			await router.replace({ path: `/main/${Date.now()}` });
+			return false;
+		}
+		if (orgId === "public") {
+			eventBus.emit("updateActiveOrg", [orgId, ""]);
+			eventBus.emit("updatePermission", [{}, ""]);
+			return true;
+		}
+		try {
+			const { name } = await GetOrgName({ orgId });
+			const { permissions } = await PullPermission({
+				orgId,
+				checksum: ""
+			});
+			eventBus.emit("updateActiveOrg", [orgId, name]);
+			eventBus.emit("updatePermission", [toPermissionObjects(permissions), permissions.checksum ?? ""]);
+			return true;
+		} catch (e) {
+			if (e === "org not found" || e === "org member not found") await router.replace({ path: `/main/${Date.now()}` });
+			return false;
+		}
+	}
+	onBeforeMount(async () => {
+		await routeChange();
+	});
+	watch(() => route.path, async () => {
+		await routeChange();
+	});
+	return { syncOrg };
+}
+
 //#endregion
 //#region src/composables/system.ts
 function useSystem() {
@@ -1588,4 +1602,4 @@ async function loadLocaleMessageEssential(locale) {
 var src_default = { install };
 
 //#endregion
-export { Permission, addView, appAppear, clearViews, closeWaitDlg, createAxios, src_default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectDark, injectLocale, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, switchOrg, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };
+export { Permission, addView, appAppear, clearViews, closeWaitDlg, createAxios, src_default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectDark, injectLocale, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePermission, useRouteChange, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };

package/package.json

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