x-essential-lib 0.10.10 → 0.10.13

package/dist/{i18n-en.exw0q3rp.js → i18n-en.m7512rls.js}

@@ -194,7 +194,8 @@ var en_default = {
 			hexaInput: "HEX with alpha value",
 			changeFormat: "Change color format"
 		} }
-	}
+	},
+	"x-essential-lib": { publicDomain: "Public Domain" }
 };
 
 //#endregion

package/dist/{i18n-zhHans.itmme76z.js → i18n-zhHans.nfr7wfgr.js}

@@ -194,7 +194,8 @@ var zhHans_default = {
 			hexaInput: "带不透明度 HEX 值",
 			changeFormat: "更改颜色格式"
 		} }
-	}
+	},
+	"x-essential-lib": { publicDomain: "公域" }
 };
 
 //#endregion

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { n as EventType, t as Emitter } from "./vendor.nvyu21oc.js";
+import { n as EventType, t as Emitter } from "./vendor.bri8m5ch.js";
 import { Ref } from "vue";
 import { RouteLocationNormalized } from "vue-router";
 import { AxiosInstance } from "axios";
@@ -256,6 +256,8 @@ declare function provideLocale(locale: Ref<string>): void;
 declare function injectLocale(): Ref<string>;
 declare function provideActiveOrg(activeOrg: Ref<string>): void;
 declare function injectActiveOrg(): Ref<string>;
+declare function provideActiveOrgName(activeOrgName: Ref<string>): void;
+declare function injectActiveOrgName(): Ref<string>;
 declare function providePermissionObjects(permissionObjects: Ref<PermissionObjects>): void;
 declare function injectPermissionObjects(): Ref<PermissionObjects>;
 declare function providePermissionChecksum(permissionChecksum: Ref<string>): void;
@@ -301,16 +303,17 @@ 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>;
+  activeOrgName: Ref<string>;
   permissionObjects: Ref<PermissionObjects>;
   permissionChecksum: Ref<string>;
   lastAppPath: Ref<string>;
   views: Ref<string[]>;
 }
-declare function useMicroApp(states: States, syncLocale: () => Promise<void>, 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(): {
@@ -546,6 +549,9 @@ declare function loadLocaleMessageEssential(locale: string): Promise<{
       };
     };
   };
+  'x-essential-lib': {
+    publicDomain: string;
+  };
 }>;
 //#endregion
 //#region src/index.d.ts
@@ -553,4 +559,4 @@ declare const _default: {
   install: (app: import("vue").App) => void;
 };
 //#endregion
-export { Permission, PermissionObjects, RouteMeta, Type, addView, appAppear, clearViews, closeWaitDlg, createAxios, _default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectActiveOrg, injectDark, injectLastAppPath, injectLocale, injectPermissionChecksum, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideActiveOrg, provideDark, provideLastAppPath, provideLocale, providePermissionChecksum, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useMicroApp, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };
+export { Permission, PermissionObjects, RouteMeta, Type, addView, appAppear, clearViews, closeWaitDlg, createAxios, _default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectActiveOrg, injectActiveOrgName, injectDark, injectLastAppPath, injectLocale, injectPermissionChecksum, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideActiveOrg, provideActiveOrgName, provideDark, provideLastAppPath, provideLocale, providePermissionChecksum, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useMicroApp, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };

package/dist/index.js

@@ -1,12 +1,12 @@
 (function(){try{document.getElementById(`x-essential-lib`)?.remove();const e = document.createElement(`style`);e.setAttribute(`id`, `x-essential-lib`);const t = document.createTextNode(`.fade-leave-active[data-v-x-essential-lib-c3545c8d]{transition:opacity .5s}.fade-leave-to[data-v-x-essential-lib-c3545c8d]{opacity:0}.x-cont[data-v-x-essential-lib-c3545c8d]{justify-content:center;align-items:center;display:flex;position:absolute;inset:0}.lds-spinner[data-v-x-essential-lib-c3545c8d]{color:official;width:40px;height:40px;display:inline-block;position:relative}.lds-spinner div[data-v-x-essential-lib-c3545c8d]{transform-origin:20px 20px;animation:1.2s linear infinite lds-spinner-x-essential-lib-c3545c8d}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:after{content:" ";background:#9e9e9e;border-radius:5%;width:2px;height:6px;display:block;position:absolute;top:3px;left:18px}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:first-child{animation-delay:-1.1s;transform:rotate(0)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(2){animation-delay:-1s;transform:rotate(30deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(3){animation-delay:-.9s;transform:rotate(60deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(4){animation-delay:-.8s;transform:rotate(90deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(5){animation-delay:-.7s;transform:rotate(120deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(6){animation-delay:-.6s;transform:rotate(150deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(7){animation-delay:-.5s;transform:rotate(180deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(8){animation-delay:-.4s;transform:rotate(210deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(9){animation-delay:-.3s;transform:rotate(240deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(10){animation-delay:-.2s;transform:rotate(270deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(11){animation-delay:-.1s;transform:rotate(300deg)}.lds-spinner div[data-v-x-essential-lib-c3545c8d]:nth-child(12){animation-delay:0s;transform:rotate(330deg)}@keyframes lds-spinner-x-essential-lib-c3545c8d{0%{opacity:1}to{opacity:0}}.x-item[data-v-x-essential-lib-cfcda9d9]{width:600px}@media (width<=600px){.x-item[data-v-x-essential-lib-cfcda9d9]{width:calc(100vw - 16px)}}.x-cont[data-v-x-essential-lib-b973907d]{z-index:9999;position:fixed;bottom:20px;left:50%;transform:translate(-50%)}`);e.appendChild(t);document.head.appendChild(e);}catch(e){console.error('rolldown-plugin-inject-css', e);}})()
-import { a as api, i as mitt_default, o as usePreferredDark, r as toLower } from "./vendor.nvyu21oc.js";
+import { a as api, i as mitt_default, o as usePreferredDark, r as toLower } from "./vendor.bri8m5ch.js";
 import { Fragment, Transition, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, isRef, normalizeStyle, onBeforeMount, onBeforeUnmount, onMounted, openBlock, provide, ref, renderList, resolveComponent, toDisplayString, unref, useTemplateRef, watch, watchEffect, withCtx, withKeys, withModifiers } from "vue";
 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,25 @@ 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 GetOrgName(request) {
+	return instance.post("getOrgName", request);
+}
+function PullPermission(request) {
+	return instance.post("pullPermission", request);
+}
+
 //#endregion
 //#region src/utils/axios.ts
 function createAxios(options) {
@@ -417,6 +436,12 @@ function provideActiveOrg(activeOrg) {
 function injectActiveOrg() {
 	return inject("essentialActiveOrg");
 }
+function provideActiveOrgName(activeOrgName) {
+	provide("essentialActiveOrgName", activeOrgName);
+}
+function injectActiveOrgName() {
+	return inject("essentialActiveOrgName");
+}
 function providePermissionObjects(permissionObjects) {
 	provide("essentialPermissionObjects", permissionObjects);
 }
@@ -442,22 +467,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 = [
@@ -633,12 +642,20 @@ function onBeforeChange(toPath, fromPath, lastAppPath) {
 function isHasAccessToken() {
 	return !!api.get("accessToken");
 }
+async function syncOrg(orgId) {
+	if (orgId !== "public") {
+		const { name } = await GetOrgName({ orgId });
+		eventBus.emit("updateActiveOrg", [orgId, name]);
+	} else eventBus.emit("updateActiveOrg", [orgId, ""]);
+}
 async function syncPermission(orgId) {
-	const { permissions } = await PullPermission({
-		orgId,
-		checksum: ""
-	});
-	eventBus.emit("updatePermission", [toPermissionObjects(permissions), permissions["checksum"] ?? ""]);
+	if (orgId !== "public") {
+		const { permissions } = await PullPermission({
+			orgId,
+			checksum: ""
+		});
+		eventBus.emit("updatePermission", [toPermissionObjects(permissions), permissions["checksum"] ?? ""]);
+	} else eventBus.emit("updatePermission", [{}, ""]);
 }
 async function onBeforeEach(to, from, lastAppPath) {
 	const hasAccessToken = isHasAccessToken();
@@ -650,8 +667,8 @@ async function onBeforeEach(to, from, lastAppPath) {
 	if (to.path.startsWith("/passport/")) onBeforeChange(to.path, from.path, lastAppPath);
 	else if (to.path.startsWith("/main")) try {
 		if (!orgId) throw new Error(`orgId not specified`);
+		await syncOrg(orgId);
 		await syncPermission(orgId);
-		eventBus.emit("updateActiveOrg", orgId);
 		onBeforeChange(to.path, from.path, lastAppPath);
 	} catch {
 		return {
@@ -661,8 +678,8 @@ async function onBeforeEach(to, from, lastAppPath) {
 	}
 	else try {
 		if (!orgId) throw new Error(`orgId not specified`);
+		await syncOrg(orgId);
 		await syncPermission(orgId);
-		eventBus.emit("updateActiveOrg", orgId);
 		onBeforeChange(to.path, from.path, lastAppPath);
 	} catch {
 		return { path: `/main` };
@@ -731,10 +748,11 @@ function clearViews(views) {
 
 //#endregion
 //#region src/composables/microApp.ts
-function useMicroApp(states, syncLocale, customBack) {
+function useMicroApp(globalStates, syncLocale, base, customBack) {
+	const { t } = useI18n();
 	const route = useRoute();
 	const router = useRouter();
-	const { dark, locale, activeOrg, permissionObjects, permissionChecksum, lastAppPath, views } = states;
+	const { dark, locale, activeOrg, activeOrgName, permissionObjects, permissionChecksum, lastAppPath, views } = globalStates;
 	const prefDark = usePreferredDark();
 	const finalDark = ref(false);
 	watchEffect(() => {
@@ -760,10 +778,63 @@ function useMicroApp(states, syncLocale, customBack) {
 	provideDark(finalDark);
 	provideLocale(locale);
 	provideActiveOrg(activeOrg);
+	provideActiveOrgName(activeOrgName);
 	providePermissionObjects(permissionObjects);
 	providePermissionChecksum(permissionChecksum);
 	provideLastAppPath(lastAppPath);
 	provideViews(views);
+	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);
@@ -781,25 +852,62 @@ function useMicroApp(states, syncLocale, 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;
 	}
 	function onUpdateLocale(val) {
 		locale.value = val;
 	}
+	const activeOrgNameRaw = ref("");
+	watchEffect(() => {
+		if (activeOrg.value === "public") activeOrgName.value = t("x-essential-lib.publicDomain");
+		else activeOrgName.value = activeOrgNameRaw.value;
+	});
 	function onUpdateActiveOrg(val) {
-		activeOrg.value = val;
+		activeOrg.value = val[0];
+		activeOrgNameRaw.value = val[1];
 	}
 	function onUpdatePermission(val) {
 		permissionObjects.value = val[0];
@@ -808,13 +916,21 @@ function useMicroApp(states, syncLocale, customBack) {
 	function onUpdateLastAppPath(val) {
 		lastAppPath.value = val;
 	}
+	function onSyncGlobalStates() {
+		eventBus.emit("updateDark", dark.value);
+		eventBus.emit("updateLocale", locale.value);
+		eventBus.emit("updateActiveOrg", [activeOrg.value, activeOrgNameRaw.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);
@@ -822,6 +938,7 @@ function useMicroApp(states, syncLocale, customBack) {
 		eventBus.off("updateActiveOrg", onUpdateActiveOrg);
 		eventBus.off("updatePermission", onUpdatePermission);
 		eventBus.off("updateLastAppPath", onUpdateLastAppPath);
+		if (base) eventBus.off("syncGlobalStates", onSyncGlobalStates);
 	});
 }
 
@@ -1575,8 +1692,8 @@ const install = (app) => {
 //#endregion
 //#region src/i18n/index.ts
 async function loadLocaleMessageEssential(locale) {
-	if (locale === "en") return (await import("./i18n-en.exw0q3rp.js").then((n) => n.t)).default;
-	else if (locale === "zhHans") return (await import("./i18n-zhHans.itmme76z.js").then((n) => n.t)).default;
+	if (locale === "en") return (await import("./i18n-en.m7512rls.js").then((n) => n.t)).default;
+	else if (locale === "zhHans") return (await import("./i18n-zhHans.nfr7wfgr.js").then((n) => n.t)).default;
 	else throw new Error(`invalid locale=${locale}`);
 }
 
@@ -1585,4 +1702,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, injectActiveOrg, injectDark, injectLastAppPath, injectLocale, injectPermissionChecksum, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideActiveOrg, provideDark, provideLastAppPath, provideLocale, providePermissionChecksum, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useMicroApp, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };
+export { Permission, addView, appAppear, clearViews, closeWaitDlg, createAxios, src_default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectActiveOrg, injectActiveOrgName, injectDark, injectLastAppPath, injectLocale, injectPermissionChecksum, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideActiveOrg, provideActiveOrgName, provideDark, provideLastAppPath, provideLocale, providePermissionChecksum, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useMicroApp, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };

package/dist/{vendor.nvyu21oc.js → vendor.bri8m5ch.js}

@@ -577,12 +577,12 @@ function toLower(value) {
 //#endregion
 //#region node_modules/.pnpm/mitt@3.0.1/node_modules/mitt/index.d.ts
 var EventType = [
-	65,
+	67,
 	() => [],
 	[]
 ];
 var Handler = [
-	66,
+	68,
 	(T) => [T],
 	[
 		"",
@@ -591,7 +591,7 @@ var Handler = [
 	]
 ];
 var WildcardHandler = [
-	67,
+	69,
 	(T) => [
 		Record,
 		T,
@@ -609,7 +609,7 @@ var WildcardHandler = [
 	]
 ];
 var EventHandlerList = [
-	68,
+	70,
 	(T) => [
 		T,
 		Handler,
@@ -623,7 +623,7 @@ var EventHandlerList = [
 	]
 ];
 var WildCardEventHandlerList = [
-	69,
+	71,
 	(T) => [
 		Record,
 		T,
@@ -639,7 +639,7 @@ var WildCardEventHandlerList = [
 	]
 ];
 var EventHandlerMap = [
-	70,
+	72,
 	(Events) => [
 		EventType,
 		Record,
@@ -665,7 +665,7 @@ var EventHandlerMap = [
 	]
 ];
 var Emitter = [
-	71,
+	73,
 	(Key, Events) => [
 		EventType,
 		Record,

package/package.json

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