@duxweb/dvha-core 1.1.18 → 1.1.19

package/dist/cjs/hooks/select.cjs

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

package/dist/cjs/hooks/tree.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("vue");require("../utils/bus.cjs");const o=require("../utils/tree.cjs"),m=require("./data.cjs");function p(e){const d=t.toRef(e,"path"),u=t.toRef(e,"params"),c=t.toRef(e,"providerName"),{data:n,isLoading:s}=m.useList({path:d.value||"",filters:u.value,providerName:c.value}),a=t.computed(()=>e.converTree?o.arrayToTree(n.value?.data||[],{idKey:e.treeOptions?.valueKey||"id",parentKey:e.treeOptions?.parentKey||"parent_id",sortKey:e.treeOptions?.sortKey||"sort",childrenKey:e.treeOptions?.childrenKey||"children"}):n.value?.data||[]),l=t.computed(()=>o.treeToArr(a.value,e.treeOptions?.valueKey||"id",e.treeOptions?.childrenKey||"children")),v=t.computed(()=>s.value);return{options:t.computed(()=>{const i=y=>y.map(h=>{const r={...h};return Array.isArray(r.children)&&(r.children.length===0?delete r.children:r.children=i(r.children)),r});return i(a.value||[])}),loading:v,expanded:l}}exports.useTree=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue");require("../utils/bus.cjs");const s=require("../utils/tree.cjs"),y=require("./data.cjs");function f(t){const l=e.computed(()=>e.unref(t.path)||""),c=e.computed(()=>e.unref(t.params)||{}),h=e.computed(()=>e.unref(t.providerName)),a=e.reactive({...c.value});e.watch(c,i=>{const o=i||{};Object.keys(a).forEach(n=>{n in o||delete a[n]}),Object.entries(o).forEach(([n,r])=>{a[n]=r})},{deep:!0,immediate:!0});const{data:u,isLoading:m}=y.useList({get path(){return l.value},filters:a,get providerName(){return h.value}}),d=e.computed(()=>t.converTree?s.arrayToTree(u.value?.data||[],{idKey:t.treeOptions?.valueKey||"id",parentKey:t.treeOptions?.parentKey||"parent_id",sortKey:t.treeOptions?.sortKey||"sort",childrenKey:t.treeOptions?.childrenKey||"children"}):u.value?.data||[]),v=e.computed(()=>s.treeToArr(d.value,t.treeOptions?.valueKey||"id",t.treeOptions?.childrenKey||"children")),p=e.computed(()=>m.value);return{options:e.computed(()=>{const i=o=>o.map(n=>{const r={...n};return Array.isArray(r.children)&&(r.children.length===0?delete r.children:r.children=i(r.children)),r});return i(d.value||[])}),loading:p,expanded:v}}exports.useTree=f;

package/dist/esm/hooks/select.js

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

package/dist/esm/hooks/tree.js

@@ -1,30 +1,48 @@
-import { toRef as n, computed as r } from "vue";
+import { computed as r, unref as c, reactive as y, watch as f } from "vue";
 import "../utils/bus.js";
-import { arrayToTree as p, treeToArr as y } from "../utils/tree.js";
-import { useList as K } from "./data.js";
-function N(e) {
-  const d = n(e, "path"), s = n(e, "params"), l = n(e, "providerName"), { data: i, isLoading: c } = K({
-    path: d.value || "",
-    filters: s.value,
-    providerName: l.value
-  }), a = r(() => e.converTree ? p(i.value?.data || [], {
+import { arrayToTree as K, treeToArr as O } from "../utils/tree.js";
+import { useList as g } from "./data.js";
+function j(e) {
+  const u = r(() => c(e.path) || ""), s = r(() => c(e.params) || {}), h = r(() => c(e.providerName)), i = y({
+    ...s.value
+  });
+  f(s, (a) => {
+    const o = a || {};
+    Object.keys(i).forEach((n) => {
+      n in o || delete i[n];
+    }), Object.entries(o).forEach(([n, t]) => {
+      i[n] = t;
+    });
+  }, {
+    deep: !0,
+    immediate: !0
+  });
+  const { data: d, isLoading: m } = g({
+    get path() {
+      return u.value;
+    },
+    filters: i,
+    get providerName() {
+      return h.value;
+    }
+  }), l = r(() => e.converTree ? K(d.value?.data || [], {
     idKey: e.treeOptions?.valueKey || "id",
     parentKey: e.treeOptions?.parentKey || "parent_id",
     sortKey: e.treeOptions?.sortKey || "sort",
     childrenKey: e.treeOptions?.childrenKey || "children"
-  }) : i.value?.data || []), u = r(() => y(a.value, e.treeOptions?.valueKey || "id", e.treeOptions?.childrenKey || "children")), m = r(() => c.value);
+  }) : d.value?.data || []), v = r(() => O(l.value, e.treeOptions?.valueKey || "id", e.treeOptions?.childrenKey || "children")), p = r(() => m.value);
   return {
     options: r(() => {
-      const o = (h) => h.map((v) => {
-        const t = { ...v };
-        return Array.isArray(t.children) && (t.children.length === 0 ? delete t.children : t.children = o(t.children)), t;
+      const a = (o) => o.map((n) => {
+        const t = { ...n };
+        return Array.isArray(t.children) && (t.children.length === 0 ? delete t.children : t.children = a(t.children)), t;
       });
-      return o(a.value || []);
+      return a(l.value || []);
     }),
-    loading: m,
-    expanded: u
+    loading: p,
+    expanded: v
   };
 }
 export {
-  N as useTree
+  j as useTree
 };

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

@@ -4,13 +4,13 @@ export interface IUseSelectProps {
     /** 默认选中值，可以是单个值或数组 */
     defaultValue?: MaybeRef<SelectValue>;
     /** 数据请求路径 */
-    path?: string;
+    path?: MaybeRef<string | undefined>;
     /** 请求参数 */
-    params?: Record<string, any>;
+    params?: MaybeRef<Record<string, any> | undefined>;
     /** 分页配置，false表示不分页，true表示默认20条/页，数字表示指定每页条数 */
     pagination?: boolean | number;
     /** 数据提供者名称 */
-    providerName?: string;
+    providerName?: MaybeRef<string | undefined>;
     /**
      * 选项显示标签配置
      * - 字符串：指定用作显示标签的字段名

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

@@ -1,6 +1,7 @@
+import type { MaybeRef } from 'vue';
 export interface IUseTreeProps {
-    path?: string;
-    params?: Record<string, any>;
+    path?: MaybeRef<string | undefined>;
+    params?: MaybeRef<Record<string, any> | undefined>;
     treeOptions?: {
         valueKey?: string;
         parentKey?: string;
@@ -8,7 +9,7 @@ export interface IUseTreeProps {
         childrenKey?: string;
     };
     converTree?: boolean;
-    providerName?: string;
+    providerName?: MaybeRef<string | undefined>;
 }
 export declare function useTree(props: IUseTreeProps): {
     options: import("vue").ComputedRef<any[]>;

package/package.json

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