x-essential-lib 0.10.9 → 0.10.12

package/dist/index.d.ts

@@ -301,7 +301,7 @@ declare function popView(views: Ref<string[]>): void;
 declare function clearViews(views: Ref<string[]>): void;
 //#endregion
 //#region src/composables/microApp.d.ts
-interface States {
+interface GlobalStates {
   dark: Ref<boolean | undefined>;
   locale: Ref<string>;
   activeOrg: Ref<string>;
@@ -310,7 +310,7 @@ interface States {
   lastAppPath: Ref<string>;
   views: Ref<string[]>;
 }
-declare function useMicroApp(states: States, customBack?: (m: RouteMeta) => void): void;
+declare function useMicroApp(globalStates: GlobalStates, syncLocale: () => Promise<void>, base?: boolean, customBack?: (m: RouteMeta) => void): void;
 //#endregion
 //#region src/composables/permission.d.ts
 declare function usePermission(): {

package/dist/index.js

@@ -4,9 +4,9 @@ import { Fragment, Transition, computed, createBlock, createCommentVNode, create
 import { useI18n } from "vue-i18n";
 import { useDisplay, useTheme } from "vuetify";
 import { useRoute, useRouter } from "vue-router";
-import axios from "axios";
 import { getErrorMessage } from "x-error-lib";
 import { createAxios as createAxios$1, messageError as messageError$1 } from "x-essential-lib";
+import axios from "axios";
 
 //#region src/composables/color.ts
 function useColor() {
@@ -36,6 +36,22 @@ function useColor() {
 	};
 }
 
+//#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 PullPermission(request) {
+	return instance.post("pullPermission", request);
+}
+
 //#endregion
 //#region src/utils/axios.ts
 function createAxios(options) {
@@ -442,22 +458,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 PullPermission(request) {
-	return instance.post("pullPermission", request);
-}
-
 //#endregion
 //#region src/utils/router.ts
 const routeMetas = [
@@ -731,10 +731,10 @@ function clearViews(views) {
 
 //#endregion
 //#region src/composables/microApp.ts
-function useMicroApp(states, customBack) {
+function useMicroApp(globalStates, syncLocale, base, customBack) {
 	const route = useRoute();
 	const router = useRouter();
-	const { dark, locale, activeOrg, permissionObjects, permissionChecksum, lastAppPath, views } = states;
+	const { dark, locale, activeOrg, permissionObjects, permissionChecksum, lastAppPath, views } = globalStates;
 	const prefDark = usePreferredDark();
 	const finalDark = ref(false);
 	watchEffect(() => {
@@ -743,6 +743,20 @@ function useMicroApp(states, customBack) {
 		else d = prefDark.value;
 		finalDark.value = d;
 	});
+	const theme = useTheme();
+	watchEffect(async () => {
+		await theme.change(finalDark.value ? "dark" : "light");
+	});
+	let pending = true;
+	router.beforeEach(async (to, from) => {
+		await syncLocale();
+		pending = false;
+		return onBeforeEach(to, from, lastAppPath.value);
+	});
+	watch(locale, async () => {
+		if (pending) return;
+		await syncLocale();
+	});
 	provideDark(finalDark);
 	provideLocale(locale);
 	provideActiveOrg(activeOrg);
@@ -750,10 +764,58 @@ function useMicroApp(states, customBack) {
 	providePermissionChecksum(permissionChecksum);
 	provideLastAppPath(lastAppPath);
 	provideViews(views);
-	const theme = useTheme();
-	watchEffect(async () => {
-		await theme.change(finalDark.value ? "dark" : "light");
-	});
+	function extractPathFromUrl(url) {
+		return new URL(url).pathname;
+	}
+	function onBeforeAppChange(e) {
+		const lastAppPath = extractPathFromUrl(e.detail.oldUrl);
+		eventBus.emit("updateLastAppPath", lastAppPath);
+	}
+	if (base) {
+		onMounted(() => {
+			window.addEventListener("single-spa:before-app-change", onBeforeAppChange);
+		});
+		onBeforeUnmount(() => {
+			window.removeEventListener("single-spa:before-app-change", onBeforeAppChange);
+		});
+	}
+	function syncStatusBar() {
+		if (typeof StatusBar !== "object") return;
+		if (finalDark.value) StatusBar.styleLightContent();
+		else StatusBar.styleDefault();
+	}
+	const running = ref(true);
+	function onPause() {
+		running.value = false;
+	}
+	function onResume() {
+		running.value = true;
+	}
+	async function onBackButton() {
+		await handleBack();
+	}
+	function onDeviceReady() {
+		console.log("onDeviceReady");
+		document.addEventListener("pause", onPause, false);
+		document.addEventListener("resume", onResume, false);
+		document.addEventListener("backbutton", onBackButton, false);
+		setInterval(() => {
+			syncStatusBar();
+		}, 1e3);
+		navigator.splashscreen.hide();
+	}
+	if (base) {
+		onMounted(() => {
+			document.addEventListener("deviceready", onDeviceReady, false);
+		});
+		onBeforeUnmount(() => {
+			document.removeEventListener("deviceready", onDeviceReady, false);
+		});
+		watch(finalDark, (val) => {
+			window.dispatchEvent(new CustomEvent("darkChange", { detail: val }));
+			syncStatusBar();
+		}, { immediate: true });
+	}
 	async function handleBack() {
 		if (!isEmpty(views)) {
 			if (!hasView(views, "waitDlg")) popView(views);
@@ -771,17 +833,48 @@ function useMicroApp(states, customBack) {
 			return;
 		}
 	}
-	async function onBackButton() {
-		await handleBack();
+	if (base) {
+		onMounted(() => {
+			window.addEventListener("keydown", onKeyDown);
+		});
+		onBeforeUnmount(() => {
+			window.removeEventListener("keydown", onKeyDown);
+		});
+	}
+	let handle;
+	async function syncPermission() {
+		if (!running.value) return;
+		if (!api.get("accessToken")) return;
+		try {
+			const { update, permissions } = await PullPermission({
+				orgId: activeOrg.value,
+				checksum: permissionChecksum.value
+			});
+			if (!update) return;
+			eventBus.emit("updatePermission", [toPermissionObjects(permissions), permissions["checksum"] ?? ""]);
+		} catch (e) {
+			console.error(e);
+		}
+	}
+	async function startTimer() {
+		window.clearTimeout(handle);
+		handle = window.setTimeout(async () => {
+			await syncPermission();
+			if (handle) await startTimer();
+		}, 3e3);
+	}
+	function stopTimer() {
+		window.clearTimeout(handle);
+		handle = void 0;
+	}
+	if (base) {
+		onMounted(async () => {
+			await startTimer();
+		});
+		onBeforeUnmount(() => {
+			stopTimer();
+		});
 	}
-	onMounted(() => {
-		window.addEventListener("keydown", onKeyDown);
-		eventBus.on("backbutton", onBackButton);
-	});
-	onBeforeUnmount(() => {
-		window.removeEventListener("keydown", onKeyDown);
-		eventBus.off("backbutton", onBackButton);
-	});
 	function onUpdateDark(val) {
 		dark.value = val;
 	}
@@ -792,20 +885,27 @@ function useMicroApp(states, customBack) {
 		activeOrg.value = val;
 	}
 	function onUpdatePermission(val) {
-		const v = val;
-		permissionObjects.value = v[0];
-		permissionChecksum.value = v[1];
+		permissionObjects.value = val[0];
+		permissionChecksum.value = val[1];
 	}
 	function onUpdateLastAppPath(val) {
 		lastAppPath.value = val;
 	}
+	function onSyncGlobalStates() {
+		eventBus.emit("updateDark", dark.value);
+		eventBus.emit("updateLocale", locale.value);
+		eventBus.emit("updateActiveOrg", activeOrg.value);
+		eventBus.emit("updatePermission", [permissionObjects.value, permissionChecksum.value]);
+		eventBus.emit("updateLastAppPath", lastAppPath.value);
+	}
 	onBeforeMount(() => {
 		eventBus.on("updateDark", onUpdateDark);
 		eventBus.on("updateLocale", onUpdateLocale);
 		eventBus.on("updateActiveOrg", onUpdateActiveOrg);
 		eventBus.on("updatePermission", onUpdatePermission);
 		eventBus.on("updateLastAppPath", onUpdateLastAppPath);
-		eventBus.emit("syncGlobalState");
+		if (base) eventBus.on("syncGlobalStates", onSyncGlobalStates);
+		else eventBus.emit("syncGlobalStates");
 	});
 	onBeforeUnmount(() => {
 		eventBus.off("updateDark", onUpdateDark);
@@ -813,6 +913,7 @@ function useMicroApp(states, customBack) {
 		eventBus.off("updateActiveOrg", onUpdateActiveOrg);
 		eventBus.off("updatePermission", onUpdatePermission);
 		eventBus.off("updateLastAppPath", onUpdateLastAppPath);
+		if (base) eventBus.off("syncGlobalStates", onSyncGlobalStates);
 	});
 }
 

package/package.json

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