@duxweb/dvha-core 1.0.18 → 1.0.20

package/dist/esm/provider/app.js

@@ -1,15 +1,15 @@
-import { defineComponent as U, inject as V, createVNode as q } from "vue";
-import { OverlaysProvider as B } from "@overlastic/vue";
-import { useRouter as G } from "vue-router";
-import { useCan as H } from "../hooks/auth.js";
-import { useConfig as K } from "../hooks/config.js";
+import { defineComponent as T, inject as U, createVNode as V } from "vue";
+import { OverlaysProvider as q } from "@overlastic/vue";
+import { useRouter as B } from "vue-router";
+import { useCan as G } from "../hooks/auth.js";
+import { useConfig as H } from "../hooks/config.js";
 import "@tanstack/vue-query";
-import { useManage as Q } from "../hooks/manage.js";
+import { useManage as K } from "../hooks/manage.js";
 import "json-2-csv";
 import "lodash-es";
 import "@vee-validate/rules";
 import "vee-validate";
-import { useAuthStore as T } from "../stores/auth.js";
+import { useAuthStore as Q } from "../stores/auth.js";
 import { useI18nStore as W } from "../stores/i18n.js";
 import "pinia";
 import { useManageStore as X } from "../stores/manage.js";
@@ -22,49 +22,49 @@ import "colorizr";
 import "axios";
 import "clsx";
 import { DuxError as x } from "../components/status/error.js";
-import { DuxNotAuthorized as ee } from "../components/status/notAuthorized.js";
-import { DuxNotFound as oe } from "../components/status/notFound.js";
-const Ie = /* @__PURE__ */ U({
+import { DuxNotAuthorized as tt } from "../components/status/notAuthorized.js";
+import { DuxNotFound as ot } from "../components/status/notFound.js";
+const Et = /* @__PURE__ */ T({
   name: "DuxAppProvider",
   props: {},
-  setup(te, {
-    slots: c
+  setup(et, {
+    slots: h
   }) {
-    const f = V("dux.manage"), u = K(), s = G();
-    return s.beforeEach(async (n, re, a) => {
-      var P, b, R, A, S, $, k, M, z, D, w, C, I, N;
+    const l = U("dux.manage"), f = H(), d = B();
+    return d.beforeEach(async (n, rt, i) => {
+      var A, S, $, k, M, w, z, D, C, E, I, N, F, L;
       const o = n.meta.manageName, J = n.meta.authorization === !1;
       if (!o) {
-        const e = u.defaultManage || ((b = (P = u.manages) == null ? void 0 : P[0]) == null ? void 0 : b.name) || "";
-        return a({
-          path: `/${e}`,
+        const t = f.defaultManage || ((S = (A = f.manages) == null ? void 0 : A[0]) == null ? void 0 : S.name) || "";
+        return i({
+          path: `/${t}`,
           replace: !0
         });
       }
-      f && (f.value = o);
-      const h = X(o);
-      h.isInit() || h.setConfig((R = u.manages) == null ? void 0 : R.find((e) => e.name === o), u);
-      const i = Y(o), r = Q(o), d = T(o), l = W(o);
-      if ((A = r.config) != null && A.i18nProvider && !l.isInit()) {
-        const e = l.getLocale();
-        e && ((S = r.config) == null || S.i18nProvider.changeLocale(e));
+      l && (l.value = o);
+      const P = X(o);
+      P.isInit() || P.setConfig(($ = f.manages) == null ? void 0 : $.find((t) => t.name === o), f);
+      const c = Y(o), e = K(o), g = Q(o), v = W(o);
+      if ((k = e.config) != null && k.i18nProvider && !v.isInit()) {
+        const t = v.getLocale();
+        t && ((M = e.config) == null || M.i18nProvider.changeLocale(t));
       }
-      if (Z(u, o), !d.isLogin())
-        return J ? a() : a({
-          path: r.getRoutePath("login"),
+      if (Z(f, o), !g.isLogin())
+        return J ? i() : i({
+          path: e.getRoutePath("login"),
           replace: !0
         });
-      const g = (e) => e == null ? void 0 : e.map((p) => ({
+      const R = (t) => t == null ? void 0 : t.map((p) => ({
         ...p,
-        path: p.path ? r.getRoutePath(p.path) : void 0
+        path: p.path ? e.getRoutePath(p.path) : void 0
       }));
-      if (!i.getRouteInit()) {
-        const e = (($ = r.config) == null ? void 0 : $.components) || {}, p = [];
-        if (p.push({
+      if (!c.getRouteInit()) {
+        const t = ((w = e.config) == null ? void 0 : w.components) || {}, p = [];
+        return p.push({
           name: `${o}.notFound`,
           label: "404",
           path: ":pathMatch(.*)*",
-          component: e.notFound || oe,
+          component: t.notFound || ot,
           hidden: !0,
           meta: {
             can: !1
@@ -73,7 +73,7 @@ const Ie = /* @__PURE__ */ U({
           name: `${o}.notAuthorized`,
           label: "403",
           path: "notAuthorized",
-          component: e.notAuthorized || ee,
+          component: t.notAuthorized || tt,
           hidden: !0,
           meta: {
             can: !1
@@ -82,79 +82,78 @@ const Ie = /* @__PURE__ */ U({
           name: `${o}.error`,
           label: "500",
           path: "error",
-          component: e.error || x,
+          component: t.error || x,
           hidden: !0,
           meta: {
             can: !1
           }
-        }), i.setRoutes(g(((k = r.config) == null ? void 0 : k.menus) || [])), (M = r.config) != null && M.apiRoutePath)
-          try {
-            await ((w = (D = (z = r.config) == null ? void 0 : z.dataProvider) == null ? void 0 : D.default) == null ? void 0 : w.custom({
-              path: r.config.apiRoutePath,
-              meta: {
-                timeout: 5e3
-              }
-            }, r, d.getUser()).then((t) => {
-              i.appendRoutes(g(t.data || []));
-            }));
-          } catch (t) {
-            console.error(t);
+        }), c.setRoutes(R(((z = e.config) == null ? void 0 : z.menus) || [])), (D = e.config) != null && D.apiRoutePath && await ((I = (E = (C = e.config) == null ? void 0 : C.dataProvider) == null ? void 0 : E.default) == null ? void 0 : I.custom({
+          path: e.config.apiRoutePath,
+          meta: {
+            timeout: 5e3
           }
-        return i.appendRoutes(p), i.getRoutes().forEach((t) => {
-          var E, F, y, L;
-          if (!t.path)
+        }, e, g.getUser()).then((r) => {
+          c.appendRoutes(R(r.data || []));
+        }).catch((r) => {
+          var a, m, s;
+          throw (s = (m = (a = e.config) == null ? void 0 : a.authProvider) == null ? void 0 : m.onError) == null || s.call(m, r).then((u) => {
+            u != null && u.logout && (g.logout(), d.push(e.getRoutePath(u.redirectTo || "/login")));
+          }), r;
+        })), c.appendRoutes(p), c.getRoutes().forEach((r) => {
+          var m, s, u, _;
+          if (!r.path)
             return;
-          const m = {
-            name: t.name,
-            path: t.path,
-            meta: t.meta
+          const a = {
+            name: r.name,
+            path: r.path,
+            meta: r.meta
           };
-          switch (t.loader) {
+          switch (r.loader) {
             case "iframe":
-              m.component = ((F = (E = r.config) == null ? void 0 : E.components) == null ? void 0 : F.iframe) || (() => import("../components/loader/iframe.js"));
+              a.component = ((s = (m = e.config) == null ? void 0 : m.components) == null ? void 0 : s.iframe) || (() => import("../components/loader/iframe.js"));
               break;
             case "remote":
-              m.component = ((L = (y = r.config) == null ? void 0 : y.components) == null ? void 0 : L.remote) || (() => import("../components/loader/loader.js"));
+              a.component = ((_ = (u = e.config) == null ? void 0 : u.components) == null ? void 0 : _.remote) || (() => import("../components/loader/loader.js"));
               break;
             case "link":
-              m.beforeEnter = () => {
+              a.beforeEnter = () => {
                 var j;
-                const _ = ((j = t.meta) == null ? void 0 : j.url) || t.path;
-                return _ && window.open(_, "_blank"), !1;
-              }, m.component = () => Promise.resolve({
+                const y = ((j = r.meta) == null ? void 0 : j.url) || r.path;
+                return y && window.open(y, "_blank"), !1;
+              }, a.component = () => Promise.resolve({
                 template: "<div></div>"
               });
               break;
             default:
-              t.component && (m.component = t.component);
+              r.component && (a.component = r.component);
               break;
           }
-          s.addRoute(`${o}.auth`, m);
-        }), a({
-          path: ((C = n.redirectedFrom) == null ? void 0 : C.path) || n.path,
+          d.addRoute(`${o}.auth`, a);
+        }), i({
+          path: ((N = n.redirectedFrom) == null ? void 0 : N.path) || n.path,
           replace: !0
         });
       }
-      const v = ["", "/", `/${o}`, `/${o}/`];
-      if (v.includes(n.path)) {
-        const e = i.getIndexRoute();
-        return !(e != null && e.path) || v.includes(e == null ? void 0 : e.path) ? (console.warn("[Dux] index route not found, skip redirect"), a()) : a({
-          path: (e == null ? void 0 : e.path) || "/",
+      const b = ["", "/", `/${o}`, `/${o}/`];
+      if (b.includes(n.path)) {
+        const t = c.getIndexRoute();
+        return !(t != null && t.path) || b.includes(t == null ? void 0 : t.path) ? (console.warn("[Dux] index route not found, skip redirect"), i()) : i({
+          path: (t == null ? void 0 : t.path) || "/",
           replace: !0
         });
       }
-      const O = H(o);
-      return (((I = n.meta) == null ? void 0 : I.can) === void 0 || ((N = n.meta) == null ? void 0 : N.can) === !0) && !O(n.name) ? a({
+      const O = G(o);
+      return (((F = n.meta) == null ? void 0 : F.can) === void 0 || ((L = n.meta) == null ? void 0 : L.can) === !0) && !O(n.name) ? i({
         name: `${o}.notAuthorized`
-      }) : a();
-    }), () => q(B, null, {
+      }) : i();
+    }), () => V(q, null, {
       default: () => {
         var n;
-        return [(n = c.default) == null ? void 0 : n.call(c)];
+        return [(n = h.default) == null ? void 0 : n.call(h)];
       }
     });
   }
 });
 export {
-  Ie as DuxAppProvider
+  Et as DuxAppProvider
 };

package/dist/esm/stores/jsonSchema.js

@@ -1,43 +1,39 @@
 import { defineStore as u } from "pinia";
-import { inject as i, ref as a } from "vue";
-function h(t, e) {
-  const o = t.toString ? t.toString() : String(t);
-  return `${e}-${o.slice(0, 32)}`;
-}
-function y(t) {
-  const e = i("dux.manage");
-  if (t || (t = (e == null ? void 0 : e.value) || ""), !t)
+import { inject as h, ref as a } from "vue";
+function d(o) {
+  const e = h("dux.manage");
+  if (o || (o = (e == null ? void 0 : e.value) || ""), !o)
     throw new Error("manage not found");
-  return l(t)();
+  return i(o)();
 }
-function l(t) {
-  return u(`jsonSchema-${t}`, () => {
-    const e = a(/* @__PURE__ */ new Map()), o = a(/* @__PURE__ */ new Map());
+function i(o) {
+  return u(`jsonSchema-${o}`, () => {
+    const e = a(/* @__PURE__ */ new Map()), r = a(/* @__PURE__ */ new Map());
     return {
       componentCache: e,
-      componentsByName: o,
-      addComponent: (n, r, s) => {
-        const c = h(n, r);
+      componentsByName: r,
+      addComponent: (t, n, s) => {
+        const c = n;
         return e.value.has(c) || (e.value.set(c, {
-          component: n,
-          name: r,
-          originalName: s || r,
+          component: t,
+          name: n,
+          originalName: s || n,
           cacheKey: c
-        }), o.value.set(r, n)), c;
+        }), r.value.set(n, t)), c;
       },
-      getComponent: (n) => {
-        var r;
-        return (r = e.value.get(n)) == null ? void 0 : r.component;
+      getComponent: (t) => {
+        var n;
+        return (n = e.value.get(t)) == null ? void 0 : n.component;
       },
-      getComponentByName: (n) => o.value.get(n),
-      hasComponent: (n) => e.value.has(n),
+      getComponentByName: (t) => r.value.get(t),
+      hasComponent: (t) => e.value.has(t),
       clearCache: () => {
-        e.value.clear(), o.value.clear();
+        e.value.clear(), r.value.clear();
       },
       getCacheSize: () => e.value.size
     };
   });
 }
 export {
-  y as useJsonSchemaStore
+  d as useJsonSchemaStore
 };

package/dist/esm/stores/route.js

@@ -1,19 +1,19 @@
 import { defineStore as w } from "pinia";
 import { inject as j, ref as R } from "vue";
-function b(n) {
+function b(u) {
   const t = j("dux.manage");
-  if (n || (n = (t == null ? void 0 : t.value) || ""), !n)
+  if (u || (u = (t == null ? void 0 : t.value) || ""), !u)
     throw new Error("manage not found");
-  return E(n)();
+  return E(u)();
 }
-function E(n) {
-  return w(`routes-${n}`, () => {
-    const t = R([]), a = (e) => {
+function E(u) {
+  return w(`routes-${u}`, () => {
+    const t = R([]), l = (e) => {
       var o;
-      return (o = t.value) == null ? void 0 : o.find((u) => u.path === e);
+      return (o = t.value) == null ? void 0 : o.find((s) => s.path === e);
     }, p = (e) => {
       var o;
-      return (o = t.value) == null ? void 0 : o.find((u) => u.name === e);
+      return (o = t.value) == null ? void 0 : o.find((s) => s.name === e);
     }, h = (e) => {
       var o;
       (o = t.value) == null || o.push(e);
@@ -24,27 +24,30 @@ function E(n) {
     }, x = () => t.value, g = () => {
       t.value = [];
     }, m = () => {
-      var u, f;
-      const e = (f = (u = t.value) == null ? void 0 : u.filter((r) => !r.parent && !r.name.includes("404") && !r.name.includes("403"))) == null ? void 0 : f.sort((r, s) => (r.sort || 0) - (s.sort || 0)), o = (r) => {
-        var d, v;
+      var s, d;
+      const e = (d = (s = t.value) == null ? void 0 : s.filter((r) => {
+        var n, c;
+        return !r.parent && !((n = r.name) != null && n.includes("404")) && !((c = r.name) != null && c.includes("403"));
+      })) == null ? void 0 : d.sort((r, n) => (r.sort || 0) - (n.sort || 0)), o = (r) => {
+        var c, v;
         if (r.path)
           return r;
-        const s = (v = (d = t.value) == null ? void 0 : d.filter((c) => c.parent === r.name)) == null ? void 0 : v.sort((c, i) => (c.sort || 0) - (i.sort || 0));
-        for (const c of s || []) {
-          const i = o(c);
-          if (i)
-            return i;
+        const n = (v = (c = t.value) == null ? void 0 : c.filter((i) => i.parent === r.name)) == null ? void 0 : v.sort((i, a) => (i.sort || 0) - (a.sort || 0));
+        for (const i of n || []) {
+          const a = o(i);
+          if (a)
+            return a;
         }
       };
       for (const r of e || []) {
-        const s = o(r);
-        if (s)
-          return s;
+        const n = o(r);
+        if (n)
+          return n;
       }
-    }, l = R(!1);
+    }, f = R(!1);
     return {
       routes: t,
-      searchRoute: a,
+      searchRoute: l,
       searchRouteName: p,
       appendRoute: h,
       appendRoutes: S,
@@ -53,8 +56,8 @@ function E(n) {
       clearRoutes: g,
       getIndexRoute: m,
       getRouteInit: () => {
-        const e = l.value;
-        return l.value = !0, e;
+        const e = f.value;
+        return f.value = !0, e;
       }
     };
   });

package/dist/types/hooks/auth.d.ts

@@ -93,7 +93,7 @@ export declare function useUpdatePassword(props?: IAuthActionParams): {
  * @returns Error method
  */
 export declare function useError(onCallback?: (data?: IAuthErrorResponse) => void): {
-    mutate: (error: IDataProviderError) => Promise<void>;
+    mutate: (error?: IDataProviderError) => Promise<void>;
 };
 /**
  * Get auth

package/dist/types/hooks/export.d.ts

@@ -1,9 +1,8 @@
-import type { InfiniteData } from '@tanstack/vue-query';
 import type { IDataProviderPagination, IDataProviderResponse } from '../types';
 import type { IInfiniteListParams } from './data';
 export interface IUseExportProps extends IInfiniteListParams {
-    onSuccess?: (data: InfiniteData<IDataProviderResponse | undefined> | undefined) => void;
-    onProgress?: (data: IDataProviderPagination) => void;
+    onSuccess?: (data?: IDataProviderResponse) => void;
+    onProgress?: (data?: IDataProviderPagination) => void;
     interval?: number;
     maxPage?: number | (() => number);
 }

package/dist/types/hooks/form.d.ts

@@ -3,7 +3,7 @@ import type { IDataProviderError, IDataProviderResponse } from '../types';
 type Key = string | number | undefined;
 export interface IUseFormProps {
     path?: string;
-    id?: Key;
+    id?: MaybeRef<Key>;
     form?: MaybeRef<Record<string, any>>;
     onSuccess?: (data: IDataProviderResponse) => void;
     onError?: (error: IDataProviderError) => void;
@@ -14,7 +14,7 @@ export declare function useForm(props: IUseFormProps): {
     form: import("vue").Ref<MaybeRef<Record<string, any>>, MaybeRef<Record<string, any>>>;
     initData: any;
     isLoading: import("vue").ComputedRef<boolean>;
-    isEdit: import("vue").ComputedRef<true | Key>;
+    isEdit: import("vue").ComputedRef<boolean>;
     onSubmit: (data?: Record<string, any>) => void;
     onReset: () => void;
 };

package/dist/types/hooks/formExtend.d.ts

@@ -5,7 +5,7 @@ export interface UseExtendFormProps extends IUseFormProps {
 }
 export declare function useExtendForm(props: UseExtendFormProps): {
     isLoading: import("vue").ComputedRef<boolean>;
-    isEdit: import("vue").ComputedRef<true | (string | number | undefined)>;
+    isEdit: import("vue").ComputedRef<boolean>;
     form: import("vue").Ref<import("vue").MaybeRef<Record<string, any>>, import("vue").MaybeRef<Record<string, any>>>;
     onSubmit: (data?: Record<string, any>) => void;
     onReset: () => void;

package/dist/types/hooks/i18n.d.ts

@@ -4,4 +4,5 @@ export declare function useI18n(): {
     getLocale: () => string | undefined;
     loadLocale: (lang: string, messages: Record<string, unknown>) => Promise<any> | undefined;
     mergeLocale: (lang: string, messages: Record<string, unknown>) => void | undefined;
+    getLocales: () => string[] | undefined;
 };

package/dist/types/types/config.d.ts

@@ -42,7 +42,6 @@ export interface IConfigComponent {
     notAuthorized?: RouteComponent;
     error?: RouteComponent;
     exception?: RouteComponent;
-    loading?: RouteComponent;
     iframe?: RouteComponent;
     remote?: RouteComponent;
 }

package/dist/types/types/i18n.d.ts

@@ -8,4 +8,5 @@ export interface I18nProvider {
     loadLocale: (lang: string, files: Record<string, unknown>) => Promise<any>;
     mergeLocale: (lang: string, messages: Record<string, unknown>) => void;
     getLocale: () => string;
+    getLocales: () => string[];
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-core",
   "type": "module",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "author": "DuxWeb",
   "license": "MIT",
   "repository": {