x-essential-lib 0.10.23 → 0.10.24

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { n as EventType, t as Emitter } from "./vendor.dqdzrw43.js";
+import { n as EventType, t as Emitter } from "./vendor.homyhtbu.js";
 import { Ref } from "vue";
 import { AxiosInstance } from "axios";
 import { RouteLocationNormalized } from "vue-router";
@@ -272,6 +272,7 @@ declare const routeTransName: import("vue").Ref<string, string>;
 declare function onBeforeEach(to: RouteLocationNormalized, from: RouteLocationNormalized, lastAppPath: string): Promise<{
   path: string;
 } | undefined>;
+declare function switchOrg(orgId: string | undefined): Promise<boolean>;
 //#endregion
 //#region src/utils/type.d.ts
 declare const types: readonly ["string", "number", "boolean", "array", "object", "any"];
@@ -305,7 +306,7 @@ interface GlobalStates {
 declare function useGlobalStates(globalStates: GlobalStates, base?: boolean): void;
 //#endregion
 //#region src/composables/microApp.d.ts
-declare function useMicroApp(globalStates: GlobalStates, ignoreSyncOrg?: boolean, onRouteChange?: () => Promise<void>, customBack?: (m: RouteMeta) => void): void;
+declare function useMicroApp(globalStates: GlobalStates, customBack?: (m: RouteMeta) => void): void;
 //#endregion
 //#region src/composables/permission.d.ts
 declare function usePermission(): {
@@ -552,4 +553,4 @@ declare const _default: {
   install: (app: import("vue").App) => void;
 };
 //#endregion
-export { GlobalStates, Permission, PermissionObjects, RouteMeta, Type, addView, appAppear, clearViews, closeWaitDlg, createAxios, _default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectDark, injectLocale, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };
+export { GlobalStates, Permission, PermissionObjects, RouteMeta, Type, addView, appAppear, clearViews, closeWaitDlg, createAxios, _default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectDark, injectLocale, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, switchOrg, toPermissionObjects, types, useColor, useGlobalStates, 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.dqdzrw43.js";
+import { a as api, i as mitt_default, o as usePreferredDark, r as toLower } from "./vendor.homyhtbu.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";
@@ -431,6 +431,25 @@ 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 GetOrgName(request) {
+	return instance.post("getOrgName", request);
+}
+function PullPermission(request) {
+	return instance.post("pullPermission", request);
+}
+
 //#endregion
 //#region src/utils/router.ts
 const routeMetas = [
@@ -611,6 +630,31 @@ async function onBeforeEach(to, from, lastAppPath) {
 	if (hasAccessToken && to.path.startsWith("/passport/")) return { path: `/main/${Date.now()}` };
 	onBeforeChange(to.path, from.path, lastAppPath);
 }
+async function switchOrg(orgId) {
+	const router = useRouter();
+	if (!orgId) {
+		await router.replace({ path: `/main/${Date.now()}` });
+		return false;
+	}
+	if (orgId === "public") {
+		eventBus.emit("updateActiveOrg", [orgId, ""]);
+		eventBus.emit("updatePermission", [{}, ""]);
+		return true;
+	}
+	try {
+		const { name } = await GetOrgName({ orgId });
+		const { permissions } = await PullPermission({
+			orgId,
+			checksum: ""
+		});
+		eventBus.emit("updateActiveOrg", [orgId, name]);
+		eventBus.emit("updatePermission", [toPermissionObjects(permissions), permissions.checksum ?? ""]);
+		return true;
+	} catch (e) {
+		if (e === "org not found" || e === "org member not found") await router.replace({ path: `/main/${Date.now()}` });
+		return false;
+	}
+}
 
 //#endregion
 //#region src/utils/type.ts
@@ -742,67 +786,13 @@ function useGlobalStates(globalStates, base) {
 	});
 }
 
-//#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/composables/microApp.ts
-function useMicroApp(globalStates, ignoreSyncOrg, onRouteChange, customBack) {
+function useMicroApp(globalStates, customBack) {
 	const route = useRoute();
 	const router = useRouter();
 	useGlobalStates(globalStates);
 	const { activeOrg, views } = globalStates;
-	async function syncOrg() {
-		const orgId = route.query.orgId;
-		if (!orgId) {
-			router.replace({ path: `/main/${Date.now()}` });
-			return false;
-		}
-		if (orgId === "public") {
-			eventBus.emit("updateActiveOrg", [orgId, ""]);
-			eventBus.emit("updatePermission", [{}, ""]);
-			return true;
-		}
-		try {
-			const { name } = await GetOrgName({ orgId });
-			const { permissions } = await PullPermission({
-				orgId,
-				checksum: ""
-			});
-			eventBus.emit("updateActiveOrg", [orgId, name]);
-			eventBus.emit("updatePermission", [toPermissionObjects(permissions), permissions.checksum ?? ""]);
-			return true;
-		} catch (e) {
-			if (e === "org not found" || e === "org member not found") router.replace({ path: `/main/${Date.now()}` });
-			return false;
-		}
-	}
-	async function fetch() {
-		if (!ignoreSyncOrg && !await syncOrg()) return;
-		await onRouteChange?.();
-	}
-	onBeforeMount(async () => {
-		await fetch();
-	});
-	watch(() => route.path, async () => {
-		await fetch();
-	});
 	async function handleBack() {
 		if (!isEmpty(views)) {
 			if (!hasView(views, "waitDlg")) popView(views);
@@ -1598,4 +1588,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, injectLocale, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };
+export { Permission, addView, appAppear, clearViews, closeWaitDlg, createAxios, src_default as default, delView, eventBus, getTypeColor, getTypeDefault, globalObjects, hasView, injectDark, injectLocale, injectPermissionObjects, injectViews, isEmpty, isExist, lastView, loadLocaleMessageEssential, matchRouteMeta, messageError, messageInfo, messageSuccess, messageWarning, onBeforeEach, openConfirmDlg, openNumberDlg, openPromptDlg, openWaitDlg, popView, provideDark, provideLocale, providePermissionObjects, provideViews, routeTransName, switchOrg, toPermissionObjects, types, useColor, useGlobalStates, useMicroApp, usePermission, useSystem, useViewStack, verifyPermission, waitMs, waitUtil };

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

package/package.json

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