@duxweb/dvha-naiveui 1.0.37 → 1.0.39

package/dist/cjs/hooks/table.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("@duxweb/dvha-core"),m=require("@vueuse/core"),C=require("lodash-es"),o=require("vue");function E(s){const i=o.toRef(s,"filters",{}),p=o.toRef(s,"sorters",{}),v=o.toRef(s,"columns",[]),u=o.ref({}),d=o.ref([]),c=o.ref({...i.value,...u.value});m.watchDebounced([i,u],([e,n])=>{Object.keys(c.value).forEach(t=>{delete c.value[t]}),Object.assign(c.value,e,n)},{debounce:300,deep:!0});const a=f.useExtendList({...s,filters:c.value,sorters:p.value}),l=o.ref([]);o.watch(v,e=>{l.value=e},{immediate:!0});const g=o.computed(()=>l.value.filter(e=>e.show!==!1&&"key"in e).map(e=>e.key)),h=e=>{const n=C.cloneDeep(v.value)?.map(t=>(!("key"in t)||!t?.key||!("title"in t)||!t?.title||e.includes(t.key)||(t.show=!1),t));l.value=[...n]},y=e=>{a.checkeds.value=e},b=e=>{const n=Array.isArray(e)?e:[e],t={};n?.forEach(r=>{r?.columnKey&&r.order&&(t[r.columnKey]=r.order==="ascend"?"asc":"desc")}),a.onUpdateSorters(t)},w=e=>{const n={...u.value};Object.entries(e).forEach(([t,r])=>{n[t]=r}),u.value=n},S=e=>{d.value=e};o.watch([()=>s?.expanded,a.list],([e,n])=>{e&&(d.value=f.treeToArr(n,s.key||"id","children"))});const k=o.computed(()=>({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})),U=o.computed(()=>({remote:!0,checkedRowKeys:a.checkeds.value,expandedRowKeys:d.value,onUpdateCheckedRowKeys:y,onUpdateExpandedRowKeys:S,onUpdateSorter:b,onUpdateFilters:w,loading:a.isLoading.value,data:a.list.value,columns:l.value.filter(e=>e.show!==!1)}));return{...a,tablePagination:k,table:U,columns:l,columnSelected:g,onUpdateColumnSelected:h}}exports.useNaiveTable=E;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("@duxweb/dvha-core"),m=require("@vueuse/core"),C=require("lodash-es"),a=require("vue");function R(l){const v=a.toRef(l,"filters",{}),g=a.toRef(l,"sorters",{}),f=a.toRef(l,"columns",[]),u=a.ref({}),i=a.ref([]),c=a.ref({...v.value,...u.value}),d=a.ref({...g.value});m.watchDebounced([v,u],([e,n])=>{Object.keys(c.value).forEach(t=>{delete c.value[t]}),Object.assign(c.value,e,n)},{debounce:300,deep:!0});const o=p.useExtendList({...l,filters:c.value,sorters:d.value}),r=a.ref([]);a.watch(f,e=>{r.value=e},{immediate:!0});const h=a.computed(()=>r.value.filter(e=>e.show!==!1&&"key"in e).map(e=>e.key)),y=e=>{const n=C.cloneDeep(f.value)?.map(t=>(!("key"in t)||!t?.key||!("title"in t)||!t?.title||e.includes(t.key)||(t.show=!1),t));r.value=[...n]},b=e=>{o.checkeds.value=e},k=e=>{const n=Array.isArray(e)?e:[e],t={};n?.forEach(s=>{s?.columnKey&&s.order&&(t[s.columnKey]=s.order==="ascend"?"asc":"desc")}),Object.keys(d.value).forEach(s=>{delete d.value[s]}),Object.assign(d.value,t)},w=e=>{const n={...u.value};Object.entries(e).forEach(([t,s])=>{n[t]=s}),u.value=n},S=e=>{i.value=e};a.watch([()=>l?.expanded,o.list],([e,n])=>{e&&(i.value=p.treeToArr(n,l.key||"id","children"))});const U=a.computed(()=>({page:o.page.value,pageSize:o.pageSize.value,pageCount:o.pageCount.value,pageSizes:o.pageSizes,pageSlot:5,onUpdatePage:o.onUpdatePage,onUpdatePageSize:o.onUpdatePageSize,showSizePicker:!0,showQuickJumper:!0})),E=a.computed(()=>({remote:!0,checkedRowKeys:o.checkeds.value,expandedRowKeys:i.value,onUpdateCheckedRowKeys:b,onUpdateExpandedRowKeys:S,onUpdateSorter:k,onUpdateFilters:w,loading:o.isLoading.value,data:o.list.value,columns:r.value.filter(e=>e.show!==!1)}));return{...o,tablePagination:U,table:E,columns:r,columnSelected:h,onUpdateColumnSelected:y}}exports.useNaiveTable=R;

package/dist/esm/hooks/table.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-naiveui",
   "type": "module",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "author": "DuxWeb",
   "license": "MIT",
   "exports": {
@@ -33,7 +33,7 @@
     "pinia": "^3.0.3",
     "vue": "^3.5.0",
     "vue-router": "^4.5.1",
-    "@duxweb/dvha-core": "1.0.37"
+    "@duxweb/dvha-core": "1.0.39"
   },
   "scripts": {
     "clean": "rimraf dist",