x-essential-lib 0.10.12 → 0.10.14

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

@@ -3,12 +3,12 @@ import { t as __exportAll } from "./rolldown-runtime.c6i0pdwe.js";
 //#region src/i18n/locales/en/index.ts
 var en_exports = /* @__PURE__ */ __exportAll({ default: () => en_default });
 var en_default = {
-	dlg: { common: {
+	"dlg": { common: {
 		cancel: "Cancel",
 		confirm: "Confirm",
 		responding: "Responding..."
 	} },
-	$vuetify: {
+	"$vuetify": {
 		badge: "Badge",
 		open: "Open",
 		close: "Close",
@@ -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.kjj6z3dm.js}

@@ -3,12 +3,12 @@ import { t as __exportAll } from "./rolldown-runtime.c6i0pdwe.js";
 //#region src/i18n/locales/zhHans/index.ts
 var zhHans_exports = /* @__PURE__ */ __exportAll({ default: () => zhHans_default });
 var zhHans_default = {
-	dlg: { common: {
+	"dlg": { common: {
 		cancel: "取消",
 		confirm: "确定",
 		responding: "响应中..."
 	} },
-	$vuetify: {
+	"$vuetify": {
 		badge: "徽章",
 		open: "打开",
 		close: "关闭",
@@ -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;
@@ -305,12 +307,13 @@ 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(globalStates: GlobalStates, syncLocale: () => Promise<void>, base?: boolean, customBack?: (m: RouteMeta) => void): void;
+declare function useMicroApp(globalStates: GlobalStates, 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,5 +1,5 @@
 (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";
@@ -48,6 +48,9 @@ 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);
 }
@@ -433,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);
 }
@@ -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(globalStates, syncLocale, base, customBack) {
+function useMicroApp(globalStates, base, customBack) {
+	const { t } = useI18n();
 	const route = useRoute();
 	const router = useRouter();
-	const { dark, locale, activeOrg, permissionObjects, permissionChecksum, lastAppPath, views } = globalStates;
+	const { dark, locale, activeOrg, activeOrgName, permissionObjects, permissionChecksum, lastAppPath, views } = globalStates;
 	const prefDark = usePreferredDark();
 	const finalDark = ref(false);
 	watchEffect(() => {
@@ -747,19 +765,10 @@ function useMicroApp(globalStates, syncLocale, base, customBack) {
 	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);
+	provideActiveOrgName(activeOrgName);
 	providePermissionObjects(permissionObjects);
 	providePermissionChecksum(permissionChecksum);
 	provideLastAppPath(lastAppPath);
@@ -825,7 +834,10 @@ function useMicroApp(globalStates, syncLocale, base, customBack) {
 		if (!routeMeta) return;
 		if (routeMeta.level === 0) navigator?.Backbutton?.goHome(() => {}, () => {});
 		else if (customBack) customBack(routeMeta);
-		else if (routeMeta.back) await router.replace({ path: routeMeta.back });
+		else if (routeMeta.back) await router.replace({
+			path: routeMeta.back,
+			query: { orgId: activeOrg.value }
+		});
 	}
 	async function onKeyDown(e) {
 		if (e.key === "Escape") {
@@ -881,8 +893,14 @@ function useMicroApp(globalStates, syncLocale, base, customBack) {
 	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];
@@ -894,7 +912,7 @@ function useMicroApp(globalStates, syncLocale, base, customBack) {
 	function onSyncGlobalStates() {
 		eventBus.emit("updateDark", dark.value);
 		eventBus.emit("updateLocale", locale.value);
-		eventBus.emit("updateActiveOrg", activeOrg.value);
+		eventBus.emit("updateActiveOrg", [activeOrg.value, activeOrgNameRaw.value]);
 		eventBus.emit("updatePermission", [permissionObjects.value, permissionChecksum.value]);
 		eventBus.emit("updateLastAppPath", lastAppPath.value);
 	}
@@ -1667,8 +1685,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.fcyirt0q.js").then((n) => n.t)).default;
+	else if (locale === "zhHans") return (await import("./i18n-zhHans.kjj6z3dm.js").then((n) => n.t)).default;
 	else throw new Error(`invalid locale=${locale}`);
 }
 
@@ -1677,4 +1695,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.12",
+  "version": "0.10.14",
   "files": [
     "dist"
   ],