@duxweb/dvha-pro 1.0.18 → 1.0.19

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

@@ -1,6 +1,6 @@
-import { defineComponent as p, computed as C, toRef as x, createVNode as m, Fragment as F, resolveComponent as a, mergeProps as E, isVNode as v } from "vue";
+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 D } from "naive-ui";
+import { useMessage as v, NButton as a } from "naive-ui";
 import "clsx";
 import "vue-echarts";
 import "vue-router";
@@ -13,12 +13,12 @@ import "@duxweb/dvha-naiveui";
 import "@vueuse/core";
 import "pinia";
 import "vue-cropper";
-import M from "../modal/modalPage.js";
+import D from "../modal/modalPage.js";
 import "jinrishici";
 import "vue-draggable-plus";
 import "aieditor";
 import "vee-validate";
-import { DuxFormLayout as l } from "./formLayout.js";
+import { DuxFormLayout as d } from "./formLayout.js";
 import "@vee-validate/i18n";
 import "colorizr";
 import "echarts";
@@ -31,10 +31,21 @@ import "@vee-validate/i18n/dist/locale/zh_CN.json";
 import "vue-command-palette";
 import "../../pages/page404.js";
 import "@iconify-json/tabler/icons.json";
-function d(t) {
-  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !v(t);
+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);
 }
-const ft = /* @__PURE__ */ p({
+const Et = /* @__PURE__ */ s({
   name: "DuxModalForm",
   props: {
     id: {
@@ -62,68 +73,66 @@ const ft = /* @__PURE__ */ p({
       type: Function
     }
   },
-  extends: l,
+  extends: d,
   setup(t, {
-    slots: i
+    slots: m
   }) {
     const {
-      t: n
+      t: i
     } = h(), f = C(() => {
       const {
         onClose: o,
         onSuccess: e,
         onError: r,
-        action: N,
-        title: O,
-        id: P,
+        action: M,
+        title: N,
+        id: O,
         path: _,
         data: k,
-        ...S
+        ...b
       } = t;
-      return S;
-    }), g = x(t, "data", {}), c = D(), {
+      return b;
+    }), p = F(t, "data", {}), c = v(), {
       isLoading: u,
-      onSubmit: y,
-      onReset: s,
-      isEdit: b
+      onSubmit: g,
+      onReset: y,
+      isEdit: S
     } = j({
       id: t.id,
       path: t.path,
-      form: g,
+      form: p,
       action: t.action,
       onError: (o) => {
         var e;
-        c.error(o.message || n("components.form.error")), (e = t.onError) == null || e.call(t, o);
+        c.error(o.message || i("components.form.error")), (e = t.onError) == null || e.call(t, o);
       },
       onSuccess: (o) => {
         var e, r;
-        c.success(n("components.form.success")), (e = t.onSuccess) == null || e.call(t, o), (r = t.onClose) == null || r.call(t);
+        c.success(i("components.form.success")), (e = t.onSuccess) == null || e.call(t, o), (r = t.onClose) == null || r.call(t);
       }
     });
-    return () => m(M, {
-      title: (t == null ? void 0 : t.title) || (b.value ? n("components.form.edit") : n("components.form.create")),
+    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
     }, {
-      default: () => m(l, E(f.value, {
-        class: "px-2 py-2"
-      }), {
+      default: () => n(d, f.value, {
         default: () => {
           var o;
-          return [(o = i == null ? void 0 : i.default) == null ? void 0 : o.call(i)];
+          return [(o = m == null ? void 0 : m.default) == null ? void 0 : o.call(m)];
         }
       }),
       footer: () => {
         let o, e;
-        return m(F, null, [m(a("n-button"), {
-          onClick: s,
+        return n(x, null, [n(a, {
+          onClick: y,
           loading: u.value
-        }, d(o = n("components.button.reset")) ? o : {
+        }, l(o = i("components.button.reset")) ? o : {
           default: () => [o]
-        }), m(a("n-button"), {
+        }), n(a, {
           type: "primary",
           loading: u.value,
-          onClick: y
-        }, d(e = n("components.button.submit")) ? e : {
+          onClick: () => g()
+        }, l(e = i("components.button.submit")) ? e : {
           default: () => [e]
         })]);
       }
@@ -131,5 +140,5 @@ const ft = /* @__PURE__ */ p({
   }
 });
 export {
-  ft as DuxModalForm
+  Et as DuxModalForm
 };

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

@@ -1,8 +1,9 @@
-import { defineComponent as p, toRef as d, createVNode as i } from "vue";
-import { useI18n as f, useExtendForm as g } from "@duxweb/dvha-core";
-import { useMessage as y, NButton as c } from "naive-ui";
+import { defineComponent as b, toRef as g, createVNode as i } from "vue";
+import { useI18n as x, useTabStore as y, useExtendForm as S } from "@duxweb/dvha-core";
+import { useMessage as s, NButton as p, NScrollbar as h } from "naive-ui";
+import { useRouter as E } from "vue-router";
 import "@overlastic/vue";
-import "vue-router";
+import { DuxCard as F } from "../card/card.js";
 import "clsx";
 import "vue-echarts";
 import "@vueuse/core";
@@ -12,8 +13,20 @@ import "lodash-es";
 import "vue-draggable-plus";
 import "aieditor";
 import "vee-validate";
+import { DuxFormLayout as v } from "./formLayout.js";
 import "@iconify-json/tabler/icons.json";
 import "mime";
+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 "dayjs";
 import "@tanstack/vue-query";
 import "@duxweb/dvha-naiveui";
@@ -28,9 +41,9 @@ import "unocss/preset-wind4";
 import "@vee-validate/i18n/dist/locale/en.json";
 import "@vee-validate/i18n/dist/locale/zh_CN.json";
 import "vue-command-palette";
-import { DuxPage as b } from "../../pages/page.js";
+import { DuxPage as C } from "../../pages/page.js";
 import "../../pages/page404.js";
-const W = /* @__PURE__ */ p({
+const xt = /* @__PURE__ */ b({
   name: "DuxPageForm",
   props: {
     id: {
@@ -39,6 +52,12 @@ const W = /* @__PURE__ */ p({
     action: {
       type: String
     },
+    title: {
+      type: String
+    },
+    description: {
+      type: String
+    },
     path: {
       type: String
     },
@@ -57,54 +76,73 @@ const W = /* @__PURE__ */ p({
     }
   },
   setup(t, {
-    slots: e
+    slots: r
   }) {
     const {
       t: o
-    } = f(), u = d(t, "data", {}), n = y(), a = g({
+    } = x(), d = g(t, "data", {}), u = s(), l = E(), n = y(), m = S({
       id: t.id,
       path: t.path,
-      form: u,
+      form: d,
       action: t.action,
-      onError: (r) => {
-        var m;
-        n.error(r.message || o("components.form.error")), (m = t.onError) == null || m.call(t, r);
+      onError: (e) => {
+        var a;
+        u.error(e.message || o("components.form.error")), (a = t.onError) == null || a.call(t, e);
       },
-      onSuccess: (r) => {
-        var m;
-        n.success(o("components.form.success")), (m = t.onSuccess) == null || m.call(t, r);
+      onSuccess: (e) => {
+        var a;
+        u.success(o("components.form.success")), (a = t.onSuccess) == null || a.call(t, e), !m.isEdit.value && n.current && n.delTab(n.current, (f) => l.push(f.path || ""));
       }
-    });
-    return () => i(b, {
-      card: !1
+    }), c = n.tabs.find((e) => e.path === n.current);
+    return () => i(C, {
+      card: !1,
+      scrollbar: !1
     }, {
-      default: () => {
-        var r;
-        return (r = e == null ? void 0 : e.default) == null ? void 0 : r.call(e, a);
-      },
-      actions: () => {
-        var r;
-        return i("div", {
-          class: "flex gap-6 items-center"
-        }, [(r = e == null ? void 0 : e.actions) == null ? void 0 : r.call(e, a), i("div", {
-          class: "flex gap-2"
-        }, [i(c, null, {
-          default: () => o("components.button.reset"),
-          icon: () => i("i", {
-            class: "i-tabler:refresh"
-          }, null)
-        }), i(c, {
-          type: "primary"
-        }, {
-          default: () => o("components.button.submit"),
-          icon: () => i("i", {
-            class: "i-tabler:send"
-          }, null)
-        })])]);
-      }
+      default: () => [i(F, {
+        title: (t == null ? void 0 : t.title) || (c == null ? void 0 : c.label) || (m.isEdit.value ? o("components.form.edit") : o("components.form.create")),
+        description: t == null ? void 0 : t.description,
+        class: "h-full flex flex-col",
+        contentClass: "flex-1 min-h-0",
+        contentSize: "none",
+        "header-bordered": !0
+      }, {
+        default: () => i(h, null, {
+          default: () => [i(v, {
+            "label-placement": "page"
+          }, {
+            default: () => {
+              var e;
+              return [(e = r == null ? void 0 : r.default) == null ? void 0 : e.call(r, m)];
+            }
+          })]
+        }),
+        headerExtra: () => {
+          var e;
+          return i("div", {
+            class: "flex gap-6 items-center"
+          }, [(e = r == null ? void 0 : r.actions) == null ? void 0 : e.call(r, m), i("div", {
+            class: "flex gap-2"
+          }, [i(p, {
+            onClick: () => m.onReset()
+          }, {
+            default: () => o("components.button.reset"),
+            icon: () => i("i", {
+              class: "i-tabler:refresh"
+            }, null)
+          }), i(p, {
+            type: "primary",
+            onClick: () => m.onSubmit()
+          }, {
+            default: () => o("components.button.submit"),
+            icon: () => i("i", {
+              class: "i-tabler:device-floppy"
+            }, null)
+          })])]);
+        }
+      })]
     });
   }
 });
 export {
-  W as DuxPageForm
+  xt as DuxPageForm
 };

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

@@ -1,4 +1,4 @@
-import { defineComponent as d, ref as l, toRef as p, computed as g, createVNode as r } from "vue";
+import { defineComponent as f, ref as d, toRef as l, computed as g, createVNode as i } from "vue";
 import { useI18n as x, useExtendForm as y } from "@duxweb/dvha-core";
 import { useMessage as S, NTabs as b } from "naive-ui";
 import "@overlastic/vue";
@@ -14,6 +14,17 @@ import "aieditor";
 import "vee-validate";
 import "@iconify-json/tabler/icons.json";
 import "mime";
+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 "dayjs";
 import "@tanstack/vue-query";
 import "@duxweb/dvha-naiveui";
@@ -30,7 +41,7 @@ import "@vee-validate/i18n/dist/locale/zh_CN.json";
 import "vue-command-palette";
 import { DuxPage as v } from "../../pages/page.js";
 import "../../pages/page404.js";
-const _ = /* @__PURE__ */ d({
+const ct = /* @__PURE__ */ f({
   name: "DuxSettingForm",
   props: {
     id: {
@@ -67,22 +78,22 @@ const _ = /* @__PURE__ */ d({
   setup(t, {
     slots: e
   }) {
-    const i = l(t.defaultTab), c = p(t, "data", {}), {
+    const a = d(t.defaultTab), c = l(t, "data", {}), {
       t: o
     } = x(), n = S(), u = y({
       id: t.id,
       path: t.path,
       form: c,
       action: t.action,
-      onError: (a) => {
+      onError: (r) => {
         var m;
-        n.error(a.message || o("components.form.error")), (m = t.onError) == null || m.call(t, a);
+        n.error(r.message || o("components.form.error")), (m = t.onError) == null || m.call(t, r);
       },
-      onSuccess: (a) => {
+      onSuccess: (r) => {
         var m;
-        n.success(o("components.form.success")), (m = t.onSuccess) == null || m.call(t, a);
+        n.success(o("components.form.success")), (m = t.onSuccess) == null || m.call(t, r);
       }
-    }), f = g(() => {
+    }), p = g(() => {
       switch (t.size) {
         case "small":
           return "lg:max-w-lg";
@@ -93,16 +104,16 @@ const _ = /* @__PURE__ */ d({
           return "lg:max-w-2xl";
       }
     });
-    return () => r(v, null, {
+    return () => i(v, null, {
       default: () => {
-        var a;
-        return [r("div", {
-          class: `flex flex-col gap-6 w-full ${f.value} mx-auto py-4`
-        }, [t.tabs ? r(b, {
+        var r;
+        return [i("div", {
+          class: `flex flex-col gap-6 w-full ${p.value} mx-auto py-4`
+        }, [t.tabs ? i(b, {
           defaultValue: t.defaultTab,
-          value: i.value,
+          value: a.value,
           onUpdateValue: (m) => {
-            i.value = m;
+            a.value = m;
           },
           type: "segment"
         }, {
@@ -110,11 +121,11 @@ const _ = /* @__PURE__ */ d({
             var m;
             return [(m = e == null ? void 0 : e.default) == null ? void 0 : m.call(e, u)];
           }
-        }) : (a = e == null ? void 0 : e.default) == null ? void 0 : a.call(e, u)])];
+        }) : (r = e == null ? void 0 : e.default) == null ? void 0 : r.call(e, u)])];
       }
     });
   }
 });
 export {
-  _ as DuxSettingForm
+  ct as DuxSettingForm
 };

package/dist/esm/components/icon/icon.js

@@ -26,33 +26,44 @@ import "@duxweb/dvha-naiveui";
 import "../../pages/page404.js";
 import "@iconify-json/tabler/icons.json";
 import "mime";
+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 { useModal as c } from "../../hooks/modal.js";
 import "dayjs";
 import "@tanstack/vue-query";
 import "pinia";
-const O = /* @__PURE__ */ n({
+const to = /* @__PURE__ */ n({
   name: "DuxIconPicker",
   props: {
     defaultValue: String,
     value: String
   },
-  setup(i, {
+  setup(r, {
     emit: m
   }) {
-    const o = a(i, "value", m, {
-      defaultValue: i.defaultValue,
+    const o = a(r, "value", m, {
+      defaultValue: r.defaultValue,
       passive: !0
     }), p = c(), {
-      t: r
+      t: e
     } = l();
     return () => t(u, {
       dashed: !o.value,
       onClick: () => {
         p.show({
-          title: r("components.iconPicker.title"),
+          title: e("components.iconPicker.title"),
           component: () => import("./iconPicker.js")
-        }).then((e) => {
-          o.value = e;
+        }).then((i) => {
+          o.value = i;
         });
       },
       iconPlacement: "right"
@@ -61,11 +72,11 @@ const O = /* @__PURE__ */ n({
         class: "flex gap-2 items-center"
       }, [o.value ? t("div", {
         class: `size-4 ${o.value || ""}`
-      }, null) : void 0, r("components.iconPicker.title")]),
+      }, null) : void 0, e("components.iconPicker.title")]),
       icon: () => o.value ? t("div", {
         class: "rounded-full p-1 hover:bg-gray-2 hover:text-gray-7",
-        onClick: (e) => {
-          e.stopPropagation(), o.value = void 0;
+        onClick: (i) => {
+          i.stopPropagation(), o.value = void 0;
         }
       }, [t("div", {
         class: "size-4 i-tabler:x"
@@ -74,5 +85,5 @@ const O = /* @__PURE__ */ n({
   }
 });
 export {
-  O as DuxIconPicker
+  to as DuxIconPicker
 };

package/dist/esm/components/layout/filter.js

@@ -1,5 +1,5 @@
-import { defineComponent as n, createVNode as a } from "vue";
-const i = /* @__PURE__ */ n({
+import { defineComponent as n, inject as r, createVNode as l } from "vue";
+const c = /* @__PURE__ */ n({
   name: "DuxTableFilter",
   props: {
     label: {
@@ -7,21 +7,25 @@ const i = /* @__PURE__ */ n({
       default: ""
     }
   },
-  setup(l, {
+  setup(a, {
     slots: e
   }) {
+    const t = r("dux.filter", {
+      showLabel: !1,
+      labelPlacement: "left"
+    });
     return () => {
-      var t;
-      return a("div", {
-        class: "flex gap-2 gap-2 flex-nowrap items-center"
-      }, [l.label && a("div", {
+      var f;
+      return l("div", {
+        class: ["flex gap-2 gap-2 flex-nowrap", t.labelPlacement === "left" ? "flex-row items-center" : "flex-col"]
+      }, [t.showLabel && a.label && l("div", {
         class: "text-sm text-default whitespace-nowrap"
-      }, [l.label]), a("div", {
-        class: "flex-1 lg:flex-none min-w-20"
-      }, [(t = e.default) == null ? void 0 : t.call(e)])]);
+      }, [a.label]), l("div", {
+        class: "flex-1 min-w-60"
+      }, [(f = e.default) == null ? void 0 : f.call(e)])]);
     };
   }
 });
 export {
-  i as DuxTableFilter
+  c as DuxTableFilter
 };

package/dist/esm/components/layout/filterLayout.js

@@ -0,0 +1,34 @@
+import { defineComponent as t, provide as o, createVNode as f } from "vue";
+const r = /* @__PURE__ */ t({
+  name: "DuxFilterLayout",
+  props: {
+    showLabel: {
+      type: Boolean,
+      default: !1
+    },
+    labelPlacement: {
+      type: String,
+      default: "left"
+    },
+    horizontal: {
+      type: Boolean,
+      default: !1
+    }
+  },
+  setup(e, {
+    slots: l
+  }) {
+    return o("dux.filter", {
+      showLabel: e.showLabel,
+      labelPlacement: e.labelPlacement
+    }), () => {
+      var a;
+      return f("div", {
+        class: ["flex flex-col gap-2", e.horizontal ? "flex-row" : "flex-col"]
+      }, [(a = l.default) == null ? void 0 : a.call(l)]);
+    };
+  }
+});
+export {
+  r as DuxFilterLayout
+};