x-essential-lib 0.10.8 → 0.10.10

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { n as EventType, t as Emitter } from "./vendor.homyhtbu.js";
+import { n as EventType, t as Emitter } from "./vendor.nvyu21oc.js";
 import { Ref } from "vue";
 import { RouteLocationNormalized } from "vue-router";
 import { AxiosInstance } from "axios";
@@ -243,6 +243,9 @@ type PermissionObject = {
 type PermissionObjects = {
   [key: string]: PermissionObject;
 };
+declare function toPermissionObjects(permissions: {
+  [key: string]: string;
+}): PermissionObjects;
 declare function isExist(instanceTree: InstanceTree | undefined, instance: string): boolean;
 declare function verifyPermission(permissionObjects: PermissionObjects, permission: Permission, instance: string): boolean;
 //#endregion
@@ -251,6 +254,8 @@ declare function provideDark(dark: Ref<boolean>): void;
 declare function injectDark(): Ref<boolean>;
 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 providePermissionObjects(permissionObjects: Ref<PermissionObjects>): void;
 declare function injectPermissionObjects(): Ref<PermissionObjects>;
 declare function providePermissionChecksum(permissionChecksum: Ref<string>): void;
@@ -270,9 +275,15 @@ interface RouteMeta {
 }
 declare function matchRouteMeta(path: string): RouteMeta | undefined;
 declare const routeTransName: import("vue").Ref<string, string>;
-declare function onBeforeEach(to: RouteLocationNormalized, from: RouteLocationNormalized, lastAppPath: string): {
+declare function onBeforeEach(to: RouteLocationNormalized, from: RouteLocationNormalized, lastAppPath: string): Promise<{
   path: string;
-} | undefined;
+  query?: undefined;
+} | {
+  path: string;
+  query: {
+    orgId: string;
+  };
+} | undefined>;
 //#endregion
 //#region src/utils/type.d.ts
 declare const types: readonly ["string", "number", "boolean", "array", "object", "any"];
@@ -290,7 +301,16 @@ declare function popView(views: Ref<string[]>): void;
 declare function clearViews(views: Ref<string[]>): void;
 //#endregion
 //#region src/composables/microApp.d.ts
-declare function useMicroApp(dark: Ref<boolean | undefined>, locale: Ref<string>, permissionObjects: Ref<PermissionObjects>, permissionChecksum: Ref<string>, lastAppPath: Ref<string>, views: Ref<string[]>, customBack?: (m: RouteMeta) => void): void;
+interface States {
+  dark: Ref<boolean | undefined>;
+  locale: Ref<string>;
+  activeOrg: 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;
 //#endregion
 //#region src/composables/permission.d.ts
 declare function usePermission(): {
@@ -533,4 +553,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, injectDark, injectLastAppPath, injectLocale, injectPermissionChecksum, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLastAppPath, provideLocale, providePermissionChecksum, providePermissionObjects, provideViews, routeTransName, 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, 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 };

package/dist/index.js

@@ -1,10 +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.homyhtbu.js";
+import { a as api, i as mitt_default, o as usePreferredDark, r as toLower } from "./vendor.nvyu21oc.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";
 
 //#region src/composables/color.ts
 function useColor() {
@@ -79,10 +81,6 @@ function onRespRejected(error, onError) {
 function onUnauthorized() {
 	api.remove("accessToken");
 	api.remove("refreshToken");
-	api.remove("userId");
-	api.remove("userName");
-	api.remove("phone");
-	api.remove("activeOrg");
 	useRouter().replace({ path: "/passport/login" });
 }
 
@@ -369,6 +367,15 @@ let Permission = /* @__PURE__ */ function(Permission) {
 	Permission["filter_table"] = "filter_table";
 	return Permission;
 }({});
+function toPermissionObjects(permissions) {
+	const permissionObjects = {};
+	for (const key in permissions) {
+		if (key === "checksum") continue;
+		const value = permissions[key];
+		permissionObjects[key] = JSON.parse(value);
+	}
+	return permissionObjects;
+}
 function isExist(instanceTree, instance) {
 	if (!instanceTree) return false;
 	let curr = instanceTree;
@@ -392,47 +399,63 @@ function verifyPermission(permissionObjects, permission, instance) {
 
 //#endregion
 //#region src/utils/provideInject.ts
-const darkKey = "essentialDark";
-const localeKey = "essentialLocale";
-const permissionObjectsKey = "essentialPermissionObjects";
-const permissionChecksumKey = "essentialPermissionChecksum";
-const lastAppPathKey = "essentialLastAppPath";
-const viewsKey = "essentialViews";
 function provideDark(dark) {
-	provide(darkKey, dark);
+	provide("essentialDark", dark);
 }
 function injectDark() {
-	return inject(darkKey);
+	return inject("essentialDark");
 }
 function provideLocale(locale) {
-	provide(localeKey, locale);
+	provide("essentialLocale", locale);
 }
 function injectLocale() {
-	return inject(localeKey);
+	return inject("essentialLocale");
+}
+function provideActiveOrg(activeOrg) {
+	provide("essentialActiveOrg", activeOrg);
+}
+function injectActiveOrg() {
+	return inject("essentialActiveOrg");
 }
 function providePermissionObjects(permissionObjects) {
-	provide(permissionObjectsKey, permissionObjects);
+	provide("essentialPermissionObjects", permissionObjects);
 }
 function injectPermissionObjects() {
-	return inject(permissionObjectsKey);
+	return inject("essentialPermissionObjects");
 }
 function providePermissionChecksum(permissionChecksum) {
-	provide(permissionChecksumKey, permissionChecksum);
+	provide("essentialPermissionChecksum", permissionChecksum);
 }
 function injectPermissionChecksum() {
-	return inject(permissionChecksumKey);
+	return inject("essentialPermissionChecksum");
 }
 function provideLastAppPath(lastAppPath) {
-	provide(lastAppPathKey, lastAppPath);
+	provide("essentialLastAppPath", lastAppPath);
 }
 function injectLastAppPath() {
-	return inject(lastAppPathKey);
+	return inject("essentialLastAppPath");
 }
 function provideViews(views) {
-	provide(viewsKey, views);
+	provide("viewsKey", views);
 }
 function injectViews() {
-	return inject(viewsKey);
+	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
@@ -610,21 +633,40 @@ function onBeforeChange(toPath, fromPath, lastAppPath) {
 function isHasAccessToken() {
 	return !!api.get("accessToken");
 }
-function onBeforeEach(to, from, lastAppPath) {
+async function syncPermission(orgId) {
+	const { permissions } = await PullPermission({
+		orgId,
+		checksum: ""
+	});
+	eventBus.emit("updatePermission", [toPermissionObjects(permissions), permissions["checksum"] ?? ""]);
+}
+async function onBeforeEach(to, from, lastAppPath) {
 	const hasAccessToken = isHasAccessToken();
 	const toRouteMeta = matchRouteMeta(to.path);
 	if (!toRouteMeta) return;
-	if (toRouteMeta.requireAuth && !hasAccessToken) {
-		const toPath = "/passport/login";
-		onBeforeChange(toPath, from.path, lastAppPath);
-		return { path: toPath };
+	if (toRouteMeta.requireAuth && !hasAccessToken) return { path: `/passport/login` };
+	if (hasAccessToken && to.path.startsWith("/passport/")) return { path: `/main` };
+	const orgId = to.query.orgId;
+	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 syncPermission(orgId);
+		eventBus.emit("updateActiveOrg", orgId);
+		onBeforeChange(to.path, from.path, lastAppPath);
+	} catch {
+		return {
+			path: `/main/${Date.now()}`,
+			query: { orgId: "public" }
+		};
 	}
-	if (hasAccessToken && to.path.startsWith("/passport/")) {
-		const toPath = "/main";
-		onBeforeChange(toPath, from.path, lastAppPath);
-		return { path: toPath };
+	else try {
+		if (!orgId) throw new Error(`orgId not specified`);
+		await syncPermission(orgId);
+		eventBus.emit("updateActiveOrg", orgId);
+		onBeforeChange(to.path, from.path, lastAppPath);
+	} catch {
+		return { path: `/main` };
 	}
-	onBeforeChange(to.path, from.path, lastAppPath);
 }
 
 //#endregion
@@ -689,9 +731,10 @@ function clearViews(views) {
 
 //#endregion
 //#region src/composables/microApp.ts
-function useMicroApp(dark, locale, permissionObjects, permissionChecksum, lastAppPath, views, customBack) {
+function useMicroApp(states, syncLocale, customBack) {
 	const route = useRoute();
 	const router = useRouter();
+	const { dark, locale, activeOrg, permissionObjects, permissionChecksum, lastAppPath, views } = states;
 	const prefDark = usePreferredDark();
 	const finalDark = ref(false);
 	watchEffect(() => {
@@ -700,16 +743,27 @@ function useMicroApp(dark, locale, permissionObjects, permissionChecksum, lastAp
 		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);
 	providePermissionObjects(permissionObjects);
 	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);
@@ -744,10 +798,12 @@ function useMicroApp(dark, locale, permissionObjects, permissionChecksum, lastAp
 	function onUpdateLocale(val) {
 		locale.value = val;
 	}
+	function onUpdateActiveOrg(val) {
+		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;
@@ -755,6 +811,7 @@ function useMicroApp(dark, locale, permissionObjects, permissionChecksum, lastAp
 	onBeforeMount(() => {
 		eventBus.on("updateDark", onUpdateDark);
 		eventBus.on("updateLocale", onUpdateLocale);
+		eventBus.on("updateActiveOrg", onUpdateActiveOrg);
 		eventBus.on("updatePermission", onUpdatePermission);
 		eventBus.on("updateLastAppPath", onUpdateLastAppPath);
 		eventBus.emit("syncGlobalState");
@@ -762,6 +819,7 @@ function useMicroApp(dark, locale, permissionObjects, permissionChecksum, lastAp
 	onBeforeUnmount(() => {
 		eventBus.off("updateDark", onUpdateDark);
 		eventBus.off("updateLocale", onUpdateLocale);
+		eventBus.off("updateActiveOrg", onUpdateActiveOrg);
 		eventBus.off("updatePermission", onUpdatePermission);
 		eventBus.off("updateLastAppPath", onUpdateLastAppPath);
 	});
@@ -1527,4 +1585,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, injectLastAppPath, injectLocale, injectPermissionChecksum, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLastAppPath, provideLocale, providePermissionChecksum, providePermissionObjects, provideViews, routeTransName, 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, 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 };

package/dist/{vendor.homyhtbu.js → vendor.nvyu21oc.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 = [
-	61,
+	65,
 	() => [],
 	[]
 ];
 var Handler = [
-	62,
+	66,
 	(T) => [T],
 	[
 		"",
@@ -591,7 +591,7 @@ var Handler = [
 	]
 ];
 var WildcardHandler = [
-	63,
+	67,
 	(T) => [
 		Record,
 		T,
@@ -609,7 +609,7 @@ var WildcardHandler = [
 	]
 ];
 var EventHandlerList = [
-	64,
+	68,
 	(T) => [
 		T,
 		Handler,
@@ -623,7 +623,7 @@ var EventHandlerList = [
 	]
 ];
 var WildCardEventHandlerList = [
-	65,
+	69,
 	(T) => [
 		Record,
 		T,
@@ -639,7 +639,7 @@ var WildCardEventHandlerList = [
 	]
 ];
 var EventHandlerMap = [
-	66,
+	70,
 	(Events) => [
 		EventType,
 		Record,
@@ -665,7 +665,7 @@ var EventHandlerMap = [
 	]
 ];
 var Emitter = [
-	67,
+	71,
 	(Key, Events) => [
 		EventType,
 		Record,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x-essential-lib",
-  "version": "0.10.8",
+  "version": "0.10.10",
   "files": [
     "dist"
   ],
@@ -23,6 +23,9 @@
     "lint-staged": "lint-staged",
     "prepare": "husky"
   },
+  "dependencies": {
+    "x-error-lib": "^0.6.3"
+  },
   "devDependencies": {
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",