x-essential-lib 0.10.33 → 0.10.35

package/dist/index.d.ts

@@ -304,16 +304,16 @@ declare function useGlobalStates(globalStates: GlobalStates, base?: boolean): vo
 //#region src/composables/microApp.d.ts
 declare function useMicroApp(globalStates: GlobalStates, customBack?: (m: RouteMeta) => void): void;
 //#endregion
+//#region src/composables/pageRoute.d.ts
+declare function usePageRoute(onRouteChange?: () => Promise<void>): {
+  syncOrg: () => Promise<boolean>;
+};
+//#endregion
 //#region src/composables/permission.d.ts
 declare function usePermission(): {
   verifyPermission: (permission: Permission, instance?: string) => boolean;
 };
 //#endregion
-//#region src/composables/routeChange.d.ts
-declare function useRouteChange(onRouteChange?: () => Promise<void>): {
-  syncOrg: () => Promise<boolean>;
-};
-//#endregion
 //#region src/composables/system.d.ts
 declare function useSystem(): {
   sysBarAvail: import("vue").ComputedRef<boolean>;
@@ -554,4 +554,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, onBeforeEnter, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePermission, useRouteChange, 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, onBeforeEnter, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePageRoute, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };

package/dist/index.js

@@ -36,6 +36,53 @@ function useColor() {
 	};
 }
 
+//#endregion
+//#region src/utils/misc.ts
+const globalObjects = (function() {
+	if (!window.globalObjects) {
+		window.globalObjects = {
+			router: null,
+			i18n: null
+		};
+		console.log("globalObjects created");
+	}
+	return window.globalObjects;
+})();
+const eventBus = (function() {
+	if (!window.eventBus) {
+		window.eventBus = mitt_default();
+		console.log("eventBus created");
+	}
+	return window.eventBus;
+})();
+async function waitMs(ms) {
+	return new Promise((resolve) => {
+		setTimeout(resolve, ms);
+	});
+}
+async function waitUtil(conditionFunc, timeout, interval) {
+	const timestamp = Date.now();
+	return new Promise((resolve) => {
+		const check = () => {
+			if (conditionFunc()) resolve(true);
+			else if (timeout && Date.now() - timestamp > timeout) resolve(false);
+			else setTimeout(check, interval ?? 30);
+		};
+		check();
+	});
+}
+function appAppear(name, diff) {
+	const appElement = document.getElementById("single-spa-application:" + name);
+	if (!appElement) return;
+	appElement.classList.remove("app-fade", "app-left", "app-right", "app-reset");
+	if (diff === 0) return;
+	if (diff > 0) appElement.classList.add("app-left");
+	else appElement.classList.add("app-right");
+	setTimeout(() => {
+		appElement.classList.add("app-reset");
+	}, 50);
+}
+
 //#endregion
 //#region src/utils/axios.ts
 function createAxios(options) {
@@ -85,59 +132,12 @@ function onRespRejected(error, onError) {
 	}
 }
 function onUnauthorized() {
-	const router = useRouter();
+	const { router } = globalObjects;
 	api.remove("accessToken");
 	api.remove("refreshToken");
 	router.replace({ path: `/passport/login` });
 }
 
-//#endregion
-//#region src/utils/misc.ts
-const globalObjects = (function() {
-	if (!window.globalObjects) {
-		window.globalObjects = {
-			router: null,
-			i18n: null
-		};
-		console.log("globalObjects created");
-	}
-	return window.globalObjects;
-})();
-const eventBus = (function() {
-	if (!window.eventBus) {
-		window.eventBus = mitt_default();
-		console.log("eventBus created");
-	}
-	return window.eventBus;
-})();
-async function waitMs(ms) {
-	return new Promise((resolve) => {
-		setTimeout(resolve, ms);
-	});
-}
-async function waitUtil(conditionFunc, timeout, interval) {
-	const timestamp = Date.now();
-	return new Promise((resolve) => {
-		const check = () => {
-			if (conditionFunc()) resolve(true);
-			else if (timeout && Date.now() - timestamp > timeout) resolve(false);
-			else setTimeout(check, interval ?? 30);
-		};
-		check();
-	});
-}
-function appAppear(name, diff) {
-	const appElement = document.getElementById("single-spa-application:" + name);
-	if (!appElement) return;
-	appElement.classList.remove("app-fade", "app-left", "app-right", "app-reset");
-	if (diff === 0) return;
-	if (diff > 0) appElement.classList.add("app-left");
-	else appElement.classList.add("app-right");
-	setTimeout(() => {
-		appElement.classList.add("app-reset");
-	}, 50);
-}
-
 //#endregion
 //#region src/utils/dialog.ts
 let lastTime = Date.now();
@@ -773,16 +773,6 @@ function useMicroApp(globalStates, customBack) {
 	});
 }
 
-//#endregion
-//#region src/composables/permission.ts
-function usePermission() {
-	const permissionObjects = injectPermissionObjects();
-	function verifyPermission$1(permission, instance) {
-		return verifyPermission(permissionObjects.value, permission, instance ?? "");
-	}
-	return { verifyPermission: verifyPermission$1 };
-}
-
 //#endregion
 //#region src/api/orgbase/instance.ts
 const instance = createAxios$1({
@@ -803,8 +793,8 @@ function PullPermission(request) {
 }
 
 //#endregion
-//#region src/composables/routeChange.ts
-function useRouteChange(onRouteChange) {
+//#region src/composables/pageRoute.ts
+function usePageRoute(onRouteChange) {
 	const route = useRoute();
 	const router = useRouter();
 	async function syncOrg() {
@@ -843,6 +833,16 @@ function useRouteChange(onRouteChange) {
 	return { syncOrg };
 }
 
+//#endregion
+//#region src/composables/permission.ts
+function usePermission() {
+	const permissionObjects = injectPermissionObjects();
+	function verifyPermission$1(permission, instance) {
+		return verifyPermission(permissionObjects.value, permission, instance ?? "");
+	}
+	return { verifyPermission: verifyPermission$1 };
+}
+
 //#endregion
 //#region src/composables/system.ts
 function useSystem() {
@@ -1593,4 +1593,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, onBeforeEnter, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePermission, useRouteChange, 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, onBeforeEnter, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePageRoute, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };

package/package.json

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