@duxweb/dvha-core 1.0.42 → 1.0.44

package/dist/cjs/hooks/select.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("lodash-es"),o=require("vue"),y=require("./data.cjs");function k(t){const r=o.ref(),i=o.ref({page:1,pageSize:typeof t.pagination=="number"?t.pagination:t.pagination?20:0}),c=o.ref(!1),b=v.debounce(e=>{r.value=e},t.debounce||300),h=e=>{b(e)},{data:s,isLoading:V,total:S,pageCount:w}=y.useList({get path(){return t.path||""},get filters(){const e={...t.params};return r.value&&(e[t.keywordField||"keyword"]=r.value),e},get pagination(){return t.pagination?i.value:void 0},get providerName(){return t.providerName}}),d=o.ref([]),f=e=>{const a=t.optionField||t.optionValue;return typeof a=="string"?e[a]||e.value||e.id:typeof a=="function"?a(e):e.value||e.id},x=e=>{const{optionLabel:a="label",optionValue:l="value"}=t;let n;typeof a=="function"?n=a(e):typeof a=="string"?n=e[a]||e.label||e.name||e.title||String(e.value||e.id||""):n=e.label||e.name||e.title||String(e.value||e.id||"");let u;return typeof l=="function"?u=l(e):typeof l=="string"?u=e[l]||e.value||e.id:u=e.value||e.id,{label:n,value:u,raw:e}},g=o.computed(()=>{const e=s.value?.data||[],a=[...d.value];return e.forEach(l=>{a.some(u=>f(u)===f(l))||a.push(l)}),a.map(l=>x(l))}),F=o.computed(()=>s.value?.meta||{}),{refetch:N}=y.useMany({get path(){return t.path||""},get ids(){return t.defaultValue?v.isArray(t.defaultValue)?t.defaultValue:[t.defaultValue]:[]},options:{enabled:!1},providerName:t.providerName});o.watch(()=>t.defaultValue,async e=>{if(!(c.value||!e||(c.value=!0,(Array.isArray(e)?e:[e]).every(n=>g.value.some(u=>u.value===n)))))try{const n=await N();d.value=n?.data?.data||[]}catch(n){console.warn("Failed to fetch selected items:",n)}},{immediate:!0});const O=o.computed(()=>V.value);return{onSearch:h,options:g,meta:F,loading:O,pagination:i,total:S,pageCount:w}}exports.useSelect=k;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("lodash-es"),o=require("vue"),p=require("./data.cjs");function A(t){const r=o.toRef(t,"defaultValue"),c=o.ref(),i=o.ref({page:1,pageSize:typeof t.pagination=="number"?t.pagination:t.pagination?20:0}),d=o.ref(!1),s=o.ref({...t.params,keyword:""}),b=h.debounce(e=>{c.value=e,s.value.keyword=e},t.debounce||300),S=e=>{b(e)};o.watch(()=>t.params,e=>{s.value={keyword:c.value,...e}},{deep:!0});const{data:f,isLoading:V,total:w,pageCount:k}=p.useList({get path(){return t.path||""},filters:s,get pagination(){return t.pagination?i.value:void 0},get providerName(){return t.providerName}}),v=o.ref([]),g=e=>{const a=t.optionField||t.optionValue;return typeof a=="string"?e[a]||e.value||e.id:typeof a=="function"?a(e):e.value||e.id},x=e=>{const{optionLabel:a="label",optionValue:l="value"}=t;let n;typeof a=="function"?n=a(e):typeof a=="string"?n=e[a]||e.label||e.name||e.title||String(e.value||e.id||""):n=e.label||e.name||e.title||String(e.value||e.id||"");let u;return typeof l=="function"?u=l(e):typeof l=="string"?u=e[l]||e.value||e.id:u=e.value||e.id,{label:n,value:u,raw:e}},y=o.computed(()=>{const e=f.value?.data||[],a=[...v.value];return e.forEach(l=>{a.some(u=>g(u)===g(l))||a.push(l)}),a.map(l=>x(l))}),N=o.computed(()=>f.value?.meta||{}),{refetch:O}=p.useMany({get path(){return t.path||""},get ids(){return h.isArray(r.value)?r.value:[r.value]},options:{enabled:!1},providerName:t.providerName});o.watch(r,async e=>{if(!(d.value||!e||(d.value=!0,(Array.isArray(e)?e:[e]).every(n=>y.value.some(u=>u.value===n)))))try{const n=await O();v.value=n?.data?.data||[]}catch(n){console.warn("Failed to fetch selected items:",n)}},{immediate:!0,deep:!0});const q=o.computed(()=>V.value);return{onSearch:S,options:y,meta:N,loading:q,pagination:i,total:w,pageCount:k}}exports.useSelect=A;

package/dist/esm/hooks/select.js

@@ -1,82 +1,91 @@
-import { debounce as N, isArray as k } from "lodash-es";
-import { ref as u, computed as i, watch as A } from "vue";
-import { useList as E, useMany as L } from "./data.js";
-function z(t) {
-  const r = u(), s = u({
+import { debounce as E, isArray as F } from "lodash-es";
+import { toRef as L, ref as u, watch as h, computed as s } from "vue";
+import { useList as O, useMany as C } from "./data.js";
+function M(a) {
+  const r = L(a, "defaultValue"), c = u(), d = u({
     page: 1,
-    pageSize: typeof t.pagination == "number" ? t.pagination : t.pagination ? 20 : 0
-  }), c = u(!1), y = N((e) => {
-    r.value = e;
-  }, t.debounce || 300), h = (e) => {
-    y(e);
-  }, { data: d, isLoading: V, total: b, pageCount: w } = E({
+    pageSize: typeof a.pagination == "number" ? a.pagination : a.pagination ? 20 : 0
+  }), f = u(!1), i = u({
+    ...a.params,
+    keyword: ""
+  }), b = E((e) => {
+    c.value = e, i.value.keyword = e;
+  }, a.debounce || 300), V = (e) => {
+    b(e);
+  };
+  h(() => a.params, (e) => {
+    i.value = {
+      keyword: c.value,
+      ...e
+    };
+  }, {
+    deep: !0
+  });
+  const { data: v, isLoading: w, total: S, pageCount: x } = O({
     get path() {
-      return t.path || "";
-    },
-    get filters() {
-      const e = { ...t.params };
-      return r.value && (e[t.keywordField || "keyword"] = r.value), e;
+      return a.path || "";
     },
+    filters: i,
     get pagination() {
-      return t.pagination ? s.value : void 0;
+      return a.pagination ? d.value : void 0;
     },
     get providerName() {
-      return t.providerName;
+      return a.providerName;
     }
-  }), f = u([]), g = (e) => {
-    const a = t.optionField || t.optionValue;
-    return typeof a == "string" ? e[a] || e.value || e.id : typeof a == "function" ? a(e) : e.value || e.id;
-  }, S = (e) => {
-    const { optionLabel: a = "label", optionValue: l = "value" } = t;
+  }), g = u([]), y = (e) => {
+    const t = a.optionField || a.optionValue;
+    return typeof t == "string" ? e[t] || e.value || e.id : typeof t == "function" ? t(e) : e.value || e.id;
+  }, k = (e) => {
+    const { optionLabel: t = "label", optionValue: o = "value" } = a;
     let n;
-    typeof a == "function" ? n = a(e) : typeof a == "string" ? n = e[a] || e.label || e.name || e.title || String(e.value || e.id || "") : n = e.label || e.name || e.title || String(e.value || e.id || "");
-    let o;
-    return typeof l == "function" ? o = l(e) : typeof l == "string" ? o = e[l] || e.value || e.id : o = e.value || e.id, {
+    typeof t == "function" ? n = t(e) : typeof t == "string" ? n = e[t] || e.label || e.name || e.title || String(e.value || e.id || "") : n = e.label || e.name || e.title || String(e.value || e.id || "");
+    let l;
+    return typeof o == "function" ? l = o(e) : typeof o == "string" ? l = e[o] || e.value || e.id : l = e.value || e.id, {
       label: n,
-      value: o,
+      value: l,
       raw: e
     };
-  }, v = i(() => {
-    const e = d.value?.data || [], a = [...f.value];
-    return e.forEach((l) => {
-      a.some(
-        (o) => g(o) === g(l)
-      ) || a.push(l);
-    }), a.map((l) => S(l));
-  }), x = i(() => d.value?.meta || {}), { refetch: p } = L({
+  }, p = s(() => {
+    const e = v.value?.data || [], t = [...g.value];
+    return e.forEach((o) => {
+      t.some(
+        (l) => y(l) === y(o)
+      ) || t.push(o);
+    }), t.map((o) => k(o));
+  }), N = s(() => v.value?.meta || {}), { refetch: m } = C({
     get path() {
-      return t.path || "";
+      return a.path || "";
     },
     get ids() {
-      return t.defaultValue ? k(t.defaultValue) ? t.defaultValue : [t.defaultValue] : [];
+      return F(r.value) ? r.value : [r.value];
     },
     options: {
       enabled: !1
     },
-    providerName: t.providerName
+    providerName: a.providerName
   });
-  A(() => t.defaultValue, async (e) => {
-    if (!(c.value || !e || (c.value = !0, (Array.isArray(e) ? e : [e]).every(
-      (n) => v.value.some((o) => o.value === n)
+  h(r, async (e) => {
+    if (!(f.value || !e || (f.value = !0, (Array.isArray(e) ? e : [e]).every(
+      (n) => p.value.some((l) => l.value === n)
     ))))
       try {
-        const n = await p();
-        f.value = n?.data?.data || [];
+        const n = await m();
+        g.value = n?.data?.data || [];
       } catch (n) {
         console.warn("Failed to fetch selected items:", n);
       }
-  }, { immediate: !0 });
-  const F = i(() => V.value);
+  }, { immediate: !0, deep: !0 });
+  const A = s(() => w.value);
   return {
-    onSearch: h,
-    options: v,
-    meta: x,
-    loading: F,
-    pagination: s,
-    total: b,
-    pageCount: w
+    onSearch: V,
+    options: p,
+    meta: N,
+    loading: A,
+    pagination: d,
+    total: S,
+    pageCount: x
   };
 }
 export {
-  z as useSelect
+  M as useSelect
 };

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

@@ -1,7 +1,8 @@
+import type { MaybeRef } from 'vue';
 type SelectValue = Array<string | number> | string | number | null | undefined;
 export interface IUseSelectProps {
     /** 默认选中值，可以是单个值或数组 */
-    defaultValue?: SelectValue;
+    defaultValue?: MaybeRef<SelectValue>;
     /** 数据请求路径 */
     path?: string;
     /** 请求参数 */

package/dist/types/types/data.d.ts

@@ -1,3 +1,4 @@
+import type { MaybeRef } from 'vue';
 import type { IManageHook } from '../hooks';
 import type { IUserState } from '../stores';
 /**
@@ -42,8 +43,8 @@ export interface IDataProviderPagination {
 export interface IDataProviderListOptions {
     path: string;
     pagination?: IDataProviderPagination | boolean;
-    sorters?: Record<string, 'asc' | 'desc'>;
-    filters?: Record<string, any>;
+    sorters?: MaybeRef<Record<string, 'asc' | 'desc'>>;
+    filters?: MaybeRef<Record<string, any>>;
     meta?: Record<string, any>;
 }
 export interface IDataProviderCreateOptions {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-core",
   "type": "module",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "author": "DuxWeb",
   "license": "MIT",
   "repository": {