@duxweb/dvha-naiveui 1.0.31 → 1.0.33

package/dist/cjs/components/cascader/cascader.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),v=require("@duxweb/dvha-core"),m=require("@vueuse/core"),t=require("naive-ui"),f=e.defineComponent({name:"DuxCascader",props:{path:String,params:Object},extends:t.NCascader,setup(a,{emit:u,slots:o}){const c=e.toRef(a,"path",""),n=e.toRef(a,"params",{}),r=m.useVModel(a,"value",u,{passive:!0,defaultValue:a.defaultValue}),{options:l,loading:d}=v.useTree({path:c.value,params:n.value}),i=e.computed(()=>{const{path:s,params:h,...p}=a;return p});return()=>e.createVNode(t.NSpin,{show:d.value,class:"w-full"},{default:()=>[e.createVNode(t.NCascader,e.mergeProps(i.value,{clearable:!0,options:l.value,value:r.value,"onUpdate:value":s=>r.value=s}),{...o})]})}});exports.DuxCascader=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),v=require("@duxweb/dvha-core"),m=require("@vueuse/core"),t=require("naive-ui"),f=e.defineComponent({name:"DuxCascader",props:{path:String,params:Object},extends:t.NCascader,setup(a,{emit:u,slots:o}){const c=e.toRef(a,"path",""),n=e.toRef(a,"params",{}),r=m.useVModel(a,"value",u,{passive:!0,defaultValue:a.defaultValue}),{options:l,loading:d}=v.useTree({path:c.value,params:n.value}),i=e.computed(()=>{const{path:s,params:h,...p}=a;return p});return()=>e.createVNode(t.NSpin,{show:d.value,class:"w-full",size:16},{default:()=>[e.createVNode(t.NCascader,e.mergeProps(i.value,{clearable:!0,options:l.value,value:r.value,"onUpdate:value":s=>r.value=s}),{...o})]})}});exports.DuxCascader=f;

package/dist/cjs/hooks/table.cjs

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

package/dist/esm/components/cascader/cascader.js

@@ -32,7 +32,8 @@ const P = /* @__PURE__ */ v({
     });
     return () => r(V, {
       show: c.value,
-      class: "w-full"
+      class: "w-full",
+      size: 16
     }, {
       default: () => [r(s, h(d.value, {
         clearable: !0,

package/dist/esm/hooks/table.js

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

package/dist/types/hooks/table.d.ts

@@ -16,6 +16,7 @@ export type TableColumn = DataTableColumn & TableColumnExtend;
 export interface UseTableProps extends Omit<UseExtendListProps, 'key'> {
     key?: TableColumnKey;
     columns: MaybeRef<TableColumn[]>;
+    expanded?: boolean;
 }
 export interface UseNaiveTableReturn extends ReturnType<typeof useExtendList> {
     tablePagination: ComputedRef<PaginationProps>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-naiveui",
   "type": "module",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "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.31"
+    "@duxweb/dvha-core": "1.0.33"
   },
   "scripts": {
     "clean": "rimraf dist",