@duxweb/dvha-pro 1.0.22 → 1.0.24

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

@@ -1,10 +1,10 @@
-import { defineComponent as Y, toRef as g, ref as r, watch as P, computed as C, createVNode as n, mergeProps as q, Fragment as G } from "vue";
-import { useI18n as H, useTree as J, useCustomMutation as Q } from "@duxweb/dvha-core";
-import { useVModel as W } from "@vueuse/core";
-import Z from "clsx";
-import { NTree as T, NInput as $, NScrollbar as p, NSpin as ee, NDropdown as te } from "naive-ui";
-import { DuxCard as le } from "../card/card.js";
-const oe = /* @__PURE__ */ Y({
+import { defineComponent as R, toRef as S, ref as u, watch as O, computed as V, createVNode as n, mergeProps as X, Fragment as Y } from "vue";
+import { useI18n as q, useTree as G, useCustomMutation as H } from "@duxweb/dvha-core";
+import { useVModel as J } from "@vueuse/core";
+import Q from "clsx";
+import { NTree as k, NInput as W, NScrollbar as Z, NSpin as $, NDropdown as ee } from "naive-ui";
+import { DuxCard as te } from "../card/card.js";
+const re = /* @__PURE__ */ R({
   name: "DuxTreeFilter",
   props: {
     title: String,
@@ -24,190 +24,180 @@ const oe = /* @__PURE__ */ Y({
       default: !1
     }
   },
-  extends: T,
+  extends: k,
   setup(t, {
-    emit: U,
-    slots: v
+    emit: C,
+    slots: x
   }) {
-    const D = W(t, "value", U, {
+    const F = J(t, "value", C, {
       passive: !1,
       defaultValue: t.defaultValue
-    }), I = g(t, "params", {}), N = g(t, "path", ""), A = g(t, "sortPath", ""), O = r(), V = r(0), k = r(0), s = r([]), S = r(), {
+    }), T = S(t, "params", {}), U = S(t, "path", ""), I = S(t, "sortPath", ""), w = u(), g = u(0), P = u(0), s = u([]), b = u(), {
       t: K
-    } = H(), {
-      options: j,
-      loading: B,
-      expanded: L
-    } = J({
-      path: N.value,
-      params: I.value,
+    } = q(), {
+      options: N,
+      loading: A,
+      expanded: j
+    } = G({
+      path: U.value,
+      params: T.value,
       ...t.treeOptions
     });
-    P(j, (l) => {
-      s.value = l;
+    O(N, (e) => {
+      s.value = e;
     }, {
       immediate: !0,
       deep: !0
     });
-    const h = r(!1), M = C(() => {
-      var l;
-      return ((l = t.menus) == null ? void 0 : l.map((e) => ({
-        label: e.label,
-        key: e.value,
-        icon: e != null && e.icon ? () => n("div", {
-          class: e == null ? void 0 : e.icon
-        }, null) : void 0,
-        onSelect: e.onSelect
-      }))) || [];
-    }), _ = (l) => {
-      var a;
-      const e = (a = t.menus) == null ? void 0 : a.find((i) => i.value === l);
-      e && e.onSelect(O.value), h.value = !1;
-    }, z = Q({
-      path: A.value,
+    const v = u(!1), B = V(() => t.menus?.map((e) => ({
+      label: e.label,
+      key: e.value,
+      icon: e?.icon ? () => n("div", {
+        class: e?.icon
+      }, null) : void 0,
+      onSelect: e.onSelect
+    })) || []), L = (e) => {
+      const l = t.menus?.find((a) => a.value === e);
+      l && l.onSelect(w.value), v.value = !1;
+    }, M = H({
+      path: I.value,
       method: "POST"
-    }), y = (l, e) => {
-      for (const a of l)
+    }), y = (e, l) => {
+      for (const a of e)
         if (a.children) {
-          for (const x of a.children)
-            if (x.id === e)
+          for (const h of a.children)
+            if (h.id === l)
               return a;
-          const i = y(a.children, e);
-          if (i)
-            return i;
+          const d = y(a.children, l);
+          if (d)
+            return d;
         }
-    }, E = ({
-      node: l,
-      dragNode: e,
+    }, _ = ({
+      node: e,
+      dragNode: l,
       dropPosition: a
     }) => {
-      var F, w;
-      const i = y(s.value, e.id), x = !i, m = [...s.value];
-      if (x) {
-        const u = s.value.findIndex((X) => X.id === e.id);
-        u >= 0 && m.splice(u, 1);
+      const d = y(s.value, l.id), h = !d, f = [...s.value];
+      if (h) {
+        const i = s.value.findIndex((D) => D.id === l.id);
+        i >= 0 && f.splice(i, 1);
       } else {
-        const u = ((F = i == null ? void 0 : i.children) == null ? void 0 : F.indexOf(e)) || 0;
-        (w = i == null ? void 0 : i.children) == null || w.splice(u, 1);
+        const i = d?.children?.indexOf(l) || 0;
+        d?.children?.splice(i, 1);
       }
-      let d = y(m, l.id), b, c = (d == null ? void 0 : d.children) || m, o = 0;
+      let c = y(f, e.id), p, o = c?.children || f, r = 0;
       switch (a) {
         case "before":
-          o = c.findIndex((u) => u.id === l.id), o > 0 && (b = c[o - 1].id);
+          r = o.findIndex((i) => i.id === e.id), r > 0 && (p = o[r - 1].id);
           break;
         case "inside":
-          d = l, c = d.children = d.children || [], o = c.length;
+          c = e, o = c.children = c.children || [], r = o.length;
           break;
         case "after":
-          o = c.findIndex((u) => u.id === l.id) + 1, b = l.id;
+          r = o.findIndex((i) => i.id === e.id) + 1, p = e.id;
           break;
       }
-      c.splice(o, 0, e), s.value = m, z.mutate({
+      o.splice(r, 0, l), s.value = f, M.mutate({
         payload: {
-          parent_id: d == null ? void 0 : d.id,
-          before_id: b,
-          id: e.id
+          parent_id: c?.id,
+          before_id: p,
+          id: l.id
         }
       });
-    }, f = r([]);
-    P(L, (l) => {
-      var e;
-      ((e = f == null ? void 0 : f.value) == null ? void 0 : e.length) > 0 || (f.value = l);
+    }, m = u([]);
+    O(j, (e) => {
+      m?.value?.length > 0 || (m.value = e);
     }, {
       immediate: !0
     });
-    const R = C(() => {
+    const z = V(() => {
       const {
-        title: l,
-        path: e,
+        title: e,
+        path: l,
         sortPath: a,
-        params: i,
-        menus: x,
-        numField: m,
-        iconField: d,
-        treeOptions: b,
-        value: c,
-        defaultValue: o,
-        onUpdateValue: F,
-        bordered: w,
-        ...u
+        params: d,
+        menus: h,
+        numField: f,
+        iconField: c,
+        treeOptions: p,
+        value: o,
+        defaultValue: r,
+        onUpdateValue: i,
+        bordered: D,
+        ...E
       } = t;
-      return u;
+      return E;
     });
-    return () => n(le, {
+    return () => n(te, {
       class: "h-full",
       contentClass: "flex flex-col",
       bordered: t.bordered
     }, {
-      default: () => {
-        var l;
-        return [(t == null ? void 0 : t.title) && n("div", {
-          class: "px-2 py-3 pb-1 text-base font-bold"
-        }, [t.title]), n("div", {
-          class: "p-2 flex gap-2 items-center"
-        }, [n("div", {
-          class: "flex-1"
-        }, [v.header ? v.header() : n($, {
-          value: S.value,
-          "onUpdate:value": (e) => S.value = e,
-          placeholder: K("common.keyword")
-        }, null)]), (l = v.tools) == null ? void 0 : l.call(v)]), n(p, {
-          class: "flex-1 min-h-0",
-          xScrollable: !0
+      default: () => [t?.title && n("div", {
+        class: "px-2 py-3 pb-1 text-base font-bold"
+      }, [t.title]), n("div", {
+        class: "p-2 flex gap-2 items-center"
+      }, [n("div", {
+        class: "flex-1"
+      }, [x.header ? x.header() : n(W, {
+        value: b.value,
+        "onUpdate:value": (e) => b.value = e,
+        placeholder: K("common.keyword")
+      }, null)]), x.tools?.()]), n(Z, {
+        class: "flex-1 min-h-0",
+        xScrollable: !0
+      }, {
+        default: () => [n("div", {
+          class: "p-2"
+        }, [n($, {
+          show: A.value,
+          class: "h-full"
         }, {
-          default: () => [n("div", {
-            class: "p-2"
-          }, [n(ee, {
-            show: B.value,
-            class: "h-full"
-          }, {
-            default: () => [n(T, q(R.value, {
-              data: s.value || [],
-              expandedKeys: f.value,
-              onUpdateExpandedKeys: (e) => {
-                f.value = e;
-              },
-              blockLine: !0,
-              selectedKeys: D.value,
-              onUpdateSelectedKeys: (e) => {
-                var a;
-                D.value = e, (a = t == null ? void 0 : t.onUpdateValue) == null || a.call(t, e);
-              },
-              onDrop: E,
-              pattern: S.value,
-              renderPrefix: t != null && t.numField || t != null && t.iconField ? ({
-                option: e
-              }) => n(G, null, [t.iconField && e[t.iconField] && n("div", {
-                class: Z(e[t.iconField] || "", "size-4")
-              }, null), t.numField && n("div", {
-                class: "rounded-full bg-primary px-2 text-xs text-white"
-              }, [e[t.numField] || 0])]) : void 0,
-              nodeProps: ({
-                option: e
-              }) => ({
-                onContextmenu: (a) => {
-                  O.value = e, h.value = !0, V.value = a.clientX, k.value = a.clientY, a.preventDefault();
-                }
-              })
-            }), null)]
-          })])]
-        }), n(te, {
-          trigger: "manual",
-          placement: "bottom-start",
-          show: h.value,
-          options: M.value,
-          x: V.value,
-          y: k.value,
-          width: 100,
-          onSelect: _,
-          onClickoutside: () => {
-            h.value = !1;
-          }
-        }, null)];
-      }
+          default: () => [n(k, X(z.value, {
+            data: s.value || [],
+            expandedKeys: m.value,
+            onUpdateExpandedKeys: (e) => {
+              m.value = e;
+            },
+            blockLine: !0,
+            selectedKeys: F.value,
+            onUpdateSelectedKeys: (e) => {
+              F.value = e, t?.onUpdateValue?.(e);
+            },
+            onDrop: _,
+            pattern: b.value,
+            renderPrefix: t?.numField || t?.iconField ? ({
+              option: e
+            }) => n(Y, null, [t.iconField && e[t.iconField] && n("div", {
+              class: Q(e[t.iconField] || "", "size-4")
+            }, null), t.numField && n("div", {
+              class: "rounded-full bg-primary px-2 text-xs text-white"
+            }, [e[t.numField] || 0])]) : void 0,
+            nodeProps: ({
+              option: e
+            }) => ({
+              onContextmenu: (l) => {
+                w.value = e, v.value = !0, g.value = l.clientX, P.value = l.clientY, l.preventDefault();
+              }
+            })
+          }), null)]
+        })])]
+      }), n(ee, {
+        trigger: "manual",
+        placement: "bottom-start",
+        show: v.value,
+        options: B.value,
+        x: g.value,
+        y: P.value,
+        width: 100,
+        onSelect: L,
+        onClickoutside: () => {
+          v.value = !1;
+        }
+      }, null)]
     });
   }
 });
 export {
-  oe as DuxTreeFilter
+  re as DuxTreeFilter
 };

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

@@ -1,32 +1,20 @@
-import { useManage as r, createS3UploadDriver as v, createLocalUploadDriver as U } from "@duxweb/dvha-core";
-import { computed as u } from "vue";
-const b = (a) => {
-  const n = r(), d = u(() => {
-    var t, l;
-    return (a == null ? void 0 : a.uploadPath) || ((l = (t = n.config) == null ? void 0 : t.apiPath) == null ? void 0 : l.upload) || "upload";
-  }), P = u(() => {
-    var t, l;
-    return (a == null ? void 0 : a.managePath) || ((l = (t = n.config) == null ? void 0 : t.apiPath) == null ? void 0 : l.uploadManager) || "uploadManager";
-  }), f = u(() => {
-    var t, l, e, c;
-    return (a == null ? void 0 : a.driver) === "s3" ? v({
-      signPath: (a == null ? void 0 : a.signPath) || ((l = (t = n.config) == null ? void 0 : t.apiPath) == null ? void 0 : l.upload) || d.value || "",
-      signCallback: (a == null ? void 0 : a.signCallback) || ((c = (e = n.config) == null ? void 0 : e.upload) == null ? void 0 : c.signCallback) || ((i) => {
-        var g, m, h;
-        return {
-          uploadUrl: (g = i.data) == null ? void 0 : g.uploadUrl,
-          url: (m = i.data) == null ? void 0 : m.url,
-          params: (h = i.data) == null ? void 0 : h.params
-        };
-      })
-    }) : U();
-  });
+import { useManage as u, createS3UploadDriver as d, createLocalUploadDriver as e } from "@duxweb/dvha-core";
+import { computed as r } from "vue";
+const p = (a) => {
+  const t = u(), o = r(() => a?.uploadPath || t.config?.apiPath?.upload || "upload"), n = r(() => a?.managePath || t.config?.apiPath?.uploadManager || "uploadManager"), i = r(() => a?.driver === "s3" ? d({
+    signPath: a?.signPath || t.config?.apiPath?.upload || o.value || "",
+    signCallback: a?.signCallback || t.config?.upload?.signCallback || ((l) => ({
+      uploadUrl: l.data?.uploadUrl,
+      url: l.data?.url,
+      params: l.data?.params
+    }))
+  }) : e());
   return {
-    uploadPath: d,
-    managePath: P,
-    driver: f
+    uploadPath: o,
+    managePath: n,
+    driver: i
   };
 };
 export {
-  b as useUploadConfig
+  p as useUploadConfig
 };