@duxweb/dvha-pro 1.1.5 → 1.1.6

package/dist/esm/components/tree/treeFilter.js

@@ -1,10 +1,10 @@
-import { defineComponent as q, toRef as S, ref as u, watch as V, computed as C, createVNode as n, mergeProps as G, Fragment as H } from "vue";
-import { useI18n as J, useTree as Q, useCustomMutation as W } from "@duxweb/dvha-core";
+import { defineComponent as Y, toRef as w, ref as u, watch as C, computed as K, createVNode as n, mergeProps as q, Fragment as G } from "vue";
+import { useI18n as H, useTree as Q, useCustomMutation as W } from "@duxweb/dvha-core";
 import { useVModel as Z } from "@vueuse/core";
 import $ from "clsx";
-import { NTree as K, NInput as ee, NButton as le, NScrollbar as te, NSpin as ne, NDropdown as ae } from "naive-ui";
+import { NTree as N, NInput as ee, NButton as le, NScrollbar as te, NSpin as ne, NDropdown as ae } from "naive-ui";
 import { DuxCard as ie } from "../card/card.js";
-const fe = /* @__PURE__ */ q({
+const fe = /* @__PURE__ */ Y({
   name: "DuxTreeFilter",
   props: {
     title: String,
@@ -24,32 +24,32 @@ const fe = /* @__PURE__ */ q({
       default: !1
     }
   },
-  extends: K,
+  extends: N,
   setup(t, {
     emit: T,
     slots: b
   }) {
-    const w = Z(t, "value", T, {
+    const F = Z(t, "value", T, {
       passive: !1,
       defaultValue: t.defaultValue
-    }), U = S(t, "params", {}), A = S(t, "path", ""), I = S(t, "sortPath", ""), F = u(), P = u(0), k = u(0), r = u([]), y = u(), {
-      t: N
-    } = J(), {
-      options: E,
-      loading: B,
-      expanded: j
+    }), U = w(t, "params", {}), A = w(t, "path", ""), I = w(t, "sortPath", ""), k = u(), P = u(0), O = u(0), o = u([]), y = u(), {
+      t: E
+    } = H(), {
+      options: B,
+      loading: j,
+      expanded: L
     } = Q({
       path: A.value,
       params: U.value,
       ...t.treeOptions
     });
-    V(E, (e) => {
-      r.value = e;
+    C(B, (e) => {
+      o.value = e;
     }, {
       immediate: !0,
       deep: !0
     });
-    const p = u(!1), L = C(() => t.menus?.map((e) => ({
+    const p = u(!1), g = K(() => t.menus?.map((e) => ({
       label: e.label,
       key: e.value,
       icon: e?.icon ? () => n("div", {
@@ -58,34 +58,34 @@ const fe = /* @__PURE__ */ q({
       onSelect: e.onSelect
     })) || []), M = (e) => {
       const l = t.menus?.find((a) => a.value === e);
-      l && l.onSelect(F.value), p.value = !1;
+      l && l.onSelect(k.value), p.value = !1;
     }, _ = W({
       path: I.value,
       method: "POST"
-    }), g = (e, l) => {
+    }), S = (e, l) => {
       for (const a of e)
         if (a.children) {
           for (const i of a.children)
             if (i.id === l)
               return a;
-          const o = g(a.children, l);
-          if (o)
-            return o;
+          const r = S(a.children, l);
+          if (r)
+            return r;
         }
     }, z = ({
       node: e,
       dragNode: l,
       dropPosition: a
     }) => {
-      const o = g(r.value, l.id), i = !o, m = [...r.value];
+      const r = S(o.value, l.id), i = !r, m = [...o.value];
       if (i) {
-        const d = r.value.findIndex((O) => O.id === l.id);
+        const d = o.value.findIndex((V) => V.id === l.id);
         d >= 0 && m.splice(d, 1);
       } else {
-        const d = o?.children?.indexOf(l) || 0;
-        o?.children?.splice(d, 1);
+        const d = r?.children?.indexOf(l) || 0;
+        r?.children?.splice(d, 1);
       }
-      let h = g(m, e.id), x, s = h?.children || m, c = 0;
+      let h = S(m, e.id), x, s = h?.children || m, c = 0;
       switch (a) {
         case "before":
           c = s.findIndex((d) => d.id === e.id), c > 0 && (x = s[c - 1].id);
@@ -97,7 +97,7 @@ const fe = /* @__PURE__ */ q({
           c = s.findIndex((d) => d.id === e.id) + 1, x = e.id;
           break;
       }
-      s.splice(c, 0, l), r.value = m, _.mutate({
+      s.splice(c, 0, l), o.value = m, _.mutate({
         payload: {
           parent_id: h?.id,
           before_id: x,
@@ -105,26 +105,26 @@ const fe = /* @__PURE__ */ q({
         }
       });
     }, f = u([]), v = u(!1);
-    V(j, (e) => {
+    C(L, (e) => {
       f?.value?.length > 0 || (v.value = e.length > 0, f.value = e);
     }, {
       immediate: !0
     });
     const D = (e) => {
-      const l = [], a = (o) => {
-        o.forEach((i) => {
+      const l = [], a = (r) => {
+        r.forEach((i) => {
           i.children && i.children.length > 0 && (l.push(i.key || i.id), a(i.children));
         });
       };
       return a(e), l;
-    }, R = () => {
-      v.value ? (f.value = [], v.value = !1) : (f.value = D(r.value), v.value = !0);
-    }, X = C(() => {
+    }, J = () => {
+      v.value ? (f.value = [], v.value = !1) : (f.value = D(o.value), v.value = !0);
+    }, R = K(() => {
       const {
         title: e,
         path: l,
         sortPath: a,
-        params: o,
+        params: r,
         menus: i,
         numField: m,
         iconField: h,
@@ -132,10 +132,10 @@ const fe = /* @__PURE__ */ q({
         value: s,
         defaultValue: c,
         onUpdateValue: d,
-        bordered: O,
-        ...Y
+        bordered: V,
+        ...X
       } = t;
-      return Y;
+      return X;
     });
     return () => n(ie, {
       class: "h-full",
@@ -151,11 +151,11 @@ const fe = /* @__PURE__ */ q({
       }, [b.header ? b.header() : n(ee, {
         value: y.value,
         "onUpdate:value": (e) => y.value = e,
-        placeholder: N("common.keyword")
+        placeholder: E("common.keyword")
       }, {
         prefix: () => n(le, {
           text: !0,
-          onClick: R,
+          onClick: J,
           class: "mr-1!"
         }, {
           icon: () => n("div", {
@@ -169,27 +169,28 @@ const fe = /* @__PURE__ */ q({
         default: () => [n("div", {
           class: "p-2"
         }, [n(ne, {
-          show: B.value,
+          show: j.value,
           class: "h-full"
         }, {
-          default: () => [n(K, G(X.value, {
-            data: r.value || [],
+          default: () => [n(N, q(R.value, {
+            key: JSON.stringify(o.value),
+            data: o.value || [],
             expandedKeys: f.value,
             onUpdateExpandedKeys: (e) => {
               f.value = e;
-              const l = D(r.value);
+              const l = D(o.value);
               v.value = l.length > 0 && l.every((a) => e.includes(a));
             },
             blockLine: !0,
-            selectedKeys: w.value,
+            selectedKeys: F.value,
             onUpdateSelectedKeys: (e) => {
-              w.value = e, t?.onUpdateValue?.(e);
+              F.value = e, t?.onUpdateValue?.(e);
             },
             onDrop: z,
             pattern: y.value,
             renderPrefix: t?.numField || t?.iconField ? ({
               option: e
-            }) => n(H, null, [t.iconField && e[t.iconField] && n("div", {
+            }) => n(G, null, [t.iconField && e[t.iconField] && n("div", {
               class: $(e[t.iconField] || "", "size-4")
             }, null), t.numField && n("div", {
               class: "rounded-full bg-primary px-2 text-xs text-white"
@@ -198,18 +199,18 @@ const fe = /* @__PURE__ */ q({
               option: e
             }) => ({
               onContextmenu: (l) => {
-                F.value = e, p.value = !0, P.value = l.clientX, k.value = l.clientY, l.preventDefault();
+                g.value?.length && (k.value = e, p.value = !0, P.value = l.clientX, O.value = l.clientY, l.preventDefault());
               }
             })
           }), null)]
         })])]
-      }), n(ae, {
+      }), g.value?.length > 0 && n(ae, {
         trigger: "manual",
         placement: "bottom-start",
         show: p.value,
-        options: L.value,
+        options: g.value,
         x: P.value,
-        y: k.value,
+        y: O.value,
         width: 100,
         onSelect: M,
         onClickoutside: () => {

package/dist/esm/components/upload/file.js

@@ -1,7 +1,7 @@
 import { defineComponent as U, ref as c, computed as s, watch as b, nextTick as w, createVNode as o, Fragment as Z, createTextVNode as j, isVNode as O } from "vue";
 import { useI18n as B, useUpload as T } from "@duxweb/dvha-core";
-import { useVModel as X, useDropZone as E } from "@vueuse/core";
-import L from "mime";
+import { useVModel as X, useDropZone as L } from "@vueuse/core";
+import E from "mime";
 import { useMessage as I, NDataTable as W, NProgress as G, NButton as F } from "naive-ui";
 import "vue-router";
 import "@overlastic/vue";
@@ -130,6 +130,7 @@ const d = {
   setup(t, {
     emit: S
   }) {
+    console.log("props", t);
     const u = X(t, "value", S, {
       passive: !0,
       deep: !0,
@@ -148,7 +149,7 @@ const d = {
       uploadPath: t?.path,
       managePath: t?.managePath,
       method: t?.method
-    }), n = T({
+    }), l = T({
       path: g.value,
       multiple: t.multiple,
       maxFileCount: t.maxNum,
@@ -159,29 +160,27 @@ const d = {
       driver: k.value,
       method: v.value
     }), {
-      isOverDropZone: x
-    } = E(f, {
+      isOverDropZone: h
+    } = L(f, {
       onDrop: (e) => {
-        e && e.length > 0 && n.addFiles(Array.from(e), "file");
+        e && e.length > 0 && l.addFiles(Array.from(e), "file");
       }
     }), p = c(!1);
-    b(n.dataFiles, (e) => {
+    b(l.dataFiles, (e) => {
       const i = t.multiple ? e : e[0];
       p.value = !0, u.value = i, t.onUpdateValue?.(i), w(() => {
         p.value = !1;
       });
     });
-    const h = s(() => t.accept ? t.accept.split(",").map((e) => {
+    const x = s(() => t.accept ? t.accept.split(",").map((e) => {
       const i = e.trim();
       if (d[i]) return d[i];
       if (i.includes("*")) {
         const A = i.split("/")[0];
-        return d[i] || a("common.fileExtension", {
-          ext: A.toUpperCase()
-        });
+        return d[i] || A.toUpperCase();
       }
-      const l = L.getExtension(i);
-      return l ? l.toUpperCase() : i;
+      const n = E.getExtension(i);
+      return n ? n.toUpperCase() : i;
     }).filter(Boolean).join(", ") : ""), z = s(() => ({
       pending: o("div", {
         class: "text-info"
@@ -195,13 +194,13 @@ const d = {
       error: o("div", {
         class: "text-error"
       }, [a("components.upload.status.error")])
-    })), D = s(() => [r.dropZone.base, x.value ? r.dropZone.active : r.dropZone.hover]), M = s(() => [n.uploadFiles.value.length === 0 && "border-b border-muted"]), y = c(!1);
+    })), D = s(() => [r.dropZone.base, h.value ? r.dropZone.active : r.dropZone.hover]), M = s(() => [l.uploadFiles.value.length === 0 && "border-b border-muted"]), y = c(!1);
     return b(u, (e) => {
       if (p.value || !e || !e?.length || y.value)
         return;
       y.value = !0;
       const i = Array.isArray(e) ? e : [e];
-      n.addDataFiles(i);
+      l.addDataFiles(i);
     }, {
       immediate: !0
     }), () => o("div", {
@@ -209,7 +208,7 @@ const d = {
     }, [o("div", {
       ref: f,
       class: D.value,
-      onClick: () => n.open()
+      onClick: () => l.open()
     }, [o("div", {
       class: r.content
     }, [o("div", {
@@ -231,7 +230,7 @@ const d = {
             }
           }
         }).then((i) => {
-          n.addDataFiles(i);
+          l.addDataFiles(i);
         }));
       }
     }, [o("div", {
@@ -240,10 +239,10 @@ const d = {
       class: r.text.title
     }, [a("components.upload.desc")]), o("div", {
       class: r.text.desc
-    }, [x.value ? o("span", {
+    }, [h.value ? o("span", {
       class: r.text.highlight
-    }, [a("components.upload.dropHere")]) : o(Z, null, [h.value ? a("components.upload.supportFormats", {
-      formats: h.value
+    }, [a("components.upload.dropHere")]) : o(Z, null, [x.value ? a("components.upload.supportFormats", {
+      formats: x.value
     }) : a("components.upload.allFormats"), j(","), " ", a("components.upload.maxSize", {
       size: m.value
     })])])])]), o(W, {
@@ -284,7 +283,7 @@ const d = {
         title: a("components.upload.actions"),
         width: 120,
         render: (e) => {
-          let i, l;
+          let i, n;
           return o("div", {
             class: r.table.actions
           }, [o(F, {
@@ -292,20 +291,20 @@ const d = {
             size: "small",
             text: !0,
             disabled: ["success", "error", "cancelled"].includes(e.status),
-            onClick: () => n.cancelFiles([e.id])
+            onClick: () => l.cancelFiles([e.id])
           }, P(i = a("components.upload.cancel")) ? i : {
             default: () => [i]
           }), o(F, {
             type: "error",
             size: "small",
             text: !0,
-            onClick: () => n.removeFiles([e.id])
-          }, P(l = a("components.upload.delete")) ? l : {
-            default: () => [l]
+            onClick: () => l.removeFiles([e.id])
+          }, P(n = a("components.upload.delete")) ? n : {
+            default: () => [n]
           })]);
         }
       }],
-      data: n.uploadFiles.value
+      data: l.uploadFiles.value
     }, {
       empty: () => o("div", {
         class: r.table.empty

package/dist/esm/components/upload/image.js

@@ -1,8 +1,8 @@
-import { defineComponent as U, computed as m, watch as c, ref as k, createVNode as a } from "vue";
+import { defineComponent as k, computed as n, watch as g, createVNode as r } from "vue";
 import { useI18n as w, useUpload as I } from "@duxweb/dvha-core";
 import { useVModel as V } from "@vueuse/core";
-import j from "clsx";
-import { useMessage as A, NImage as D, NButton as g, NProgress as B } from "naive-ui";
+import A from "clsx";
+import { useMessage as j, NImage as B, NButton as v, NProgress as D } from "naive-ui";
 import { VueDraggable as M } from "vue-draggable-plus";
 import "vue-router";
 import "@overlastic/vue";
@@ -63,7 +63,7 @@ import "dayjs";
 import { useImagePreview as q } from "../../hooks/image.js";
 import "@tanstack/vue-query";
 import "pinia";
-const Ze = /* @__PURE__ */ U({
+const Ze = /* @__PURE__ */ k({
   name: "DuxImageUpload",
   props: {
     path: {
@@ -95,14 +95,14 @@ const Ze = /* @__PURE__ */ U({
     method: String
   },
   setup(t, {
-    emit: v
+    emit: h
   }) {
-    const n = V(t, "value", v, {
+    const u = V(t, "value", h, {
       passive: !0,
       deep: !0,
       defaultValue: t.defaultValue
-    }), h = A(), f = q(), {
-      t: u
+    }), f = j(), b = q(), {
+      t: s
     } = w(), i = {
       container: "flex gap-2",
       imageItem: "size-80px rounded border border-muted relative group draggable flex items-center",
@@ -111,11 +111,11 @@ const Ze = /* @__PURE__ */ U({
       uploadContent: "flex-1 flex flex-col justify-center items-center gap-1 relative",
       progressContainer: "size-80px flex items-center justify-center rounded",
       progressBar: "absolute left-2 right-2 bottom-2"
-    }, b = m(() => t.maxSize), {
-      uploadPath: s,
-      managePath: x,
-      driver: y,
-      method: d
+    }, x = n(() => t.maxSize), {
+      uploadPath: d,
+      managePath: y,
+      driver: z,
+      method: p
     } = O({
       driver: t?.driver,
       signPath: t?.signPath,
@@ -123,119 +123,115 @@ const Ze = /* @__PURE__ */ U({
       uploadPath: t?.path,
       managePath: t?.managePath,
       method: t?.method
-    }), r = I({
-      path: s.value,
+    }), a = I({
+      path: d.value,
       multiple: t.multiple,
       maxFileCount: t.maxNum,
-      maxFileSize: b.value * 1024 * 1024,
+      maxFileSize: x.value * 1024 * 1024,
       autoUpload: !0,
       accept: "image/*",
-      method: d.value,
+      method: p.value,
       onError: (e) => {
-        h.error(e.message || u("components.upload.error"));
+        f.error(e.message || s("components.upload.error"));
       },
-      driver: y.value
+      driver: z.value
     });
-    c(r.dataFiles, (e) => {
+    g(a.dataFiles, (e) => {
       const o = t.multiple ? e?.map((l) => l.url) : e?.[0]?.url;
-      n.value = o, t.onUpdateValue?.(o);
+      u.value = o, t.onUpdateValue?.(o);
     });
-    const z = m(() => r.progress.value.totalPercent), F = m(() => r.isUploading.value), P = async () => {
-      r.open();
-    }, C = m(() => t.multiple ? t.maxNum && r.uploadFiles.value.length >= t.maxNum : !0), S = m(() => r.dataFiles.value?.map((e) => e.url)), N = L(), p = k(!1);
-    return c(n, (e) => {
-      if (!e || !e?.length || p.value)
-        return;
-      p.value = !0;
-      const o = typeof e == "string" ? [e] : Array.isArray(e) ? e : [];
-      r.addDataFiles(o.map((l) => ({
-        url: l
+    const F = n(() => a.progress.value.totalPercent), P = n(() => a.isUploading.value), C = async () => {
+      a.open();
+    }, S = n(() => t.multiple ? t.maxNum && a.uploadFiles.value.length >= t.maxNum : !0), N = n(() => a.dataFiles.value?.map((e) => e.url)), U = L();
+    return g(u, (e) => {
+      if (!e || !(Array.isArray(e) ? e.length : String(e).length)) return;
+      const o = typeof e == "string" ? [e] : Array.isArray(e) ? e : [], l = (a.dataFiles.value || []).map((m) => m.url).filter(Boolean), c = o.filter((m) => !l.includes(m));
+      c.length && a.addDataFiles(c.map((m) => ({
+        url: m
       })));
-    }, {
-      immediate: !0
-    }), () => a("div", null, [a(M, {
-      modelValue: r.uploadFiles.value,
-      "onUpdate:modelValue": (e) => r.uploadFiles.value = e,
+    }), () => r("div", null, [r(M, {
+      modelValue: a.uploadFiles.value,
+      "onUpdate:modelValue": (e) => a.uploadFiles.value = e,
       class: i.container,
       draggable: ".draggable"
     }, {
-      default: () => [r.uploadFiles.value?.map((e, o) => {
+      default: () => [a.uploadFiles.value?.map((e, o) => {
         const l = e.url || URL.createObjectURL(e.file);
-        return a("div", {
+        return r("div", {
           key: o,
-          class: j(i.imageItem)
-        }, [a(D, {
+          class: A(i.imageItem)
+        }, [r(B, {
           class: "z-0 rounded",
           objectFit: "scale-down",
           width: 78,
           height: 78,
           previewDisabled: !0,
           src: l
-        }, null), a("div", {
+        }, null), r("div", {
           class: i.imageOverlay
-        }, [e.status === "success" && a(g, {
+        }, [e.status === "success" && r(v, {
           quaternary: !0,
           circle: !0,
           size: "small",
-          renderIcon: () => a("div", {
+          renderIcon: () => r("div", {
             class: "n-icon i-tabler:eye"
           }, null),
-          onClick: () => f.show(S.value, o)
-        }, null), a(g, {
+          onClick: () => b.show(N.value, o)
+        }, null), r(v, {
           quaternary: !0,
           circle: !0,
           size: "small",
-          renderIcon: () => a("div", {
+          renderIcon: () => r("div", {
             class: "n-icon i-tabler:trash"
           }, null),
           onClick: () => {
-            r.removeFiles([e.id]);
+            a.removeFiles([e.id]);
           }
         }, null)])]);
-      }), (r.uploadFiles.value.length === 0 || !C.value) && a("div", {
+      }), (a.uploadFiles.value.length === 0 || !S.value) && r("div", {
         class: i.uploadArea,
         onClick: () => {
-          P();
+          C();
         }
-      }, [t.manager && a("div", {
+      }, [t.manager && r("div", {
         class: " py-1 text-xs bg-muted border-b border-dashed border-accented flex items-center justify-center",
         onClick: (e) => {
-          e.stopPropagation(), N.show({
-            title: u("components.upload.title"),
+          e.stopPropagation(), U.show({
+            title: s("components.upload.title"),
             width: "800px",
             component: () => import("./manager.js"),
             componentProps: {
-              path: x.value,
+              path: y.value,
               type: "image",
               multiple: t.multiple,
               uploadParams: {
-                path: s.value,
+                path: d.value,
                 accept: "image/*",
                 maxNum: t.maxNum,
                 maxSize: t.maxSize,
-                method: d.value
+                method: p.value
               }
             }
           }).then((o) => {
-            r.addDataFiles(o);
+            a.addDataFiles(o);
           });
         }
-      }, [a("div", {
+      }, [r("div", {
         class: "i-tabler:folder size-4"
-      }, null)]), a("div", {
+      }, null)]), r("div", {
         class: i.uploadContent
-      }, [F.value ? a("div", {
+      }, [P.value ? r("div", {
         class: i.progressContainer
-      }, [a("div", {
+      }, [r("div", {
         class: "i-tabler:photo size-6"
-      }, null), a("div", {
+      }, null), r("div", {
         class: i.progressBar
-      }, [a(B, {
+      }, [r(D, {
         type: "line",
-        percentage: z.value,
+        percentage: F.value,
         showIndicator: !1,
         height: 4
-      }, null)])]) : a("div", {
+      }, null)])]) : r("div", {
         class: "i-tabler:plus size-4"
       }, null)])])]
     })]);