x-essential-lib 0.5.30 → 0.5.32

package/dist/index.js

@@ -142,7 +142,7 @@ function X(e, a) {
   );
 }
 var R = X(De, { path: "/" });
-function ot(e) {
+function lt(e) {
   const a = be.create({
     timeout: 6e3
   });
@@ -200,7 +200,7 @@ function je(e) {
 const s = function() {
   return window.eventBus || (window.eventBus = je()), window.eventBus;
 }();
-async function lt(e) {
+async function rt(e) {
   return new Promise((a) => {
     setTimeout(a, e);
   });
@@ -214,17 +214,6 @@ async function Z(e, a, t) {
     n();
   });
 }
-function rt(e) {
-  var l, o;
-  if (!window.appAppear) {
-    window.appAppear = !0;
-    return;
-  }
-  const a = "single-spa-application:" + e, t = (l = document.getElementById(a)) == null ? void 0 : l.classList;
-  t && (t.remove("app-left", "app-right", "app-reset"), (o = window.routeExtras) != null && o.forward ? t.add("app-right") : t.add("app-left"), setTimeout(() => {
-    t.add("app-reset");
-  }, 0));
-}
 let te = Date.now();
 function ce() {
   const e = Date.now();
@@ -404,22 +393,33 @@ function z(e) {
   }), a;
 }
 const oe = i("");
+function Re(e, a) {
+  var o;
+  if (!window.appAppear) {
+    window.appAppear = !0;
+    return;
+  }
+  const t = "single-spa-application:" + e, l = (o = document.getElementById(t)) == null ? void 0 : o.classList;
+  l && (l.remove("app-left", "app-right", "app-reset"), a ? l.add("app-right") : l.add("app-left"), setTimeout(() => {
+    l.add("app-reset");
+  }, 0));
+}
 function D(e, a) {
   const { lastAppPath: t } = Y();
-  e === "/" && (e = t);
+  a === "/" && (a = t);
   const l = z(e), o = z(a), n = (l == null ? void 0 : l.app) === (o == null ? void 0 : o.app), r = (l == null ? void 0 : l.path) === (o == null ? void 0 : o.path), c = ((l == null ? void 0 : l.level) ?? -1) >= ((o == null ? void 0 : o.level) ?? -1);
   console.info(
     `~~~~before route change~~~~ ${a} -> ${e} inner=${n} forward=${c}`
-  ), n ? r ? oe.value = "" : oe.value = c ? "inner-left" : "inner-right" : window.routeExtras = { forward: c };
+  ), n ? r ? oe.value = "" : oe.value = c ? "inner-left" : "inner-right" : l && (!o || o.app !== l.app) && Re(l.app, c);
 }
-function Re() {
+function Ee() {
   return !!R.get("accessToken");
 }
-function Ee() {
+function Ue() {
   return !!R.get("activeOrg");
 }
 function ft(e, a, t) {
-  const l = Re(), o = Ee(), n = z(e.path);
+  const l = Ee(), o = Ue(), n = z(e.path);
   if (!n) {
     t();
     return;
@@ -475,7 +475,7 @@ function P(e, a) {
     s.off(e, o);
   }), { open: l };
 }
-const Ue = /* @__PURE__ */ U({
+const $e = /* @__PURE__ */ U({
   __name: "index",
   setup(e) {
     const a = Q(), { open: t } = P("confirmDlg"), l = i(""), o = i(""), n = i(), r = i(), c = f(() => {
@@ -559,7 +559,7 @@ const Ue = /* @__PURE__ */ U({
       }, 8, ["modelValue", "onKeydown"]);
     };
   }
-}), $e = (e) => (ve("data-v-f4ad116e"), e = e(), me(), e), Ke = /* @__PURE__ */ $e(() => /* @__PURE__ */ m("div", { class: "lds-spinner" }, [
+}), Ke = (e) => (ve("data-v-f4ad116e"), e = e(), me(), e), We = /* @__PURE__ */ Ke(() => /* @__PURE__ */ m("div", { class: "lds-spinner" }, [
   /* @__PURE__ */ m("div"),
   /* @__PURE__ */ m("div"),
   /* @__PURE__ */ m("div"),
@@ -572,9 +572,9 @@ const Ue = /* @__PURE__ */ U({
   /* @__PURE__ */ m("div"),
   /* @__PURE__ */ m("div"),
   /* @__PURE__ */ m("div")
-], -1)), We = [
-  Ke
-], ze = /* @__PURE__ */ U({
+], -1)), ze = [
+  We
+], Le = /* @__PURE__ */ U({
   __name: "index",
   props: {
     zIndex: {
@@ -590,14 +590,14 @@ const Ue = /* @__PURE__ */ U({
     return (o, n) => (V(), J("div", {
       class: "x-cont",
       style: ge(l.value)
-    }, We, 4));
+    }, ze, 4));
   }
 }), pe = (e, a) => {
   const t = e.__vccOpts || e;
   for (const [l, o] of a)
     t[l] = o;
   return t;
-}, Le = /* @__PURE__ */ pe(ze, [["__scopeId", "data-v-f4ad116e"]]), Fe = /* @__PURE__ */ U({
+}, Fe = /* @__PURE__ */ pe(Le, [["__scopeId", "data-v-f4ad116e"]]), Me = /* @__PURE__ */ U({
   __name: "item",
   props: {
     id: {},
@@ -630,7 +630,7 @@ const Ue = /* @__PURE__ */ U({
       }, null, 8, ["modelValue", "type", "text"]);
     };
   }
-}), Me = /* @__PURE__ */ U({
+}), Ne = /* @__PURE__ */ U({
   __name: "index",
   setup(e) {
     const a = he({ items: [] });
@@ -657,7 +657,7 @@ const Ue = /* @__PURE__ */ U({
       }, ["stop"])),
       class: "x-cont d-flex flex-column-reverse align-center"
     }, [
-      (V(!0), J(we, null, xe(a.items, (_) => (V(), E(Fe, {
+      (V(!0), J(we, null, xe(a.items, (_) => (V(), E(Me, {
         onTimeout: l,
         id: _.id,
         type: _.type,
@@ -667,7 +667,7 @@ const Ue = /* @__PURE__ */ U({
       }, null, 8, ["id", "type", "text", "timeout"]))), 128))
     ]));
   }
-}), Ne = /* @__PURE__ */ pe(Me, [["__scopeId", "data-v-8c2268ea"]]), He = /* @__PURE__ */ U({
+}), He = /* @__PURE__ */ pe(Ne, [["__scopeId", "data-v-8c2268ea"]]), Je = /* @__PURE__ */ U({
   __name: "index",
   setup(e) {
     const a = Q(), { open: t } = P("promptDlg"), l = i(""), o = i(""), n = i(), r = i(), c = i(), p = i(""), _ = i(), v = i(), y = f(() => {
@@ -766,7 +766,7 @@ const Ue = /* @__PURE__ */ U({
       }, 8, ["modelValue", "onKeydown"]);
     };
   }
-}), Je = { class: "mx-auto my-auto" }, Xe = { class: "d-flex align-center justify-center w-100 h-100" }, Ge = /* @__PURE__ */ U({
+}), Xe = { class: "mx-auto my-auto" }, Ge = { class: "d-flex align-center justify-center w-100 h-100" }, Qe = /* @__PURE__ */ U({
   __name: "index",
   setup(e) {
     const a = Q(), { open: t } = P("waitDlg"), l = () => {
@@ -788,14 +788,14 @@ const Ue = /* @__PURE__ */ U({
         fullscreen: ""
       }, {
         default: w(() => [
-          m("div", Je, [
+          m("div", Xe, [
             k(c, {
               width: "300px",
               height: "80px",
               loading: ""
             }, {
               default: w(() => [
-                m("div", Xe, [
+                m("div", Ge, [
                   m("span", null, A(F(a).t("waitingResponse")), 1)
                 ])
               ]),
@@ -807,8 +807,8 @@ const Ue = /* @__PURE__ */ U({
       }, 8, ["modelValue"]);
     };
   }
-}), Qe = (e) => {
-  e.component("x-confirm-dlg", Ue), e.component("x-loading", Le), e.component("x-message", Ne), e.component("x-prompt-dlg", He), e.component("x-wait-dlg", Ge);
+}), Ye = (e) => {
+  e.component("x-confirm-dlg", $e), e.component("x-loading", Fe), e.component("x-message", He), e.component("x-prompt-dlg", Je), e.component("x-wait-dlg", Qe);
 };
 function gt() {
   const e = H(), a = f(() => e.global.current.value.colors.primary), t = f(() => e.global.current.value.colors.secondary), l = f(() => e.current.value.dark ? "#2e2e2e" : "#bdbdbd"), o = f(() => e.current.value.dark ? "#272727" : "#eeeeee"), n = f(() => e.current.value.dark ? "#1e1e1e" : "#ffffff"), r = f(() => e.current.value.dark ? "#303030" : "#f6f6f6"), c = f(() => e.current.value.dark ? "#ffffff1f" : "#0000001f");
@@ -822,7 +822,7 @@ function gt() {
     borderColor: c
   };
 }
-function Ye(e, a) {
+function Ze(e, a) {
   return e.post("pullPermission", a);
 }
 function vt(e, a) {
@@ -877,7 +877,7 @@ function vt(e, a) {
     const u = z(t.path);
     if (!(!u || u.requiredState !== "org"))
       try {
-        const { update: g, permissions: b } = await Ye(a, {
+        const { update: g, permissions: b } = await Ze(a, {
           checksum: o.permissionChecksum
         });
         if (!g)
@@ -918,12 +918,11 @@ function ht() {
   const e = H(), a = ke(), t = f(() => e.current.value.dark), l = f(() => !!window.cordova), o = f(() => a.width.value <= 1280 ? a.width.value + "px" : a.width.value <= 1920 ? 1920 / 2.5 + "px" : 2560 / 2.5 + "px");
   return { dark: t, sysBarAvail: l, compactWidth: o };
 }
-const wt = { install: Qe };
+const wt = { install: Ye };
 export {
   Ie as Permission,
-  rt as appAppear,
   pt as closeWaitDlg,
-  ot as createAxios,
+  lt as createAxios,
   wt as default,
   s as eventBus,
   ae as isExist,
@@ -944,6 +943,6 @@ export {
   ht as useSystem,
   ne as useViewMgrStore,
   P as useViewStack,
-  lt as waitMs,
+  rt as waitMs,
   Z as waitUtil
 };

package/dist/utils/misc.d.ts

@@ -2,4 +2,3 @@ import { Emitter, EventType } from 'mitt';
 export declare const eventBus: Emitter<Record<EventType, unknown>>;
 export declare function waitMs(ms: number): Promise<void>;
 export declare function waitUtil(conditionFunc: () => boolean, timeout?: number, interval?: number): Promise<boolean>;
-export declare function appAppear(name: string): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "x-essential-lib",
   "private": false,
-  "version": "0.5.30",
+  "version": "0.5.32",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",