@duxweb/dvha-naiveui 1.0.17 → 1.0.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +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:s,slots:o}){const n=e.toRef(a,"path",""),c=e.toRef(a,"params",{}),r=m.useVModel(a,"value",s,{passive:!0,defaultValue:a.defaultValue}),{options:l,loading:d}=v.useTree({path:n.value,params:c.value}),i=e.computed(()=>{const{path:u,params:h,...p}=a;return p});return()=>e.createVNode(t.NSpin,{show:d.value},{default:()=>[e.createVNode(t.NCascader,e.mergeProps(i.value,{clearable:!0,options:l.value,value:r.value,"onUpdate:value":u=>r.value=u}),{...o})]})}});exports.DuxCascader=f;
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;
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("vue"),p=require("@duxweb/dvha-core"),j=require("@vueuse/core"),t=require("naive-ui");function R(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!l.isVNode(e)}const x=l.defineComponent({name:"DuxSelect",props:{path:String,params:Object,pagination:{type:Boolean,default:!0},avatarField:{type:String},imageField:{type:String},descField:{type:String},multiple:Boolean},extends:t.NSelect,setup(e,{emit:d,slots:v}){const s=l.toRef(e,"params",{}),f=l.toRef(e,"path"),r=j.useVModel(e,"value",d,{passive:!0,defaultValue:e.defaultValue}),u=l.toRef(e,"labelField","name"),w=l.toRef(e,"valueField","id"),i=l.toRef(e,"avatarField",""),g=l.toRef(e,"imageField",""),o=l.toRef(e,"descField",""),{onSearch:S,loading:h,pagination:N,options:y,pageCount:b}=p.useSelect({path:f.value||"",params:s.value,defaultValue:r.value,pagination:e.pagination,optionLabel:u.value,optionValue:w.value}),F=l.computed(()=>{const{labelField:a,valueField:c,avatarField:n,imageField:C,descField:I,...z}=e;return z});return()=>l.createVNode(t.NSelect,l.mergeProps(F.value,{onSearch:S,loading:h.value,filterable:!!e.pagination,clearable:!0,remote:!0,options:y.value,value:r.value,"onUpdate:value":a=>r.value=a,multiple:e.multiple,onClear:()=>{S("")},renderLabel:a=>g.value||o.value?l.createVNode(t.NSpace,{align:"center",size:"small",wrapItem:!1,style:{padding:"6px 0"}},{default:()=>[g.value&&l.createVNode(t.NImage,{src:a==null?void 0:a.raw[g.value],objectFit:"cover",width:32,height:32},null),i.value&&l.createVNode(t.NAvatar,{round:!0,src:a==null?void 0:a.raw[i.value],size:32},{default:()=>{var c,n;return[(n=(c=a==null?void 0:a.raw[u.value])==null?void 0:c.charAt)==null?void 0:n.call(c,0)]}}),l.createVNode(t.NSpace,{vertical:!0,size:0,wrapItem:!1},{default:()=>[l.createVNode("div",null,[a==null?void 0:a.raw[u.value]]),o.value&&l.createVNode("div",{style:{opacity:.6}},[a==null?void 0:a.raw[o.value]])]})]}):a==null?void 0:a.raw[u.value],renderTag:({option:a,handleClose:c})=>{let n;return e.multiple?l.createVNode(t.NTag,{type:"primary",size:e.size,closable:!0,round:!0,onClose:()=>{c()},style:{"--n-padding":"0"}},R(n=V(a,u.value,g.value,i.value,o.value))?n:{default:()=>[n]}):V(a,u.value,g.value,i.value,o.value)}}),{action:()=>e.pagination?l.createVNode(t.NPagination,{size:"small",page:N.value.page,"onUpdate:page":a=>N.value.page=a,pageSlot:3,pageCount:b.value,pageSize:N.value.pageSize},null):null,...v})}});function V(e,d,v,s,f){return v||f||s?l.createVNode(t.NSpace,{align:"center",size:"small",style:{padding:"6px 0"},wrapItem:!1},{default:()=>[v&&l.createVNode(t.NImage,{src:e==null?void 0:e.raw[v],objectFit:"cover",width:22,height:22},null),s&&l.createVNode(t.NAvatar,{round:!0,src:(e==null?void 0:e.raw[s])||"",size:22},{default:()=>{var r,u;return[(u=(r=e==null?void 0:e.raw[d])==null?void 0:r.charAt)==null?void 0:u.call(r,0)]}}),l.createVNode("div",null,[e==null?void 0:e.raw[d]])]}):e==null?void 0:e.raw[d]}exports.DuxSelect=x;
1
+ "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("vue"),x=require("@duxweb/dvha-core"),C=require("@vueuse/core"),t=require("naive-ui");function I(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!l.isVNode(e)}const q=l.defineComponent({name:"DuxSelect",props:{path:String,params:Object,pagination:{type:Boolean,default:!0},avatarField:{type:String},imageField:{type:String},descField:{type:String},multiple:Boolean},extends:t.NSelect,setup(e,{emit:o,slots:i}){const f=l.toRef(e,"params",{}),w=l.toRef(e,"path"),s=C.useVModel(e,"value",o,{passive:!0,defaultValue:e.defaultValue}),r=l.toRef(e,"labelField","name"),V=l.toRef(e,"valueField","id"),d=l.toRef(e,"avatarField",""),n=l.toRef(e,"imageField",""),u=l.toRef(e,"descField",""),{onSearch:N,loading:z,pagination:h,options:p,pageCount:j}=x.useSelect({path:w.value||"",params:f.value,defaultValue:s.value,pagination:e.pagination,optionLabel:r.value,optionValue:V.value}),R=l.computed(()=>{const{labelField:a,valueField:S,avatarField:v,imageField:y,descField:g,...c}=e;return c});return()=>l.createVNode(t.NSelect,l.mergeProps(R.value,{onSearch:N,loading:z.value,filterable:!!e.pagination,clearable:!0,remote:!0,options:p.value,value:s.value,"onUpdate:value":a=>s.value=a,multiple:e.multiple,onClear:()=>{N("")},renderLabel:a=>{var S;return n.value||u.value?l.createVNode(t.NSpace,{align:"center",size:"small",wrapItem:!1,style:{padding:"6px 0"}},{default:()=>{var v,y;return[n.value&&l.createVNode(t.NImage,{src:(v=a==null?void 0:a.raw)==null?void 0:v[n.value],objectFit:"cover",width:32,height:32},null),d.value&&l.createVNode(t.NAvatar,{round:!0,src:(y=a==null?void 0:a.raw)==null?void 0:y[d.value],size:32},{default:()=>{var g,c,b;return[(b=(c=(g=a==null?void 0:a.raw)==null?void 0:g[r.value])==null?void 0:c.charAt)==null?void 0:b.call(c,0)]}}),l.createVNode(t.NSpace,{vertical:!0,size:0,wrapItem:!1},{default:()=>{var g,c;return[l.createVNode("div",null,[(g=a==null?void 0:a.raw)==null?void 0:g[r.value]]),u.value&&l.createVNode("div",{style:{opacity:.6}},[(c=a==null?void 0:a.raw)==null?void 0:c[u.value]])]}})]}}):(S=a==null?void 0:a.raw)==null?void 0:S[r.value]},renderTag:({option:a,handleClose:S})=>{let v;return e.multiple?l.createVNode(t.NTag,{type:"primary",size:e.size,closable:!0,round:!0,onClose:()=>{S()},style:{"--n-padding":"0"}},I(v=F(a,r.value,n.value,d.value,u.value))?v:{default:()=>[v]}):F(a,r.value,n.value,d.value,u.value)}}),{action:()=>e.pagination?l.createVNode(t.NPagination,{size:"small",page:h.value.page,"onUpdate:page":a=>h.value.page=a,pageSlot:3,pageCount:j.value,pageSize:h.value.pageSize},null):null,...i})}});function F(e,o,i,f,w){var s;return i||w||f?l.createVNode(t.NSpace,{align:"center",size:"small",style:{padding:"6px 0"},wrapItem:!1},{default:()=>{var r,V,d;return[i&&l.createVNode(t.NImage,{src:(r=e==null?void 0:e.raw)==null?void 0:r[i],objectFit:"cover",width:22,height:22},null),f&&l.createVNode(t.NAvatar,{round:!0,src:((V=e==null?void 0:e.raw)==null?void 0:V[f])||"",size:22},{default:()=>{var n,u,N;return[(N=(u=(n=e==null?void 0:e.raw)==null?void 0:n[o])==null?void 0:u.charAt)==null?void 0:N.call(u,0)]}}),l.createVNode("div",null,[(d=e==null?void 0:e.raw)==null?void 0:d[o]])]}}):((s=e==null?void 0:e.raw)==null?void 0:s[o])||""}exports.DuxSelect=q;
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("@duxweb/dvha-core"),U=require("@vueuse/core"),E=require("lodash-es"),n=require("vue");function z(r){const d=n.toRef(r,"filters",{}),p=n.toRef(r,"sorters",{}),l=n.ref({}),i=n.ref([]),c=n.ref({...d.value,...l.value});U.watchDebounced([d,l],([e,t])=>{Object.keys(c.value).forEach(s=>{delete c.value[s]}),Object.assign(c.value,e,t)},{debounce:300,deep:!0});const o=k.useExtendList({...r,filters:c.value,sorters:p.value}),u=n.ref([]);n.watch(()=>r.columns,e=>{u.value=e},{immediate:!0});const v=n.computed(()=>u.value.filter(e=>e.show!==!1&&"key"in e).map(e=>e.key)),f=e=>{var s;const t=(s=E.cloneDeep(r.columns))==null?void 0:s.map(a=>(!("key"in a)||!(a!=null&&a.key)||!("title"in a)||!(a!=null&&a.title)||e.includes(a.key)||(a.show=!1),a));u.value=[...t]},g=e=>{o.checkeds.value=e},h=e=>{const t=Array.isArray(e)?e:[e],s={};t==null||t.forEach(a=>{a!=null&&a.columnKey&&a.order&&(s[a.columnKey]=a.order==="ascend"?"asc":"desc")}),o.onUpdateSorters(s)},y=e=>{const t={...l.value};Object.entries(e).forEach(([s,a])=>{t[s]=a}),l.value=t},S=e=>{i.value=e},b=n.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})),w=n.computed(()=>({remote:!0,checkedRowKeys:o.checkeds.value,expandedRowKeys:i.value,onUpdateCheckedRowKeys:g,onUpdateExpandedRowKeys:S,onUpdateSorter:h,onUpdateFilters:y,loading:o.isLoading.value,data:o.list.value,columns:u.value.filter(e=>e.show!==!1)}));return{...o,tablePagination:b,table:w,columns:u,columnSelected:v,onUpdateColumnSelected:f}}exports.useNaiveTable=z;
1
+ "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("@duxweb/dvha-core"),C=require("@vueuse/core"),E=require("lodash-es"),t=require("vue");function R(l){const d=t.toRef(l,"filters",{}),v=t.toRef(l,"sorters",{}),p=t.toRef(l,"columns",[]),u=t.ref({}),i=t.ref([]),c=t.ref({...d.value,...u.value});C.watchDebounced([d,u],([e,n])=>{Object.keys(c.value).forEach(s=>{delete c.value[s]}),Object.assign(c.value,e,n)},{debounce:300,deep:!0});const o=U.useExtendList({...l,filters:c.value,sorters:v.value}),r=t.ref([]);t.watch(p,e=>{r.value=e},{immediate:!0});const f=t.computed(()=>r.value.filter(e=>e.show!==!1&&"key"in e).map(e=>e.key)),g=e=>{var s;const n=(s=E.cloneDeep(p.value))==null?void 0:s.map(a=>(!("key"in a)||!(a!=null&&a.key)||!("title"in a)||!(a!=null&&a.title)||e.includes(a.key)||(a.show=!1),a));r.value=[...n]},h=e=>{o.checkeds.value=e},y=e=>{const n=Array.isArray(e)?e:[e],s={};n==null||n.forEach(a=>{a!=null&&a.columnKey&&a.order&&(s[a.columnKey]=a.order==="ascend"?"asc":"desc")}),o.onUpdateSorters(s)},b=e=>{const n={...u.value};Object.entries(e).forEach(([s,a])=>{n[s]=a}),u.value=n},S=e=>{i.value=e},w=t.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})),k=t.computed(()=>({remote:!0,checkedRowKeys:o.checkeds.value,expandedRowKeys:i.value,onUpdateCheckedRowKeys:h,onUpdateExpandedRowKeys:S,onUpdateSorter:y,onUpdateFilters:b,loading:o.isLoading.value,data:o.list.value,columns:r.value.filter(e=>e.show!==!1)}));return{...o,tablePagination:w,table:k,columns:r,columnSelected:f,onUpdateColumnSelected:g}}exports.useNaiveTable=R;
@@ -2,7 +2,7 @@ import { defineComponent as v, toRef as o, computed as f, createVNode as r, merg
2
2
  import { useTree as x } from "@duxweb/dvha-core";
3
3
  import { useVModel as C } from "@vueuse/core";
4
4
  import { NCascader as s, NSpin as V } from "naive-ui";
5
- const S = /* @__PURE__ */ v({
5
+ const P = /* @__PURE__ */ v({
6
6
  name: "DuxCascader",
7
7
  props: {
8
8
  path: String,
@@ -31,7 +31,8 @@ const S = /* @__PURE__ */ v({
31
31
  return i;
32
32
  });
33
33
  return () => r(V, {
34
- show: c.value
34
+ show: c.value,
35
+ class: "w-full"
35
36
  }, {
36
37
  default: () => [r(s, h(d.value, {
37
38
  clearable: !0,
@@ -45,5 +46,5 @@ const S = /* @__PURE__ */ v({
45
46
  }
46
47
  });
47
48
  export {
48
- S as DuxCascader
49
+ P as DuxCascader
49
50
  };
@@ -1,11 +1,11 @@
1
- import { defineComponent as m, toRef as d, computed as I, createVNode as l, mergeProps as A, isVNode as O } from "vue";
2
- import { useSelect as P } from "@duxweb/dvha-core";
3
- import { useVModel as T } from "@vueuse/core";
4
- import { NSelect as F, NTag as B, NSpace as S, NImage as b, NAvatar as p, NPagination as D } from "naive-ui";
5
- function L(e) {
6
- return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !O(e);
1
+ import { defineComponent as O, toRef as v, computed as P, createVNode as l, mergeProps as T, isVNode as B } from "vue";
2
+ import { useSelect as D } from "@duxweb/dvha-core";
3
+ import { useVModel as L } from "@vueuse/core";
4
+ import { NSelect as N, NTag as U, NSpace as p, NImage as j, NAvatar as x, NPagination as _ } from "naive-ui";
5
+ function M(e) {
6
+ return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !B(e);
7
7
  }
8
- const E = /* @__PURE__ */ m({
8
+ const G = /* @__PURE__ */ O({
9
9
  name: "DuxSelect",
10
10
  props: {
11
11
  path: String,
@@ -25,120 +25,130 @@ const E = /* @__PURE__ */ m({
25
25
  },
26
26
  multiple: Boolean
27
27
  },
28
- extends: F,
28
+ extends: N,
29
29
  setup(e, {
30
- emit: c,
31
- slots: v
30
+ emit: i,
31
+ slots: f
32
32
  }) {
33
- const s = d(e, "params", {}), o = d(e, "path"), r = T(e, "value", c, {
33
+ const o = v(e, "params", {}), F = v(e, "path"), s = L(e, "value", i, {
34
34
  passive: !0,
35
35
  defaultValue: e.defaultValue
36
- }), u = d(e, "labelField", "name"), z = d(e, "valueField", "id"), f = d(e, "avatarField", ""), g = d(e, "imageField", ""), i = d(e, "descField", ""), {
37
- onSearch: h,
38
- loading: N,
39
- pagination: w,
40
- options: V,
41
- pageCount: j
42
- } = P({
43
- path: o.value || "",
44
- params: s.value,
45
- defaultValue: r.value,
36
+ }), r = v(e, "labelField", "name"), h = v(e, "valueField", "id"), d = v(e, "avatarField", ""), n = v(e, "imageField", ""), u = v(e, "descField", ""), {
37
+ onSearch: w,
38
+ loading: C,
39
+ pagination: y,
40
+ options: m,
41
+ pageCount: I
42
+ } = D({
43
+ path: F.value || "",
44
+ params: o.value,
45
+ defaultValue: s.value,
46
46
  pagination: e.pagination,
47
- optionLabel: u.value,
48
- optionValue: z.value
49
- }), x = I(() => {
47
+ optionLabel: r.value,
48
+ optionValue: h.value
49
+ }), A = P(() => {
50
50
  const {
51
51
  labelField: a,
52
- valueField: t,
53
- avatarField: n,
54
- imageField: U,
55
- descField: _,
56
- ...C
52
+ valueField: S,
53
+ avatarField: c,
54
+ imageField: b,
55
+ descField: g,
56
+ ...t
57
57
  } = e;
58
- return C;
58
+ return t;
59
59
  });
60
- return () => l(F, A(x.value, {
61
- onSearch: h,
62
- loading: N.value,
60
+ return () => l(N, T(A.value, {
61
+ onSearch: w,
62
+ loading: C.value,
63
63
  filterable: !!e.pagination,
64
64
  clearable: !0,
65
65
  remote: !0,
66
- options: V.value,
67
- value: r.value,
68
- "onUpdate:value": (a) => r.value = a,
66
+ options: m.value,
67
+ value: s.value,
68
+ "onUpdate:value": (a) => s.value = a,
69
69
  multiple: e.multiple,
70
70
  onClear: () => {
71
- h("");
71
+ w("");
72
72
  },
73
- renderLabel: (a) => g.value || i.value ? l(S, {
74
- align: "center",
75
- size: "small",
76
- wrapItem: !1,
77
- style: {
78
- padding: "6px 0"
79
- }
80
- }, {
81
- default: () => [g.value && l(b, {
82
- src: a == null ? void 0 : a.raw[g.value],
83
- objectFit: "cover",
84
- width: 32,
85
- height: 32
86
- }, null), f.value && l(p, {
87
- round: !0,
88
- src: a == null ? void 0 : a.raw[f.value],
89
- size: 32
73
+ renderLabel: (a) => {
74
+ var S;
75
+ return n.value || u.value ? l(p, {
76
+ align: "center",
77
+ size: "small",
78
+ wrapItem: !1,
79
+ style: {
80
+ padding: "6px 0"
81
+ }
90
82
  }, {
91
83
  default: () => {
92
- var t, n;
93
- return [(n = (t = a == null ? void 0 : a.raw[u.value]) == null ? void 0 : t.charAt) == null ? void 0 : n.call(t, 0)];
84
+ var c, b;
85
+ return [n.value && l(j, {
86
+ src: (c = a == null ? void 0 : a.raw) == null ? void 0 : c[n.value],
87
+ objectFit: "cover",
88
+ width: 32,
89
+ height: 32
90
+ }, null), d.value && l(x, {
91
+ round: !0,
92
+ src: (b = a == null ? void 0 : a.raw) == null ? void 0 : b[d.value],
93
+ size: 32
94
+ }, {
95
+ default: () => {
96
+ var g, t, z;
97
+ return [(z = (t = (g = a == null ? void 0 : a.raw) == null ? void 0 : g[r.value]) == null ? void 0 : t.charAt) == null ? void 0 : z.call(t, 0)];
98
+ }
99
+ }), l(p, {
100
+ vertical: !0,
101
+ size: 0,
102
+ wrapItem: !1
103
+ }, {
104
+ default: () => {
105
+ var g, t;
106
+ return [l("div", null, [(g = a == null ? void 0 : a.raw) == null ? void 0 : g[r.value]]), u.value && l("div", {
107
+ style: {
108
+ opacity: 0.6
109
+ }
110
+ }, [(t = a == null ? void 0 : a.raw) == null ? void 0 : t[u.value]])];
111
+ }
112
+ })];
94
113
  }
95
- }), l(S, {
96
- vertical: !0,
97
- size: 0,
98
- wrapItem: !1
99
- }, {
100
- default: () => [l("div", null, [a == null ? void 0 : a.raw[u.value]]), i.value && l("div", {
101
- style: {
102
- opacity: 0.6
103
- }
104
- }, [a == null ? void 0 : a.raw[i.value]])]
105
- })]
106
- }) : a == null ? void 0 : a.raw[u.value],
114
+ }) : (S = a == null ? void 0 : a.raw) == null ? void 0 : S[r.value];
115
+ },
107
116
  renderTag: ({
108
117
  option: a,
109
- handleClose: t
118
+ handleClose: S
110
119
  }) => {
111
- let n;
112
- return e.multiple ? l(B, {
120
+ let c;
121
+ return e.multiple ? l(U, {
113
122
  type: "primary",
114
123
  size: e.size,
115
124
  closable: !0,
116
125
  round: !0,
117
126
  onClose: () => {
118
- t();
127
+ S();
119
128
  },
120
129
  style: {
121
130
  "--n-padding": "0"
122
131
  }
123
- }, L(n = y(a, u.value, g.value, f.value, i.value)) ? n : {
124
- default: () => [n]
125
- }) : y(a, u.value, g.value, f.value, i.value);
132
+ }, M(c = V(a, r.value, n.value, d.value, u.value)) ? c : {
133
+ default: () => [c]
134
+ }) : V(a, r.value, n.value, d.value, u.value);
126
135
  }
127
136
  }), {
128
- action: () => e.pagination ? l(D, {
137
+ action: () => e.pagination ? l(_, {
129
138
  size: "small",
130
- page: w.value.page,
131
- "onUpdate:page": (a) => w.value.page = a,
139
+ page: y.value.page,
140
+ "onUpdate:page": (a) => y.value.page = a,
132
141
  pageSlot: 3,
133
- pageCount: j.value,
134
- pageSize: w.value.pageSize
142
+ pageCount: I.value,
143
+ pageSize: y.value.pageSize
135
144
  }, null) : null,
136
- ...v
145
+ ...f
137
146
  });
138
147
  }
139
148
  });
140
- function y(e, c, v, s, o) {
141
- return v || o || s ? l(S, {
149
+ function V(e, i, f, o, F) {
150
+ var s;
151
+ return f || F || o ? l(p, {
142
152
  align: "center",
143
153
  size: "small",
144
154
  style: {
@@ -146,23 +156,26 @@ function y(e, c, v, s, o) {
146
156
  },
147
157
  wrapItem: !1
148
158
  }, {
149
- default: () => [v && l(b, {
150
- src: e == null ? void 0 : e.raw[v],
151
- objectFit: "cover",
152
- width: 22,
153
- height: 22
154
- }, null), s && l(p, {
155
- round: !0,
156
- src: (e == null ? void 0 : e.raw[s]) || "",
157
- size: 22
158
- }, {
159
- default: () => {
160
- var r, u;
161
- return [(u = (r = e == null ? void 0 : e.raw[c]) == null ? void 0 : r.charAt) == null ? void 0 : u.call(r, 0)];
162
- }
163
- }), l("div", null, [e == null ? void 0 : e.raw[c]])]
164
- }) : e == null ? void 0 : e.raw[c];
159
+ default: () => {
160
+ var r, h, d;
161
+ return [f && l(j, {
162
+ src: (r = e == null ? void 0 : e.raw) == null ? void 0 : r[f],
163
+ objectFit: "cover",
164
+ width: 22,
165
+ height: 22
166
+ }, null), o && l(x, {
167
+ round: !0,
168
+ src: ((h = e == null ? void 0 : e.raw) == null ? void 0 : h[o]) || "",
169
+ size: 22
170
+ }, {
171
+ default: () => {
172
+ var n, u, w;
173
+ return [(w = (u = (n = e == null ? void 0 : e.raw) == null ? void 0 : n[i]) == null ? void 0 : u.charAt) == null ? void 0 : w.call(u, 0)];
174
+ }
175
+ }), l("div", null, [(d = e == null ? void 0 : e.raw) == null ? void 0 : d[i]])];
176
+ }
177
+ }) : ((s = e == null ? void 0 : e.raw) == null ? void 0 : s[i]) || "";
165
178
  }
166
179
  export {
167
- E as DuxSelect
180
+ G as DuxSelect
168
181
  };
@@ -1,51 +1,51 @@
1
- import { useExtendList as x } from "@duxweb/dvha-core";
2
- import { watchDebounced as z } from "@vueuse/core";
1
+ import { useExtendList as z } from "@duxweb/dvha-core";
2
+ import { watchDebounced as C } from "@vueuse/core";
3
3
  import { cloneDeep as E } from "lodash-es";
4
- import { toRef as f, ref as u, watch as C, computed as d } from "vue";
5
- function j(s) {
6
- const p = f(s, "filters", {}), v = f(s, "sorters", {}), l = u({}), i = u([]), c = u({
7
- ...p.value,
4
+ import { toRef as d, ref as c, watch as K, computed as p } from "vue";
5
+ function L(r) {
6
+ const i = d(r, "filters", {}), g = d(r, "sorters", {}), f = d(r, "columns", []), l = c({}), v = c([]), u = c({
7
+ ...i.value,
8
8
  ...l.value
9
9
  });
10
- z([p, l], ([e, n]) => {
11
- Object.keys(c.value).forEach((t) => {
12
- delete c.value[t];
13
- }), Object.assign(c.value, e, n);
10
+ C([i, l], ([e, t]) => {
11
+ Object.keys(u.value).forEach((n) => {
12
+ delete u.value[n];
13
+ }), Object.assign(u.value, e, t);
14
14
  }, {
15
15
  debounce: 300,
16
16
  deep: !0
17
17
  });
18
- const o = x({
19
- ...s,
20
- filters: c.value,
21
- sorters: v.value
22
- }), r = u([]);
23
- C(() => s.columns, (e) => {
24
- r.value = e;
18
+ const o = z({
19
+ ...r,
20
+ filters: u.value,
21
+ sorters: g.value
22
+ }), s = c([]);
23
+ K(f, (e) => {
24
+ s.value = e;
25
25
  }, {
26
26
  immediate: !0
27
27
  });
28
- const g = d(() => r.value.filter((e) => e.show !== !1 && "key" in e).map((e) => e.key)), h = (e) => {
29
- var t;
30
- const n = (t = E(s.columns)) == null ? void 0 : t.map((a) => (!("key" in a) || !(a != null && a.key) || !("title" in a) || !(a != null && a.title) || e.includes(a.key) || (a.show = !1), a));
31
- r.value = [...n];
32
- }, w = (e) => {
33
- o.checkeds.value = e;
28
+ const h = p(() => s.value.filter((e) => e.show !== !1 && "key" in e).map((e) => e.key)), w = (e) => {
29
+ var n;
30
+ const t = (n = E(f.value)) == null ? void 0 : n.map((a) => (!("key" in a) || !(a != null && a.key) || !("title" in a) || !(a != null && a.title) || e.includes(a.key) || (a.show = !1), a));
31
+ s.value = [...t];
34
32
  }, y = (e) => {
35
- const n = Array.isArray(e) ? e : [e], t = {};
36
- n == null || n.forEach((a) => {
37
- a != null && a.columnKey && a.order && (t[a.columnKey] = a.order === "ascend" ? "asc" : "desc");
38
- }), o.onUpdateSorters(t);
33
+ o.checkeds.value = e;
39
34
  }, k = (e) => {
40
- const n = {
35
+ const t = Array.isArray(e) ? e : [e], n = {};
36
+ t == null || t.forEach((a) => {
37
+ a != null && a.columnKey && a.order && (n[a.columnKey] = a.order === "ascend" ? "asc" : "desc");
38
+ }), o.onUpdateSorters(n);
39
+ }, S = (e) => {
40
+ const t = {
41
41
  ...l.value
42
42
  };
43
- Object.entries(e).forEach(([t, a]) => {
44
- n[t] = a;
45
- }), l.value = n;
46
- }, S = (e) => {
47
- i.value = e;
48
- }, U = d(() => ({
43
+ Object.entries(e).forEach(([n, a]) => {
44
+ t[n] = a;
45
+ }), l.value = t;
46
+ }, U = (e) => {
47
+ v.value = e;
48
+ }, b = p(() => ({
49
49
  page: o.page.value,
50
50
  pageSize: o.pageSize.value,
51
51
  pageCount: o.pageCount.value,
@@ -55,27 +55,27 @@ function j(s) {
55
55
  onUpdatePageSize: o.onUpdatePageSize,
56
56
  showSizePicker: !0,
57
57
  showQuickJumper: !0
58
- })), b = d(() => ({
58
+ })), x = p(() => ({
59
59
  remote: !0,
60
60
  checkedRowKeys: o.checkeds.value,
61
- expandedRowKeys: i.value,
62
- onUpdateCheckedRowKeys: w,
63
- onUpdateExpandedRowKeys: S,
64
- onUpdateSorter: y,
65
- onUpdateFilters: k,
61
+ expandedRowKeys: v.value,
62
+ onUpdateCheckedRowKeys: y,
63
+ onUpdateExpandedRowKeys: U,
64
+ onUpdateSorter: k,
65
+ onUpdateFilters: S,
66
66
  loading: o.isLoading.value,
67
67
  data: o.list.value,
68
- columns: r.value.filter((e) => e.show !== !1)
68
+ columns: s.value.filter((e) => e.show !== !1)
69
69
  }));
70
70
  return {
71
71
  ...o,
72
- tablePagination: U,
73
- table: b,
74
- columns: r,
75
- columnSelected: g,
76
- onUpdateColumnSelected: h
72
+ tablePagination: b,
73
+ table: x,
74
+ columns: s,
75
+ columnSelected: h,
76
+ onUpdateColumnSelected: w
77
77
  };
78
78
  }
79
79
  export {
80
- j as useNaiveTable
80
+ L as useNaiveTable
81
81
  };
@@ -1,6 +1,6 @@
1
1
  import type { UseExtendListProps } from '@duxweb/dvha-core';
2
2
  import type { DataTableBaseColumn, DataTableExpandColumn, DataTableProps, DataTableSelectionColumn, PaginationProps } from 'naive-ui';
3
- import type { ComputedRef, Ref } from 'vue';
3
+ import type { ComputedRef, MaybeRef, Ref } from 'vue';
4
4
  import { useExtendList } from '@duxweb/dvha-core';
5
5
  export interface TableColumnExtend {
6
6
  show?: boolean;
@@ -15,7 +15,7 @@ export type DataTableColumn = DataTableBaseColumn | DataTableExpandColumn | Data
15
15
  export type TableColumn = DataTableColumn & TableColumnExtend;
16
16
  export interface UseTableProps extends Omit<UseExtendListProps, 'key'> {
17
17
  key?: TableColumnKey;
18
- columns: TableColumn[];
18
+ columns: MaybeRef<TableColumn[]>;
19
19
  }
20
20
  export interface UseNaiveTableReturn extends ReturnType<typeof useExtendList> {
21
21
  tablePagination: ComputedRef<PaginationProps>;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@duxweb/dvha-naiveui",
3
3
  "type": "module",
4
- "version": "1.0.17",
4
+ "version": "1.0.19",
5
5
  "author": "DuxWeb",
6
6
  "license": "MIT",
7
7
  "exports": {
@@ -33,7 +33,7 @@
33
33
  "pinia": "^3.0.3",
34
34
  "vue": "^3.5.0",
35
35
  "vue-router": "^4.5.1",
36
- "@duxweb/dvha-core": "1.0.17"
36
+ "@duxweb/dvha-core": "1.0.19"
37
37
  },
38
38
  "scripts": {
39
39
  "clean": "rimraf dist",