@duxweb/dvha-naiveui 1.1.30 → 1.2.0

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

@@ -1,72 +1,50 @@
-import { defineComponent as f, toRef as l, ref as x, watch as v, computed as g, createVNode as o, mergeProps as y } from "vue";
-import { useTree as k } from "@duxweb/dvha-core";
-import { useVModel as V } from "@vueuse/core";
-import { NTree as u, NSpin as b, NScrollbar as K } from "naive-ui";
-const U = /* @__PURE__ */ f({
-  name: "DuxTree",
-  props: {
-    path: String,
-    params: Object,
-    height: String,
-    value: Array,
-    defaultValue: Array,
-    hookProps: Object
-  },
-  extends: u,
-  setup(e, {
-    emit: d
-  }) {
-    const n = l(e, "params", {}), s = l(e, "path", ""), r = V(e, "value", d, {
-      passive: !0,
-      deep: !0,
-      defaultValue: e.defaultValue || []
-    }), t = x([]), {
-      options: c,
-      loading: p,
-      expanded: h
-    } = k({
-      path: s,
-      params: n,
-      ...e.hookProps
-    });
-    v(h, (a) => {
-      t.value = a;
-    });
-    const m = g(() => {
-      const {
-        hookProps: a,
-        height: P,
-        ...i
-      } = e;
-      return i;
-    });
-    return () => o(b, {
-      show: p.value
-    }, {
-      default: () => [o(K, {
-        style: {
-          height: e.height || "300px"
-        }
-      }, {
-        default: () => [o(u, y(m.value, {
-          cascade: !0,
-          checkable: !0,
-          defaultExpandAll: !0,
-          selectable: !1,
-          expandedKeys: t.value,
-          onUpdateExpandedKeys: (a) => {
-            t.value = a;
-          },
-          data: c.value || [],
-          checkedKeys: r.value || [],
-          onUpdateCheckedKeys: (a) => {
-            r.value = a, e.onUpdateValue?.(a);
-          }
-        }), null)]
-      })]
-    });
-  }
+import { computed as e, createVNode as t, defineComponent as n, mergeProps as r, ref as i, toRef as a, watch as o } from "vue";
+import { useTree as s } from "@duxweb/dvha-core";
+import { useVModel as c } from "@vueuse/core";
+import { NScrollbar as l, NSpin as u, NTree as d } from "naive-ui";
+const f = /* @__PURE__ */ n({
+	name: "DuxTree",
+	props: {
+		path: String,
+		params: Object,
+		height: String,
+		value: Array,
+		defaultValue: Array,
+		hookProps: Object
+	},
+	extends: d,
+	setup(n, { emit: f }) {
+		let p = a(n, "params", {}), m = a(n, "path", ""), h = c(n, "value", f, {
+			passive: !0,
+			deep: !0,
+			defaultValue: n.defaultValue || []
+		}), g = i([]), { options: _, loading: v, expanded: y } = s({
+			path: m,
+			params: p,
+			...n.hookProps
+		});
+		o(y, (e) => {
+			g.value = e;
+		});
+		let b = e(() => {
+			let { hookProps: e, height: t, ...r } = n;
+			return r;
+		});
+		return () => t(u, { show: v.value }, { default: () => [t(l, { style: { height: n.height || "300px" } }, { default: () => [t(d, r(b.value, {
+			cascade: !0,
+			checkable: !0,
+			defaultExpandAll: !0,
+			selectable: !1,
+			expandedKeys: g.value,
+			onUpdateExpandedKeys: (e) => {
+				g.value = e;
+			},
+			data: _.value || [],
+			checkedKeys: h.value || [],
+			onUpdateCheckedKeys: (e) => {
+				h.value = e, n.onUpdateValue?.(e);
+			}
+		}), null)] })] });
+	}
 });
-export {
-  U as DuxTree
-};
+export { f as DuxTree };

package/dist/esm/components/treeSelect/index.js

@@ -0,0 +1 @@
+import "./treeSelect.js";

package/dist/esm/components/treeSelect/treeSelect.js

@@ -1,38 +1,31 @@
-import { defineComponent as p, toRef as o, createVNode as c, mergeProps as d } from "vue";
+import { createVNode as e, defineComponent as t, mergeProps as n, toRef as r } from "vue";
 import { useTree as i } from "@duxweb/dvha-core";
-import { useVModel as f } from "@vueuse/core";
-import { NTreeSelect as a } from "naive-ui";
-const S = /* @__PURE__ */ p({
-  name: "DuxTreeSelect",
-  props: {
-    path: String,
-    params: Object,
-    hookProps: Object
-  },
-  extends: a,
-  setup(e, {
-    emit: r
-  }) {
-    const l = o(e, "params", {}), u = o(e, "path", ""), t = f(e, "value", r, {
-      passive: !0,
-      deep: !0,
-      defaultValue: e.defaultValue || []
-    }), {
-      options: n,
-      loading: m
-    } = i({
-      path: u,
-      params: l,
-      ...e.hookProps
-    });
-    return () => c(a, d(e, {
-      loading: m.value,
-      options: n.value,
-      value: t.value,
-      "onUpdate:value": (s) => t.value = s
-    }), null);
-  }
+import { useVModel as a } from "@vueuse/core";
+import { NTreeSelect as o } from "naive-ui";
+const s = /* @__PURE__ */ t({
+	name: "DuxTreeSelect",
+	props: {
+		path: String,
+		params: Object,
+		hookProps: Object
+	},
+	extends: o,
+	setup(t, { emit: s }) {
+		let c = r(t, "params", {}), l = r(t, "path", ""), u = a(t, "value", s, {
+			passive: !0,
+			deep: !0,
+			defaultValue: t.defaultValue || []
+		}), { options: d, loading: f } = i({
+			path: l,
+			params: c,
+			...t.hookProps
+		});
+		return () => e(o, n(t, {
+			loading: f.value,
+			options: d.value,
+			value: u.value,
+			"onUpdate:value": (e) => u.value = e
+		}), null);
+	}
 });
-export {
-  S as DuxTreeSelect
-};
+export { s as DuxTreeSelect };

package/dist/esm/hooks/index.js

@@ -0,0 +1,4 @@
+import "./menu.js";
+import "./tab.js";
+import "./table.js";
+import "./upload.js";

package/dist/esm/hooks/menu.js

@@ -1,37 +1,22 @@
-import { useMenu as a, arrayToTree as u } from "@duxweb/dvha-core";
-import { computed as l, h as o } from "vue";
-import { RouterLink as p } from "vue-router";
-function y(n) {
-  const r = a(n);
-  return {
-    options: l(() => {
-      const t = r.getMenu(!0).map((e) => ({
-        ...e,
-        key: e.name,
-        icon: e?.icon ? () => o("div", {
-          class: `${e.icon} size-5`
-        }) : void 0,
-        labelName: e.label,
-        label: () => e.path ? o(
-          p,
-          {
-            to: {
-              path: e.path
-            }
-          },
-          { default: () => e.label }
-        ) : e.label
-      }));
-      return u(t, {
-        idKey: "key",
-        parentKey: "parent",
-        childrenKey: "children",
-        sortKey: "sort"
-      }, void 0);
-    }),
-    ...r
-  };
+import { computed as e, h as t } from "vue";
+import { arrayToTree as n, useMenu as r } from "@duxweb/dvha-core";
+import { RouterLink as i } from "vue-router";
+function a(a) {
+	let o = r(a);
+	return {
+		options: e(() => n(o.getMenu(!0).map((e) => ({
+			...e,
+			key: e.name,
+			icon: e?.icon ? () => t("div", { class: `${e.icon} size-5` }) : void 0,
+			labelName: e.label,
+			label: () => e.path ? t(i, { to: { path: e.path } }, { default: () => e.label }) : e.label
+		})), {
+			idKey: "key",
+			parentKey: "parent",
+			childrenKey: "children",
+			sortKey: "sort"
+		}, void 0)),
+		...o
+	};
 }
-export {
-  y as useNaiveMenu
-};
+export { a as useNaiveMenu };

package/dist/esm/hooks/tab.js

@@ -1,29 +1,27 @@
-import { useTabStore as p } from "@duxweb/dvha-core";
-import { storeToRefs as n } from "pinia";
-import { computed as m } from "vue";
-import { useRouter as c } from "vue-router";
-function h() {
-  const o = p(), { tabs: u, current: t } = n(o), a = c(), s = m(() => ({
-    value: t.value,
-    defaultValue: t.value || "",
-    onClose: (e) => {
-      o.delTab(e, (r) => {
-        a.push(r.path || "");
-      });
-    },
-    onUpdateValue: (e) => {
-      o.changeTab(e, (r) => {
-        a.push(r.path || "");
-      });
-    }
-  }));
-  return {
-    ...o,
-    tabs: u,
-    current: t,
-    tabsProps: s
-  };
+import { computed as e } from "vue";
+import { useTabStore as t } from "@duxweb/dvha-core";
+import { useRouter as n } from "vue-router";
+import { storeToRefs as r } from "pinia";
+function i() {
+	let i = t(), { tabs: a, current: o } = r(i), s = n(), c = e(() => ({
+		value: o.value,
+		defaultValue: o.value || "",
+		onClose: (e) => {
+			i.delTab(e, (e) => {
+				s.push(e.path || "");
+			});
+		},
+		onUpdateValue: (e) => {
+			i.changeTab(e, (e) => {
+				s.push(e.path || "");
+			});
+		}
+	}));
+	return {
+		...i,
+		tabs: a,
+		current: o,
+		tabsProps: c
+	};
 }
-export {
-  h as useNaiveTab
-};
+export { i as useNaiveTab };

package/dist/esm/hooks/table.js

@@ -1,88 +1,79 @@
-import { useExtendList as C, treeToArr as F } from "@duxweb/dvha-core";
-import { watchDebounced as E } from "@vueuse/core";
-import { cloneDeep as K } from "lodash-es";
-import { computed as l, unref as g, toRef as P, ref as u, watch as h } from "vue";
-function D(n) {
-  const i = l(() => g(n.filters) || {}), m = l(() => g(n.sorters) || {}), p = P(n, "columns", []), c = u({}), d = u([]), f = u({
-    ...i.value,
-    ...c.value
-  }), v = u({
-    ...m.value
-  }), a = C({
-    ...n,
-    filters: f,
-    sorters: v
-  });
-  E([i, c], ([e, o]) => {
-    const t = {
-      ...e || {},
-      ...o || {}
-    };
-    f.value = t, a.onUpdateFilters(t);
-  }, {
-    debounce: 300,
-    deep: !0
-  });
-  const s = u([]);
-  h(p, (e) => {
-    s.value = e;
-  }, {
-    immediate: !0
-  });
-  const w = l(() => s.value.filter((e) => e.show !== !1 && "key" in e).map((e) => e.key)), y = (e) => {
-    const o = K(p.value)?.map((t) => (!("key" in t) || !t?.key || !("title" in t) || !t?.title || e.includes(t.key) || (t.show = !1), t));
-    s.value = [...o];
-  }, S = (e) => {
-    a.checkeds.value = e;
-  }, U = (e) => {
-    const o = Array.isArray(e) ? e : [e], t = {};
-    o?.forEach((r) => {
-      r?.columnKey && r.order && (t[r.columnKey] = r.order === "ascend" ? "asc" : "desc");
-    }), v.value = t, a.onUpdateSorters(t);
-  }, k = (e) => {
-    const o = {
-      ...c.value
-    };
-    Object.entries(e).forEach(([t, r]) => {
-      o[t] = r;
-    }), c.value = o;
-  }, b = (e) => {
-    d.value = e;
-  };
-  h([() => n?.expanded, a.list], ([e, o]) => {
-    e && (d.value = F(o, n.key || "id", "children"));
-  });
-  const x = l(() => ({
-    page: a.page.value,
-    pageSize: a.pageSize.value,
-    pageCount: a.pageCount.value,
-    pageSizes: a.pageSizes,
-    pageSlot: 5,
-    onUpdatePage: a.onUpdatePage,
-    onUpdatePageSize: a.onUpdatePageSize,
-    showSizePicker: !0,
-    showQuickJumper: !0
-  })), z = l(() => ({
-    remote: !0,
-    checkedRowKeys: a.checkeds.value,
-    expandedRowKeys: d.value,
-    onUpdateCheckedRowKeys: S,
-    onUpdateExpandedRowKeys: b,
-    onUpdateSorter: U,
-    onUpdateFilters: k,
-    loading: a.isLoading.value,
-    data: a.list.value,
-    columns: s.value.filter((e) => e.show !== !1)
-  }));
-  return {
-    ...a,
-    tablePagination: x,
-    table: z,
-    columns: s,
-    columnSelected: w,
-    onUpdateColumnSelected: y
-  };
+import { computed as e, ref as t, toRef as n, unref as r, watch as i } from "vue";
+import { treeToArr as a, useExtendList as o } from "@duxweb/dvha-core";
+import { watchDebounced as s } from "@vueuse/core";
+import { cloneDeep as c } from "lodash-es";
+function l(l) {
+	let u = e(() => r(l.filters) || {}), d = e(() => r(l.sorters) || {}), f = n(l, "columns", []), p = t({}), m = t([]), h = t({
+		...u.value,
+		...p.value
+	}), g = t({ ...d.value }), _ = o({
+		...l,
+		filters: h,
+		sorters: g
+	});
+	s([u, p], ([e, t]) => {
+		let n = {
+			...e || {},
+			...t || {}
+		};
+		h.value = n, _.onUpdateFilters(n);
+	}, {
+		debounce: 300,
+		deep: !0
+	});
+	let v = t([]);
+	i(f, (e) => {
+		v.value = e;
+	}, { immediate: !0 });
+	let y = e(() => v.value.filter((e) => e.show !== !1 && "key" in e).map((e) => e.key)), b = (e) => {
+		v.value = [...c(f.value)?.map((t) => (!("key" in t) || !t?.key || !("title" in t) || !t?.title || e.includes(t.key) || (t.show = !1), t))];
+	}, x = (e) => {
+		_.checkeds.value = e;
+	}, S = (e) => {
+		let t = Array.isArray(e) ? e : [e], n = {};
+		t?.forEach((e) => {
+			e?.columnKey && e.order && (n[e.columnKey] = e.order === "ascend" ? "asc" : "desc");
+		}), g.value = n, _.onUpdateSorters(n);
+	}, C = (e) => {
+		let t = { ...p.value };
+		Object.entries(e).forEach(([e, n]) => {
+			t[e] = n;
+		}), p.value = t;
+	}, w = (e) => {
+		m.value = e;
+	};
+	i([() => l?.expanded, _.list], ([e, t]) => {
+		e && (m.value = a(t, l.key || "id", "children"));
+	});
+	let T = e(() => ({
+		page: _.page.value,
+		pageSize: _.pageSize.value,
+		pageCount: _.pageCount.value,
+		pageSizes: _.pageSizes,
+		pageSlot: 5,
+		onUpdatePage: _.onUpdatePage,
+		onUpdatePageSize: _.onUpdatePageSize,
+		showSizePicker: !0,
+		showQuickJumper: !0
+	})), E = e(() => ({
+		remote: !0,
+		checkedRowKeys: _.checkeds.value,
+		expandedRowKeys: m.value,
+		onUpdateCheckedRowKeys: x,
+		onUpdateExpandedRowKeys: w,
+		onUpdateSorter: S,
+		onUpdateFilters: C,
+		loading: _.isLoading.value,
+		data: _.list.value,
+		columns: v.value.filter((e) => e.show !== !1)
+	}));
+	return {
+		..._,
+		tablePagination: T,
+		table: E,
+		columns: v,
+		columnSelected: y,
+		onUpdateColumnSelected: b
+	};
 }
-export {
-  D as useNaiveTable
-};
+export { l as useNaiveTable };

package/dist/esm/hooks/upload.js

@@ -1,45 +1,39 @@
-import { useUpload as l } from "@duxweb/dvha-core";
-import { watch as p } from "vue";
-function F(u) {
-  const r = l(u), t = /* @__PURE__ */ new Map();
-  return p(
-    () => r.uploadFiles.value,
-    (n) => {
-      n.forEach((e) => {
-        const s = t.get(e.id);
-        s && (e.status === "uploading" && e.progress && s.onProgress ? s.onProgress({
-          percent: e.progress.percent || 0
-        }) : e.status === "success" ? (s.onFinish?.(), t.delete(e.id)) : e.status === "error" && (s.onError?.(), t.delete(e.id)));
-      });
-    },
-    { deep: !0 }
-  ), {
-    ...r,
-    request: (n) => {
-      const { file: e, onFinish: s, onError: o, onProgress: c } = n, i = e.file;
-      if (!i) {
-        o?.();
-        return;
-      }
-      r.addFiles([i], "file").then(() => {
-        const a = r.uploadFiles.value.find((d) => d.file === i);
-        if (!a) {
-          o?.();
-          return;
-        }
-        t.set(a.id, {
-          onFinish: s,
-          onError: o,
-          onProgress: c
-        }), r.trigger().catch(() => {
-          t.delete(a.id), o?.();
-        });
-      }).catch(() => {
-        o?.();
-      });
-    }
-  };
+import { watch as e } from "vue";
+import { useUpload as t } from "@duxweb/dvha-core";
+function n(n) {
+	let r = t(n), i = /* @__PURE__ */ new Map();
+	e(() => r.uploadFiles.value, (e) => {
+		e.forEach((e) => {
+			let t = i.get(e.id);
+			t && (e.status === "uploading" && e.progress && t.onProgress ? t.onProgress({ percent: e.progress.percent || 0 }) : e.status === "success" ? (t.onFinish?.(), i.delete(e.id)) : e.status === "error" && (t.onError?.(), i.delete(e.id)));
+		});
+	}, { deep: !0 });
+	let a = (e) => {
+		let { file: t, onFinish: n, onError: a, onProgress: o } = e, s = t.file;
+		if (!s) {
+			a?.();
+			return;
+		}
+		r.addFiles([s], "file").then(() => {
+			let e = r.uploadFiles.value.find((e) => e.file === s);
+			if (!e) {
+				a?.();
+				return;
+			}
+			i.set(e.id, {
+				onFinish: n,
+				onError: a,
+				onProgress: o
+			}), r.trigger().catch(() => {
+				i.delete(e.id), a?.();
+			});
+		}).catch(() => {
+			a?.();
+		});
+	};
+	return {
+		...r,
+		request: a
+	};
 }
-export {
-  F as useNaiveUpload
-};
+export { n as useNaiveUpload };

package/dist/esm/index.js

@@ -1,24 +1,14 @@
-import { DuxAutoComplete as o } from "./components/autoComplete/autoComplete.js";
+import { DuxAutoComplete as e } from "./components/autoComplete/autoComplete.js";
 import { DuxCascader as t } from "./components/cascader/cascader.js";
-import { DuxMention as u } from "./components/mention/mention.js";
-import { DuxSelect as m } from "./components/select/select.js";
-import { DuxTransfer as D } from "./components/transfer/transfer.js";
-import { DuxTree as i } from "./components/tree/tree.js";
-import { DuxTreeSelect as T } from "./components/treeSelect/treeSelect.js";
-import { useNaiveMenu as v } from "./hooks/menu.js";
+import { DuxMention as n } from "./components/mention/mention.js";
+import { DuxSelect as r } from "./components/select/select.js";
+import { DuxTransfer as i } from "./components/transfer/transfer.js";
+import { DuxTree as a } from "./components/tree/tree.js";
+import { DuxTreeSelect as o } from "./components/treeSelect/treeSelect.js";
+import "./components/index.js";
+import { useNaiveMenu as s } from "./hooks/menu.js";
 import { useNaiveTab as c } from "./hooks/tab.js";
-import { useNaiveTable as d } from "./hooks/table.js";
-import { useNaiveUpload as M } from "./hooks/upload.js";
-export {
-  o as DuxAutoComplete,
-  t as DuxCascader,
-  u as DuxMention,
-  m as DuxSelect,
-  D as DuxTransfer,
-  i as DuxTree,
-  T as DuxTreeSelect,
-  v as useNaiveMenu,
-  c as useNaiveTab,
-  d as useNaiveTable,
-  M as useNaiveUpload
-};
+import { useNaiveTable as l } from "./hooks/table.js";
+import { useNaiveUpload as u } from "./hooks/upload.js";
+import "./hooks/index.js";
+export { e as DuxAutoComplete, t as DuxCascader, n as DuxMention, r as DuxSelect, i as DuxTransfer, a as DuxTree, o as DuxTreeSelect, s as useNaiveMenu, c as useNaiveTab, l as useNaiveTable, u as useNaiveUpload };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-naiveui",
   "type": "module",
-  "version": "1.1.30",
+  "version": "1.2.0",
   "author": "DuxWeb",
   "license": "MIT",
   "exports": {
@@ -33,7 +33,7 @@
     "pinia": "^3.0.4",
     "vue": "^3.5.24",
     "vue-router": "^4.6.3",
-    "@duxweb/dvha-core": "1.1.30"
+    "@duxweb/dvha-core": "1.2.0"
   },
   "scripts": {
     "clean": "rimraf dist",