@duxweb/dvha-pro 1.0.23 → 1.0.25

package/dist/esm/components/form/drawerForm.js

@@ -1,6 +1,6 @@
-import { defineComponent as b, computed as C, toRef as F, createVNode as i, Fragment as x, mergeProps as D, isVNode as E } from "vue";
-import { useI18n as N, useExtendForm as h } from "@duxweb/dvha-core";
-import { useMessage as j, NButton as u, NScrollbar as v } from "naive-ui";
+import { defineComponent as b, computed as v, toRef as C, createVNode as e, Fragment as F, mergeProps as x, isVNode as D } from "vue";
+import { useI18n as E, useInvalidate as N, useExtendForm as h } from "@duxweb/dvha-core";
+import { useMessage as j, NButton as p, NScrollbar as w } from "naive-ui";
 import "clsx";
 import "vue-echarts";
 import "vue-router";
@@ -12,12 +12,23 @@ import "@tanstack/vue-query";
 import "@duxweb/dvha-naiveui";
 import "@vueuse/core";
 import "pinia";
+import "vue3-ace-editor";
+import "ace-builds/src-noconflict/mode-vue";
+import "ace-builds/src-noconflict/mode-javascript";
+import "ace-builds/src-noconflict/mode-html";
+import "ace-builds/src-noconflict/mode-json";
+import "ace-builds/src-noconflict/mode-json5";
+import "ace-builds/src-noconflict/theme-tomorrow_night";
+import "ace-builds/src-noconflict/theme-tomorrow";
+import "ace-builds/src-noconflict/ext-searchbox";
+import "ace-builds/src-noconflict/ext-language_tools";
+import "ace-builds/src-noconflict/mode-snippets";
 import "vue-cropper";
 import "jinrishici";
 import "vue-draggable-plus";
-import { DuxDrawerPage as w } from "../drawer/drawerPage.js";
+import { DuxDrawerPage as O } from "../drawer/drawerPage.js";
 import "aieditor";
-import { DuxFormLayout as l } from "./formLayout.js";
+import { DuxFormLayout as a } from "./formLayout.js";
 import "vee-validate";
 import "@vee-validate/i18n";
 import "colorizr";
@@ -31,21 +42,12 @@ import "@vee-validate/i18n/dist/locale/zh_CN.json";
 import "vue-command-palette";
 import "../../pages/page404.js";
 import "@iconify-json/tabler/icons.json";
-import "vue3-ace-editor";
-import "ace-builds/src-noconflict/mode-vue";
-import "ace-builds/src-noconflict/mode-javascript";
-import "ace-builds/src-noconflict/mode-html";
-import "ace-builds/src-noconflict/mode-json";
-import "ace-builds/src-noconflict/mode-json5";
-import "ace-builds/src-noconflict/theme-tomorrow_night";
-import "ace-builds/src-noconflict/theme-tomorrow";
-import "ace-builds/src-noconflict/ext-searchbox";
-import "ace-builds/src-noconflict/ext-language_tools";
-import "ace-builds/src-noconflict/mode-snippets";
-function d(t) {
-  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !E(t);
+import "../image/elements/index.js";
+import "fabric";
+function s(t) {
+  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !D(t);
 }
-const Nt = /* @__PURE__ */ b({
+const wt = /* @__PURE__ */ b({
   name: "DuxDrawerForm",
   props: {
     id: {
@@ -71,79 +73,79 @@ const Nt = /* @__PURE__ */ b({
     },
     onError: {
       type: Function
+    },
+    invalidate: {
+      type: String
     }
   },
-  extends: l,
+  extends: a,
   setup(t, {
-    slots: m
+    slots: c
   }) {
     const {
       t: r
-    } = N(), f = C(() => {
+    } = E(), l = v(() => {
       const {
         onClose: o,
-        onSuccess: e,
-        onError: n,
-        action: O,
-        title: P,
-        id: _,
-        path: k,
-        data: L,
+        onSuccess: i,
+        onError: P,
+        action: _,
+        title: k,
+        id: I,
+        path: L,
+        data: R,
         ...S
       } = t;
       return S;
-    }), p = F(t, "data", {}), c = j(), {
-      isLoading: a,
-      onSubmit: g,
-      onReset: s,
+    }), u = C(t, "data", {}), n = j(), {
+      invalidate: d
+    } = N(), {
+      isLoading: m,
+      onSubmit: f,
+      onReset: g,
       isEdit: y
     } = h({
       id: t.id,
       path: t.path,
-      form: p,
+      form: u,
       action: t.action,
       onError: (o) => {
-        var e;
-        c.error(o.message || r("components.form.error")), (e = t.onError) == null || e.call(t, o);
+        n.error(o.message || r("components.form.error")), t.onError?.(o);
       },
       onSuccess: (o) => {
-        var e, n;
-        c.success(r("components.form.success")), (e = t.onSuccess) == null || e.call(t, o), (n = t.onClose) == null || n.call(t);
+        n.success(r("components.form.success")), t.onSuccess?.(o), t.onClose?.(), t.invalidate && d(t.invalidate);
       }
     });
-    return () => i(w, {
+    return () => e(O, {
       scrollbar: !1,
-      title: (t == null ? void 0 : t.title) || (y.value ? r("components.form.edit") : r("components.form.create")),
-      onClose: t == null ? void 0 : t.onClose
+      title: t?.title || (y.value ? r("components.form.edit") : r("components.form.create")),
+      onClose: t?.onClose
     }, {
-      default: () => i(v, null, {
-        default: () => [i(l, D({
+      default: () => e(w, null, {
+        default: () => [e(a, x({
           class: "p-4"
-        }, f.value), {
-          default: () => {
-            var o;
-            return [(o = m == null ? void 0 : m.default) == null ? void 0 : o.call(m)];
-          }
+        }, l.value), {
+          default: () => [c?.default?.()]
         })]
       }),
       footer: () => {
-        let o, e;
-        return i(x, null, [i(u, {
-          onClick: s,
-          loading: a.value
-        }, d(o = r("components.button.reset")) ? o : {
+        let o, i;
+        return e(F, null, [e(p, {
+          onClick: g,
+          loading: m.value
+        }, s(o = r("components.button.reset")) ? o : {
           default: () => [o]
-        }), i(u, {
+        }), e(p, {
           type: "primary",
-          loading: a.value,
-          onClick: () => g()
-        }, d(e = r("components.button.submit")) ? e : {
-          default: () => [e]
+          loading: m.value,
+          onClick: () => f()
+        }, s(i = r("components.button.submit")) ? i : {
+          default: () => [i]
         })]);
       }
     });
   }
 });
 export {
-  Nt as DuxDrawerForm
+  wt as DuxDrawerForm
 };

package/dist/esm/components/form/formItem.js

@@ -1,4 +1,4 @@
-import { defineComponent as b, toRef as h, computed as a, watch as y, inject as q, createVNode as r, createTextVNode as j } from "vue";
+import { defineComponent as b, toRef as h, computed as a, watch as y, inject as q, createVNode as l, createTextVNode as j } from "vue";
 import { watchThrottled as S } from "@vueuse/core";
 import { useField as w } from "vee-validate";
 const F = /* @__PURE__ */ b({
@@ -24,68 +24,62 @@ const F = /* @__PURE__ */ b({
     message: [String, Object]
   },
   setup(e, {
-    slots: i
+    slots: d
   }) {
-    const c = h(e.message), f = a(() => {
-      var t;
-      return typeof e.rule == "object" ? {
-        ...e.rule,
-        required: !!e.required
-      } : typeof e.rule == "string" ? (t = e.rule) != null && t.includes("required") ? e.rule : e.rule ? `${e.rule}|required` : "required" : e.rule;
-    }), {
-      errorMessage: d,
-      value: m,
-      setErrors: g,
-      validate: s
-    } = w(e.path || "", f.value || {}, {
+    const s = h(e.message), c = a(() => typeof e.rule == "object" ? {
+      ...e.rule,
+      required: !!e.required
+    } : typeof e.rule == "string" ? e.rule?.includes("required") ? e.rule : e.rule ? `${e.rule}|required` : "required" : e.rule), {
+      errorMessage: n,
+      value: f,
+      setErrors: m,
+      validate: g
+    } = w(e.path || "", c.value || {}, {
       label: e.label
-    }), v = a(() => e.required ? !0 : e.rule ? typeof e.rule == "string" ? e.rule.includes("required") : typeof e.rule == "object" ? "required" in e.rule : !1 : !1), n = a(() => d.value && (c.value || d.value));
-    y(n, (t) => {
-      t && g(t);
+    }), v = a(() => e.required ? !0 : e.rule ? typeof e.rule == "string" ? e.rule.includes("required") : typeof e.rule == "object" ? "required" in e.rule : !1 : !1), u = a(() => n.value && (s.value || n.value));
+    y(u, (r) => {
+      r && m(r);
     }, {
       immediate: !0
-    }), S(m, (t) => {
-      t && s();
+    }), S(f, (r) => {
+      r && g();
     }, {
       throttle: 300,
       deep: !0
     });
-    const u = q("dux.form", {
+    const i = q("dux.form", {
       labelPlacement: "left",
       labelAlign: "left",
       labelWidth: 70,
       divider: !1
-    }), l = a(() => e.labelPlacement || u.labelPlacement), o = a(() => {
-      let t = e.labelWidth || u.labelWidth || 70;
-      return typeof t == "number" && (t = `${t}px`), l.value !== "left" ? "auto" : t;
-    }), x = a(() => u.divider || l.value === "page");
-    return () => {
-      var t;
-      return r("div", {
-        class: [l.value !== "top" ? "md:flex-row gap-2 lg:items-center" : "gap-1", x.value ? "py-6" : "", l.value === "setting" ? "md:justify-between md:items-start md:gap-4" : "", l.value === "page" ? "grid grid-cols-1 lg:grid-cols-4 px-4" : "flex flex-col"]
-      }, [r("div", {
-        class: [l.value === "left" ? "flex lg:items-center" : "", l.value === "left" && u.labelAlign === "right" ? "justify-end" : ""],
-        style: {
-          width: o.value
-        }
-      }, [r("div", {
-        class: "flex flex-col"
-      }, [r("div", null, [r("span", {
-        class: "relative flex items-center gap-1"
-      }, [e.label, v.value && r("span", {
-        class: "text-error font-mono text-xs"
-      }, [j("*")])])]), e.description && (l.value === "setting" || l.value === "page") && r("div", {
-        class: "text-sm text-muted"
-      }, [e.description])])]), r("div", {
-        class: ["flex flex-col gap-1", l.value !== "left" ? "md:mt-1" : "", l.value === "setting" ? "flex-none md:w-40%" : "flex-1", l.value === "page" ? "col-span-3" : ""]
-      }, [r("div", {
-        class: l.value === "setting" ? "flex-1 lg:flex lg:justify-end" : ""
-      }, [(t = i == null ? void 0 : i.default) == null ? void 0 : t.call(i)]), e.description && l.value === "left" && r("div", {
-        class: "text-sm text-muted"
-      }, [e.description]), n.value && r("div", {
-        class: "text-error"
-      }, [n.value])])]);
-    };
+    }), t = a(() => e.labelPlacement || i.labelPlacement), o = a(() => {
+      let r = e.labelWidth || i.labelWidth || 70;
+      return typeof r == "number" && (r = `${r}px`), t.value !== "left" ? "auto" : r;
+    }), x = a(() => i.divider || t.value === "page");
+    return () => l("div", {
+      class: [t.value !== "top" ? "md:flex-row gap-2 lg:items-center" : "gap-1", x.value ? "py-6" : "", t.value === "setting" ? "md:justify-between md:items-start md:gap-4" : "", t.value === "page" ? "grid grid-cols-1 lg:grid-cols-4 px-4" : "flex flex-col"]
+    }, [l("div", {
+      class: [t.value === "left" ? "flex lg:items-center" : "", t.value === "left" && i.labelAlign === "right" ? "justify-end" : ""],
+      style: {
+        width: o.value
+      }
+    }, [l("div", {
+      class: "flex flex-col"
+    }, [l("div", null, [l("span", {
+      class: "relative flex items-center gap-1"
+    }, [e.label, v.value && l("span", {
+      class: "text-error font-mono text-xs"
+    }, [j("*")])])]), e.description && (t.value === "setting" || t.value === "page") && l("div", {
+      class: "text-sm text-muted"
+    }, [e.description])])]), l("div", {
+      class: ["flex flex-col gap-1", t.value !== "left" ? "md:mt-1" : "", t.value === "setting" ? "flex-none md:w-40%" : "flex-1", t.value === "page" ? "col-span-3" : ""]
+    }, [l("div", {
+      class: t.value === "setting" ? "flex-1 lg:flex lg:justify-end" : ""
+    }, [d?.default?.()]), e.description && t.value === "left" && l("div", {
+      class: "text-sm text-muted"
+    }, [e.description]), u.value && l("div", {
+      class: "text-error"
+    }, [u.value])])]);
   }
 });
 export {

package/dist/esm/components/form/formLayout.js

@@ -1,5 +1,5 @@
-import { defineComponent as i, provide as d, createVNode as t } from "vue";
-const f = /* @__PURE__ */ i({
+import { defineComponent as a, provide as t, createVNode as i } from "vue";
+const n = /* @__PURE__ */ a({
   name: "DuxFormLayout",
   props: {
     labelPlacement: {
@@ -25,19 +25,16 @@ const f = /* @__PURE__ */ i({
   setup(e, {
     slots: l
   }) {
-    return d("dux.form", {
+    return t("dux.form", {
       labelPlacement: e.labelPlacement,
       labelAlign: e.labelAlign,
       labelWidth: e.labelWidth,
       divider: e.divider
-    }), () => {
-      var a;
-      return t("div", {
-        class: ["flex ", e.divider || e.labelPlacement === "page" ? " divide-y divide-default dark:divide-gray-800" : "", e.inline ? "flex-row" : "flex-col", e.labelPlacement === "page" || e.labelPlacement === "setting" ? "container mx-auto" : "gap-4"]
-      }, [(a = l == null ? void 0 : l.default) == null ? void 0 : a.call(l)]);
-    };
+    }), () => i("div", {
+      class: ["flex ", e.divider || e.labelPlacement === "page" ? " divide-y divide-default dark:divide-gray-800" : "", e.inline ? "flex-row" : "flex-col", e.labelPlacement === "page" || e.labelPlacement === "setting" ? "container mx-auto" : "gap-4"]
+    }, [l?.default?.()]);
   }
 });
 export {
-  f as DuxFormLayout
+  n as DuxFormLayout
 };

package/dist/esm/components/form/modalForm.js

@@ -1,6 +1,6 @@
-import { defineComponent as s, computed as C, toRef as F, createVNode as n, Fragment as x, isVNode as E } from "vue";
-import { useI18n as h, useExtendForm as j } from "@duxweb/dvha-core";
-import { useMessage as v, NButton as a } from "naive-ui";
+import { defineComponent as b, computed as v, toRef as C, createVNode as i, Fragment as F, isVNode as x } from "vue";
+import { useI18n as E, useInvalidate as h, useExtendForm as j } from "@duxweb/dvha-core";
+import { useMessage as D, NButton as p } from "naive-ui";
 import "clsx";
 import "vue-echarts";
 import "vue-router";
@@ -12,12 +12,23 @@ import "@tanstack/vue-query";
 import "@duxweb/dvha-naiveui";
 import "@vueuse/core";
 import "pinia";
+import "vue3-ace-editor";
+import "ace-builds/src-noconflict/mode-vue";
+import "ace-builds/src-noconflict/mode-javascript";
+import "ace-builds/src-noconflict/mode-html";
+import "ace-builds/src-noconflict/mode-json";
+import "ace-builds/src-noconflict/mode-json5";
+import "ace-builds/src-noconflict/theme-tomorrow_night";
+import "ace-builds/src-noconflict/theme-tomorrow";
+import "ace-builds/src-noconflict/ext-searchbox";
+import "ace-builds/src-noconflict/ext-language_tools";
+import "ace-builds/src-noconflict/mode-snippets";
 import "vue-cropper";
-import D from "../modal/modalPage.js";
+import M from "../modal/modalPage.js";
 import "jinrishici";
 import "vue-draggable-plus";
 import "aieditor";
-import { DuxFormLayout as d } from "./formLayout.js";
+import { DuxFormLayout as a } from "./formLayout.js";
 import "vee-validate";
 import "@vee-validate/i18n";
 import "colorizr";
@@ -31,21 +42,12 @@ import "@vee-validate/i18n/dist/locale/zh_CN.json";
 import "vue-command-palette";
 import "../../pages/page404.js";
 import "@iconify-json/tabler/icons.json";
-import "vue3-ace-editor";
-import "ace-builds/src-noconflict/mode-vue";
-import "ace-builds/src-noconflict/mode-javascript";
-import "ace-builds/src-noconflict/mode-html";
-import "ace-builds/src-noconflict/mode-json";
-import "ace-builds/src-noconflict/mode-json5";
-import "ace-builds/src-noconflict/theme-tomorrow_night";
-import "ace-builds/src-noconflict/theme-tomorrow";
-import "ace-builds/src-noconflict/ext-searchbox";
-import "ace-builds/src-noconflict/ext-language_tools";
-import "ace-builds/src-noconflict/mode-snippets";
-function l(t) {
-  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !E(t);
+import "../image/elements/index.js";
+import "fabric";
+function c(t) {
+  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !x(t);
 }
-const Et = /* @__PURE__ */ s({
+const Dt = /* @__PURE__ */ b({
   name: "DuxModalForm",
   props: {
     id: {
@@ -66,6 +68,9 @@ const Et = /* @__PURE__ */ s({
     title: {
       type: String
     },
+    invalidate: {
+      type: String
+    },
     onSuccess: {
       type: Function
     },
@@ -73,72 +78,69 @@ const Et = /* @__PURE__ */ s({
       type: Function
     }
   },
-  extends: d,
+  extends: a,
   setup(t, {
-    slots: m
+    slots: s
   }) {
     const {
-      t: i
-    } = h(), f = C(() => {
+      t: e
+    } = E(), u = v(() => {
       const {
         onClose: o,
-        onSuccess: e,
-        onError: r,
-        action: M,
-        title: N,
-        id: O,
-        path: _,
-        data: k,
-        ...b
+        onSuccess: r,
+        onError: N,
+        action: O,
+        title: _,
+        id: k,
+        path: I,
+        data: L,
+        ...S
       } = t;
-      return b;
-    }), p = F(t, "data", {}), c = v(), {
-      isLoading: u,
-      onSubmit: g,
-      onReset: y,
-      isEdit: S
+      return S;
+    }), l = C(t, "data", {}), n = D(), {
+      invalidate: d
+    } = h(), {
+      isLoading: m,
+      onSubmit: f,
+      onReset: g,
+      isEdit: y
     } = j({
       id: t.id,
       path: t.path,
-      form: p,
+      form: l,
       action: t.action,
       onError: (o) => {
-        var e;
-        c.error(o.message || i("components.form.error")), (e = t.onError) == null || e.call(t, o);
+        n.error(o.message || e("components.form.error")), t.onError?.(o);
       },
       onSuccess: (o) => {
-        var e, r;
-        c.success(i("components.form.success")), (e = t.onSuccess) == null || e.call(t, o), (r = t.onClose) == null || r.call(t);
+        t.invalidate && d(t.invalidate), n.success(e("components.form.success")), t.onSuccess?.(o), t.onClose?.();
       }
     });
-    return () => n(D, {
-      title: (t == null ? void 0 : t.title) || (S.value ? i("components.form.edit") : i("components.form.create")),
-      onClose: t == null ? void 0 : t.onClose
+    return () => i(M, {
+      title: t?.title || (y.value ? e("components.form.edit") : e("components.form.create")),
+      onClose: t?.onClose
     }, {
-      default: () => n(d, f.value, {
-        default: () => {
-          var o;
-          return [(o = m == null ? void 0 : m.default) == null ? void 0 : o.call(m)];
-        }
+      default: () => i(a, u.value, {
+        default: () => [s?.default?.()]
       }),
       footer: () => {
-        let o, e;
-        return n(x, null, [n(a, {
-          onClick: y,
-          loading: u.value
-        }, l(o = i("components.button.reset")) ? o : {
+        let o, r;
+        return i(F, null, [i(p, {
+          onClick: g,
+          loading: m.value
+        }, c(o = e("components.button.reset")) ? o : {
           default: () => [o]
-        }), n(a, {
+        }), i(p, {
           type: "primary",
-          loading: u.value,
-          onClick: () => g()
-        }, l(e = i("components.button.submit")) ? e : {
-          default: () => [e]
+          loading: m.value,
+          onClick: () => f()
+        }, c(r = e("components.button.submit")) ? r : {
+          default: () => [r]
         })]);
       }
     });
   }
 });
 export {
-  Et as DuxModalForm
+  Dt as DuxModalForm
 };