@duxweb/dvha-naiveui 1.1.19 → 1.1.20

package/dist/cjs/components/select/select.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("vue"),F=require("@duxweb/dvha-core"),z=require("@vueuse/core"),l=require("naive-ui");function j(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!a.isVNode(e)}const R=a.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:l.NSelect,setup(e,{emit:r,slots:n}){const i=a.toRef(e,"params",{}),s=a.toRef(e,"path"),g=z.useVModel(e,"value",r,{passive:!0,defaultValue:e.defaultValue}),u=a.toRef(e,"labelField","name"),m=a.toRef(e,"valueField","id"),d=a.toRef(e,"avatarField",""),o=a.toRef(e,"imageField",""),c=a.toRef(e,"descField",""),{onSearch:p,loading:V,pagination:f,options:w,pageCount:y}=F.useSelect({path:s,params:i,defaultValue:g,pagination:e.pagination,optionLabel:u.value,optionValue:m.value}),b=a.computed(()=>{const{labelField:t,valueField:N,avatarField:v,imageField:x,descField:C,...h}=e;return h});return()=>a.createVNode(l.NSelect,a.mergeProps(b.value,{onSearch:p,loading:V.value,filterable:!!e.pagination,clearable:!0,remote:!0,options:w.value,value:g.value,"onUpdate:value":t=>g.value=t,multiple:e.multiple,onClear:()=>{p("")},renderLabel:t=>o.value||c.value?a.createVNode(l.NSpace,{align:"center",size:"small",wrapItem:!1,style:{padding:"6px 0"}},{default:()=>[o.value&&a.createVNode(l.NImage,{src:t?.raw?.[o.value],objectFit:"cover",width:32,height:32},null),d.value&&a.createVNode(l.NAvatar,{round:!0,src:t?.raw?.[d.value],size:32},{default:()=>[t?.raw?.[u.value]?.charAt?.(0)]}),a.createVNode(l.NSpace,{vertical:!0,size:0,wrapItem:!1},{default:()=>[a.createVNode("div",null,[t?.raw?.[u.value]]),c.value&&a.createVNode("div",{style:{opacity:.6}},[t?.raw?.[c.value]])]})]}):t?.raw?.[u.value],renderTag:({option:t,handleClose:N})=>{let v;return e.multiple?a.createVNode(l.NTag,{type:"primary",size:e.size,closable:!0,round:!0,onClose:()=>{N()},style:{"--n-padding":"0"}},j(v=S(t,u.value,o.value,d.value,c.value))?v:{default:()=>[v]}):S(t,u.value,o.value,d.value,c.value)}}),{action:()=>e.pagination?a.createVNode(l.NPagination,{size:"small",page:f.value.page,"onUpdate:page":t=>f.value.page=t,pageSlot:3,pageCount:y.value,pageSize:f.value.pageSize},null):null,...n})}});function S(e,r,n,i,s){return n||s||i?a.createVNode(l.NSpace,{align:"center",size:"small",style:{padding:"6px 0"},wrapItem:!1},{default:()=>[n&&a.createVNode(l.NImage,{src:e?.raw?.[n],objectFit:"cover",width:22,height:22},null),i&&a.createVNode(l.NAvatar,{round:!0,src:e?.raw?.[i]||"",size:22},{default:()=>[e?.raw?.[r]?.charAt?.(0)]}),a.createVNode("div",null,[e?.raw?.[r]])]}):e?.raw?.[r]||""}exports.DuxSelect=R;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("vue"),x=require("@duxweb/dvha-core"),F=require("@vueuse/core"),C=require("lodash-es"),l=require("naive-ui");function O(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!a.isVNode(e)}const I=a.defineComponent({name:"DuxSelect",props:{path:String,params:Object,pagination:{type:Boolean,default:!0},avatarField:{type:String},imageField:{type:String},descField:{type:String},multiple:Boolean,option:{type:[Object,Array],default:void 0}},extends:l.NSelect,setup(e,{emit:u,slots:i}){const o=a.toRef(e,"params",{}),N=a.toRef(e,"path"),s=F.useVModel(e,"value",u,{passive:!0,defaultValue:e.defaultValue}),g=F.useVModel(e,"option",u,{passive:!0,defaultValue:e.multiple?[]:null}),n=a.toRef(e,"labelField","name"),j=a.toRef(e,"valueField","id"),f=a.toRef(e,"avatarField",""),c=a.toRef(e,"imageField",""),d=a.toRef(e,"descField",""),{onSearch:w,loading:A,pagination:m,options:V,pageCount:R}=x.useSelect({path:N,params:o,defaultValue:s,pagination:e.pagination,optionLabel:n.value,optionValue:j.value}),q=a.computed(()=>{const{labelField:t,valueField:v,avatarField:r,imageField:S,descField:b,option:p,...y}=e;return y}),h=t=>{if(e.multiple){C.isEqual(g.value,t)||(g.value=t||[]);return}g.value!==t&&(g.value=t||null)};return a.watch([s,V],([t,v])=>{if(e.multiple){const b=(Array.isArray(t)?t:[]).map(p=>v.find(y=>y.value===p)?.raw).filter(p=>!!p);h(b);return}const r=v.find(S=>S.value===t)?.raw||null;h(r)},{immediate:!0}),()=>a.createVNode(l.NSelect,a.mergeProps(q.value,{onSearch:w,loading:A.value,filterable:!!e.pagination,clearable:!0,remote:!0,options:V.value,value:s.value,"onUpdate:value":t=>s.value=t,multiple:e.multiple,onClear:()=>{w("")},renderLabel:t=>c.value||d.value?a.createVNode(l.NSpace,{align:"center",size:"small",wrapItem:!1,style:{padding:"6px 0"}},{default:()=>[c.value&&a.createVNode(l.NImage,{src:t?.raw?.[c.value],objectFit:"cover",width:32,height:32},null),f.value&&a.createVNode(l.NAvatar,{round:!0,src:t?.raw?.[f.value],size:32},{default:()=>[t?.raw?.[n.value]?.charAt?.(0)]}),a.createVNode(l.NSpace,{vertical:!0,size:0,wrapItem:!1},{default:()=>[a.createVNode("div",null,[t?.raw?.[n.value]]),d.value&&a.createVNode("div",{style:{opacity:.6}},[t?.raw?.[d.value]])]})]}):t?.raw?.[n.value],renderTag:({option:t,handleClose:v})=>{let r;return e.multiple?a.createVNode(l.NTag,{type:"primary",size:e.size,closable:!0,round:!0,onClose:()=>{v()},style:{"--n-padding":"0"}},O(r=z(t,n.value,c.value,f.value,d.value))?r:{default:()=>[r]}):z(t,n.value,c.value,f.value,d.value)}}),{action:()=>e.pagination?a.createVNode(l.NPagination,{size:"small",page:m.value.page,"onUpdate:page":t=>m.value.page=t,pageSlot:3,pageCount:R.value,pageSize:m.value.pageSize},null):null,...i})}});function z(e,u,i,o,N){return i||N||o?a.createVNode(l.NSpace,{align:"center",size:"small",style:{padding:"6px 0"},wrapItem:!1},{default:()=>[i&&a.createVNode(l.NImage,{src:e?.raw?.[i],objectFit:"cover",width:22,height:22},null),o&&a.createVNode(l.NAvatar,{round:!0,src:e?.raw?.[o]||"",size:22},{default:()=>[e?.raw?.[u]?.charAt?.(0)]}),a.createVNode("div",null,[e?.raw?.[u]])]}):e?.raw?.[u]||""}exports.DuxSelect=I;

package/dist/esm/components/select/select.js

@@ -1,11 +1,12 @@
-import { defineComponent as C, toRef as t, computed as I, createVNode as l, mergeProps as A, isVNode as O } from "vue";
-import { useSelect as P } from "@duxweb/dvha-core";
-import { useVModel as T } from "@vueuse/core";
-import { NSelect as S, NTag as B, NSpace as m, NImage as h, NAvatar as y, NPagination as D } from "naive-ui";
-function L(e) {
-  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !O(e);
+import { defineComponent as P, toRef as t, computed as T, watch as D, createVNode as l, mergeProps as U, isVNode as _ } from "vue";
+import { useSelect as q } from "@duxweb/dvha-core";
+import { useVModel as j } from "@vueuse/core";
+import { isEqual as E } from "lodash-es";
+import { NSelect as x, NTag as L, NSpace as h, NImage as V, NAvatar as C, NPagination as R } from "naive-ui";
+function k(e) {
+  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !_(e);
 }
-const E = /* @__PURE__ */ C({
+const W = /* @__PURE__ */ P({
   name: "DuxSelect",
   props: {
     path: String,
@@ -23,54 +24,78 @@ const E = /* @__PURE__ */ C({
     descField: {
       type: String
     },
-    multiple: Boolean
+    multiple: Boolean,
+    option: {
+      type: [Object, Array],
+      default: void 0
+    }
   },
-  extends: S,
+  extends: x,
   setup(e, {
-    emit: n,
+    emit: u,
     slots: r
   }) {
-    const i = t(e, "params", {}), s = t(e, "path"), g = T(e, "value", n, {
+    const o = t(e, "params", {}), p = t(e, "path"), s = j(e, "value", u, {
       passive: !0,
       defaultValue: e.defaultValue
-    }), u = t(e, "labelField", "name"), b = t(e, "valueField", "id"), c = t(e, "avatarField", ""), o = t(e, "imageField", ""), d = t(e, "descField", ""), {
-      onSearch: f,
-      loading: z,
-      pagination: p,
-      options: N,
-      pageCount: V
-    } = P({
-      path: s,
-      params: i,
-      defaultValue: g,
+    }), f = j(e, "option", u, {
+      passive: !0,
+      defaultValue: e.multiple ? [] : null
+    }), n = t(e, "labelField", "name"), O = t(e, "valueField", "id"), g = t(e, "avatarField", ""), d = t(e, "imageField", ""), c = t(e, "descField", ""), {
+      onSearch: F,
+      loading: I,
+      pagination: w,
+      options: b,
+      pageCount: B
+    } = q({
+      path: p,
+      params: o,
+      defaultValue: s,
       pagination: e.pagination,
-      optionLabel: u.value,
-      optionValue: b.value
-    }), j = I(() => {
+      optionLabel: n.value,
+      optionValue: O.value
+    }), M = T(() => {
       const {
         labelField: a,
-        valueField: w,
-        avatarField: v,
-        imageField: U,
-        descField: _,
-        ...x
+        valueField: v,
+        avatarField: i,
+        imageField: y,
+        descField: N,
+        option: m,
+        ...S
       } = e;
-      return x;
-    });
-    return () => l(S, A(j.value, {
-      onSearch: f,
-      loading: z.value,
+      return S;
+    }), z = (a) => {
+      if (e.multiple) {
+        E(f.value, a) || (f.value = a || []);
+        return;
+      }
+      f.value !== a && (f.value = a || null);
+    };
+    return D([s, b], ([a, v]) => {
+      if (e.multiple) {
+        const N = (Array.isArray(a) ? a : []).map((m) => v.find((S) => S.value === m)?.raw).filter((m) => !!m);
+        z(N);
+        return;
+      }
+      const i = v.find((y) => y.value === a)?.raw || null;
+      z(i);
+    }, {
+      immediate: !0
+    }), () => l(x, U(M.value, {
+      onSearch: F,
+      loading: I.value,
       filterable: !!e.pagination,
       clearable: !0,
       remote: !0,
-      options: N.value,
-      value: g.value,
-      "onUpdate:value": (a) => g.value = a,
+      options: b.value,
+      value: s.value,
+      "onUpdate:value": (a) => s.value = a,
       multiple: e.multiple,
       onClear: () => {
-        f("");
+        F("");
       },
-      renderLabel: (a) => o.value || d.value ? l(m, {
+      renderLabel: (a) => d.value || c.value ? l(h, {
         align: "center",
         size: "small",
         wrapItem: !1,
@@ -78,64 +103,64 @@ const E = /* @__PURE__ */ C({
           padding: "6px 0"
         }
       }, {
-        default: () => [o.value && l(h, {
-          src: a?.raw?.[o.value],
+        default: () => [d.value && l(V, {
+          src: a?.raw?.[d.value],
           objectFit: "cover",
           width: 32,
           height: 32
-        }, null), c.value && l(y, {
+        }, null), g.value && l(C, {
           round: !0,
-          src: a?.raw?.[c.value],
+          src: a?.raw?.[g.value],
           size: 32
         }, {
-          default: () => [a?.raw?.[u.value]?.charAt?.(0)]
-        }), l(m, {
+          default: () => [a?.raw?.[n.value]?.charAt?.(0)]
+        }), l(h, {
           vertical: !0,
           size: 0,
           wrapItem: !1
         }, {
-          default: () => [l("div", null, [a?.raw?.[u.value]]), d.value && l("div", {
+          default: () => [l("div", null, [a?.raw?.[n.value]]), c.value && l("div", {
             style: {
               opacity: 0.6
             }
-          }, [a?.raw?.[d.value]])]
+          }, [a?.raw?.[c.value]])]
         })]
-      }) : a?.raw?.[u.value],
+      }) : a?.raw?.[n.value],
       renderTag: ({
         option: a,
-        handleClose: w
+        handleClose: v
       }) => {
-        let v;
-        return e.multiple ? l(B, {
+        let i;
+        return e.multiple ? l(L, {
           type: "primary",
           size: e.size,
           closable: !0,
           round: !0,
           onClose: () => {
-            w();
+            v();
           },
           style: {
             "--n-padding": "0"
           }
-        }, L(v = F(a, u.value, o.value, c.value, d.value)) ? v : {
-          default: () => [v]
-        }) : F(a, u.value, o.value, c.value, d.value);
+        }, k(i = A(a, n.value, d.value, g.value, c.value)) ? i : {
+          default: () => [i]
+        }) : A(a, n.value, d.value, g.value, c.value);
       }
     }), {
-      action: () => e.pagination ? l(D, {
+      action: () => e.pagination ? l(R, {
         size: "small",
-        page: p.value.page,
-        "onUpdate:page": (a) => p.value.page = a,
+        page: w.value.page,
+        "onUpdate:page": (a) => w.value.page = a,
         pageSlot: 3,
-        pageCount: V.value,
-        pageSize: p.value.pageSize
+        pageCount: B.value,
+        pageSize: w.value.pageSize
       }, null) : null,
       ...r
     });
   }
 });
-function F(e, n, r, i, s) {
-  return r || s || i ? l(m, {
+function A(e, u, r, o, p) {
+  return r || p || o ? l(h, {
     align: "center",
     size: "small",
     style: {
@@ -143,20 +168,20 @@ function F(e, n, r, i, s) {
     },
     wrapItem: !1
   }, {
-    default: () => [r && l(h, {
+    default: () => [r && l(V, {
       src: e?.raw?.[r],
       objectFit: "cover",
       width: 22,
       height: 22
-    }, null), i && l(y, {
+    }, null), o && l(C, {
       round: !0,
-      src: e?.raw?.[i] || "",
+      src: e?.raw?.[o] || "",
       size: 22
     }, {
-      default: () => [e?.raw?.[n]?.charAt?.(0)]
-    }), l("div", null, [e?.raw?.[n]])]
-  }) : e?.raw?.[n] || "";
+      default: () => [e?.raw?.[u]?.charAt?.(0)]
+    }), l("div", null, [e?.raw?.[u]])]
+  }) : e?.raw?.[u] || "";
 }
 export {
-  E as DuxSelect
+  W as DuxSelect
 };

package/dist/types/components/select/select.d.ts

@@ -7,6 +7,7 @@ interface DuxSelectProps extends SelectProps {
     imageField?: string;
     descField?: string;
     multiple?: boolean;
+    option?: Record<string, any> | Record<string, any>[] | null;
 }
 export declare const DuxSelect: import("vue").DefineComponent<DuxSelectProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<DuxSelectProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export {};

package/package.json

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