x-essential-lib 0.10.9 → 0.10.10

package/dist/index.d.ts

@@ -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(states: States, syncLocale: () => Promise<void>, customBack?: (m: RouteMeta) => void): void;
 //#endregion
 //#region src/composables/permission.d.ts
 declare function usePermission(): {

package/dist/index.js

@@ -731,7 +731,7 @@ function clearViews(views) {
 
 //#endregion
 //#region src/composables/microApp.ts
-function useMicroApp(states, customBack) {
+function useMicroApp(states, syncLocale, customBack) {
 	const route = useRoute();
 	const router = useRouter();
 	const { dark, locale, activeOrg, permissionObjects, permissionChecksum, lastAppPath, views } = states;
@@ -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,6 @@ function useMicroApp(states, customBack) {
 	providePermissionChecksum(permissionChecksum);
 	provideLastAppPath(lastAppPath);
 	provideViews(views);
-	const theme = useTheme();
-	watchEffect(async () => {
-		await theme.change(finalDark.value ? "dark" : "light");
-	});
 	async function handleBack() {
 		if (!isEmpty(views)) {
 			if (!hasView(views, "waitDlg")) popView(views);
@@ -792,9 +802,8 @@ 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;

package/package.json

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