vft 0.0.499 → 0.0.501

package/es/components/table/use/use-data-source.js

@@ -1,50 +1,50 @@
 import "../../pagination/index.js";
-import { isFunction as C, isBoolean as K, delObjAttrNotExist as tt, isString as et, isEmptyObject as at, isNullOrUndefined as M, isObject as P, isNumber as _, isPlainObject as rt } from "@vft/utils";
-import { merge as it, get as k } from "lodash-es";
-import { ref as B, watchEffect as nt, unref as n, watch as q, computed as st, onMounted as ot, nextTick as ct } from "vue";
-import { PageSize as lt } from "../constants.js";
-function ht(u, {
-  tableData: U,
-  setLoading: E,
-  getPaginationInfo: v,
-  setPagination: m,
-  getGridRef: y
-}, O) {
-  const c = B([]), j = B({});
-  nt(() => {
-    U.value = n(c);
-  }), q(
-    () => n(u).data,
+import { isFunction as B, isBoolean as ee, delObjAttrNotExist as te, isString as ae, isEmptyObject as re, isNullOrUndefined as M, isObject as k, isNumber as q, isPlainObject as ne } from "@vft/utils";
+import { merge as ie, get as H } from "lodash-es";
+import { ref as O, watchEffect as oe, unref as i, watch as L, computed as se, onMounted as le, nextTick as U } from "vue";
+import { PageSize as ce } from "../constants.js";
+function he(m, {
+  tableData: V,
+  setLoading: P,
+  getPaginationInfo: D,
+  setPagination: h,
+  getGridRef: C
+}, x) {
+  const f = O([]), z = O({});
+  oe(() => {
+    V.value = i(f);
+  }), L(
+    () => i(m).data,
     () => {
-      const { data: t, api: e } = n(u);
-      !e && t && (c.value = t);
+      const { data: e, api: t } = i(m);
+      !t && e && (f.value = e);
     },
     {
       immediate: !0
     }
   );
-  function V(t) {
-    m(t), p({});
+  function W(e) {
+    h(e), T({});
   }
-  const x = st(() => {
-    const t = n(c);
-    return !t || t.length === 0 ? n(c) : n(c);
+  const E = se(() => {
+    const e = i(f);
+    return !e || e.length === 0 ? i(f) : i(f);
   });
-  async function p(t) {
+  async function T(e) {
     const {
-      api: e,
-      fetchSetting: i = {},
+      api: t,
+      fetchSetting: r = {},
       beforeFetch: a,
-      afterFetch: s,
-      pagination: f,
-      delEmptyParams: o,
+      afterFetch: o,
+      pagination: s,
+      delEmptyParams: c,
       transformParams: w,
-      extraParams: g
-    } = n(u);
-    if (!(!e || !C(e)))
+      extraParams: u
+    } = i(m);
+    if (!(!t || !B(t)))
       try {
-        E(!0);
-        const { pageField: r, sizeField: d, listField: $, totalField: G } = Object.assign(
+        P(!0);
+        const { pageField: n, sizeField: d, listField: I, totalField: y } = Object.assign(
           {},
           {
             pageField: "page",
@@ -52,161 +52,184 @@ function ht(u, {
             listField: "items",
             totalField: "total"
           },
-          i
+          r
         );
-        let F = {}, l = t;
-        const { currentPage: N = 1, pageSize: R = lt } = n(
-          v
+        let g = {}, l = e;
+        const { currentPage: j = 1, pageSize: _ = ce } = i(
+          D
         );
         if (w) {
-          if (K(f) && !f)
-            F = {};
+          if (ee(s) && !s)
+            g = {};
           else {
-            const b = t && t.page || N;
-            F[r] = f?.pageIsZero ? b - 1 : b, F[d] = R;
+            const p = e && e.page || j;
+            g[n] = s?.pageIsZero ? p - 1 : p, g[d] = _;
           }
-          if (l = it(t, F), a && C(a)) {
-            const b = await a(l);
-            l = { ...l, ...b };
+          if (l = ie(e, g), a && B(a)) {
+            const p = await a(l);
+            l = { ...l, ...p };
           }
-          o && tt(
+          c && te(
             l,
-            et(o) ? o === "strict" : !1
+            ae(c) ? c === "strict" : !1
           );
         }
-        l && !at(l) && !M(g) ? P(l) && P(g) && (l = Object.assign({}, l, g)) : M(g) || (l = g);
-        const T = await e(l), I = Array.isArray(T);
-        let h = I ? T : k(T, $);
-        const S = I ? T.length : k(T, G);
+        l && !re(l) && !M(u) ? k(l) && k(u) && (l = Object.assign({}, l, u)) : M(u) || (l = u);
+        const F = await t(l), N = Array.isArray(F);
+        let b = N ? F : H(F, I);
+        const S = N ? F.length : H(F, y);
         if (Number(S)) {
-          const b = Math.ceil(S / R);
-          if (N > b)
-            return m({
-              currentPage: b
-            }), await p(t);
+          const p = Math.ceil(S / _);
+          if (j > p)
+            return h({
+              currentPage: p
+            }), await T(e);
         }
-        return s && C(s) && (h = await s(h) || h), c.value = h, j.value = h, m({
+        return o && B(o) && (b = await o(b) || b), f.value = b, z.value = b, h({
           total: S || 0
-        }), t && t.page && m({
-          currentPage: t.page || 1
-        }), O("fetch-success", {
-          items: n(h),
+        }), e && e.page && h({
+          currentPage: e.page || 1
+        }), x("fetch-success", {
+          items: i(b),
           total: S
-        }), h;
-      } catch (r) {
-        console.log(r), O("fetch-error", r), c.value = [], m({
+        }), b;
+      } catch (n) {
+        console.log(n), x("fetch-error", n), f.value = [], h({
           total: 0
         });
       } finally {
-        ct(() => {
-          E(!1);
+        U(() => {
+          P(!1);
         });
       }
   }
-  function D() {
-    return j.value;
+  function v() {
+    return z.value;
   }
-  async function Z(t) {
-    return m({
-      currentPage: t?.page || 1
-    }), await p(t);
+  async function X(e) {
+    return h({
+      currentPage: e?.page || 1
+    }), await T(e);
   }
-  async function H(t, e, i) {
-    return c.value[t] && (c.value[t][e] = i), c.value[t];
+  async function Z(e, t, r) {
+    return f.value[e] && (f.value[e][t] = r), f.value[e];
   }
-  function J(t, e) {
-    const i = y(), a = i.getRowById(t);
-    if (a)
-      return i.setRow(a, e), a;
+  function J(e, t) {
+    const r = C(), a = r.getRowById(e);
+    if (!a) return;
+    const s = i(m).treeConfig;
+    if (!!s && s?.parentField) {
+      const w = s.parentField, u = a[w], n = t[w], d = (g) => g == null || g === "" ? null : g, I = d(u), y = d(n);
+      if (I !== y) {
+        if (r.remove(a), y !== null) {
+          const l = r.getRowById(y);
+          l ? r.insertChild(t, l) : r.insert(t);
+        } else
+          r.insert(t);
+        const g = s.rowField || "id";
+        return r.getRowById(t[g]);
+      }
+    }
+    return r.setRow(a, t), a;
   }
-  async function L(t, e = 0, i) {
-    const a = rt(t) ? [t] : t, s = a.length, f = n(u), o = y();
-    if (!!f.treeConfig)
-      if (i != null && i !== "") {
-        const r = o.getRowById(i);
-        if (r)
+  async function Q(e, t = 0, r) {
+    const a = ne(e) ? [e] : e, o = a.length, s = i(m), c = C();
+    if (!!s.treeConfig)
+      if (r != null && r !== "") {
+        const n = c.getRowById(r);
+        if (n)
           for (const d of a)
-            await o.insertChild(d, r);
+            await c.insertChild(d, n);
         else
           for (const d of a)
-            await o.insert(d);
+            await c.insert(d);
       } else
-        for (const r of a)
-          await o.insert(r);
-    else if (e === -1)
-      for (const r of a)
-        await o.insertAt(r, -1);
+        for (const n of a)
+          await c.insert(n);
+    else if (t === -1)
+      for (const n of a)
+        await c.insertAt(n, -1);
     else
-      for (const r of a)
-        await o.insert(r);
-    if (s > 0) {
-      const { total: r } = n(v);
-      _(r) && m({
-        total: r + s
+      for (const n of a)
+        await c.insert(n);
+    if (o > 0) {
+      const { total: n } = i(D);
+      q(n) && h({
+        total: n + o
       });
     }
-    return n(c);
+    return i(f);
   }
-  function Q(t, e) {
-    const i = y(), a = t != null ? Array.isArray(t) ? t : [t] : e != null ? Array.isArray(e) ? e.map((f) => i.getRowById(f)).filter(Boolean) : i.getRowById(e) ? [i.getRowById(e)] : [] : [];
+  function Y(e, t) {
+    const r = C(), a = e != null ? Array.isArray(e) ? e : [e] : t != null ? Array.isArray(t) ? t.map((s) => r.getRowById(s)).filter(Boolean) : r.getRowById(t) ? [r.getRowById(t)] : [] : [];
     if (!a.length) return;
-    i.remove(a);
-    const { total: s } = n(v);
-    _(s) && m({ total: Math.max(0, s - a.length) });
+    r.remove(a);
+    const { total: o } = i(D);
+    q(o) && h({ total: Math.max(0, o - a.length) });
   }
-  function A(t) {
-    c.value = t;
+  function A(e) {
+    f.value = e;
   }
-  function W() {
-    return x.value;
+  function $() {
+    return E.value;
   }
-  function X(t) {
-    const e = String(t).trim().toLowerCase();
-    if (e) {
-      const i = D?.()?.filter((a) => {
-        for (const s in a)
-          if (String(a[s]).trim().toLowerCase()?.includes(e))
+  function G(e) {
+    const t = String(e).trim().toLowerCase();
+    if (t) {
+      const r = v?.()?.filter((a) => {
+        for (const o in a)
+          if (String(a[o]).trim().toLowerCase()?.includes(t))
             return !0;
       });
-      A(i);
+      A(r);
     } else
-      A(D());
+      A(v());
   }
-  function Y(t = 2) {
-    const e = y();
-    if (!e) return;
-    const a = n(u).treeConfig;
-    if (!a) return;
-    const s = a.childrenField || "children", f = e.getTableData().fullData, o = [], w = (g, r) => {
-      r > t || g.forEach((d) => {
-        o.push(d), d[s]?.length && r < t && w(d[s], r + 1);
-      });
-    };
-    w(f, 1), e.setTreeExpand(o, !0);
+  function K(e) {
+    const t = C();
+    !t || !i(m).treeConfig || U(() => {
+      if (e === void 0 || e === -1) {
+        t.setAllTreeExpand(!0);
+        return;
+      }
+      const o = t.getTableData().tableData;
+      if (!o || o.length === 0) {
+        console.warn("expandTreeLevel: 没有数据可展开");
+        return;
+      }
+      const s = [], c = (w, u) => {
+        u > e || w.forEach((n) => {
+          u <= e && s.push(n);
+          const d = n._X_ROW_CHILD;
+          d && d.length > 0 && u < e && c(d, u + 1);
+        });
+      };
+      c(o, 1), s.length > 0 && t.setTreeExpand(s, !0);
+    });
   }
-  const z = B(!0);
-  return ot(() => {
-    n(u).immediate && p(), z.value = !1;
-  }), q(
-    () => n(u).api,
+  const R = O(!0);
+  return le(() => {
+    i(m).immediate && T(), R.value = !1;
+  }), L(
+    () => i(m).api,
     () => {
-      n(u).watchApiFetch && !z.value && n(u).immediate && p();
+      i(m).watchApiFetch && !R.value && i(m).immediate && T();
     }
   ), {
     setTableData: A,
-    updateTableData: H,
+    updateTableData: Z,
     updateTableDataRecord: J,
-    insertTableDataRecord: L,
-    deleteTableDataRecord: Q,
-    reload: Z,
-    handleTableChange: V,
-    getDataSourceRef: x,
-    getDataSource: W,
-    getRawDataSource: D,
-    tableSearch: X,
-    expandTreeLevel: Y
+    insertTableDataRecord: Q,
+    deleteTableDataRecord: Y,
+    reload: X,
+    handleTableChange: W,
+    getDataSourceRef: E,
+    getDataSource: $,
+    getRawDataSource: v,
+    tableSearch: G,
+    expandTreeLevel: K
   };
 }
 export {
-  ht as useDataSource
+  he as useDataSource
 };

package/es/components/table/use/use-loading.js

@@ -1,19 +1,19 @@
-import { ref as l, unref as n, watch as u, computed as f } from "vue";
+import { ref as i, unref as o, watch as c, computed as g } from "vue";
 import { useLoadingDelay as m } from "@vft/use";
-function p(o) {
-  const t = l(n(o).loading), { loading: a, start: i, cancel: d } = m(230);
-  u(
-    [() => n(o).loading, a],
-    ([e, c]) => {
-      t.value = e || c;
+function p(t) {
+  const e = i(o(t).loading), { loading: l, start: u, cancel: d } = m(230), n = i(!0);
+  c(
+    [() => o(t).loading, l],
+    ([a, f]) => {
+      e.value = a || f;
     },
     { immediate: !0 }
   );
-  const g = f(() => n(t));
-  function r(e) {
-    e ? i() : d();
+  const r = g(() => o(e));
+  function s(a) {
+    a ? n.value ? (e.value = !0, n.value = !1) : u() : (e.value = !1, d());
   }
-  return { getLoading: g, setLoading: r };
+  return { getLoading: r, setLoading: s };
 }
 export {
   p as useLoading

package/es/components/table/use/use-table.js

@@ -1,13 +1,13 @@
 import { getDynamicProps as c } from "@vft/utils";
 import { tryOnBeforeUnmount as f } from "@vueuse/core";
-import { ref as u, unref as l, watch as b, toRaw as D } from "vue";
+import { ref as l, unref as u, watch as b, toRaw as p } from "vue";
 function h(r) {
-  const n = u(null), o = u(!1), d = u(null);
+  const n = l(null), o = l(!1), d = l(null);
   let s;
   function i(e, a) {
     f(() => {
       n.value = null, o.value = null;
-    }), !(l(o) && e === l(n)) && (n.value = e, d.value = a, r && e.setProps(c(r)), o.value = !0, s?.(), s = b(
+    }), !(u(o) && e === u(n)) && (n.value = e, d.value = a, r && e.setProps(c(r)), o.value = !0, s?.(), s = b(
       () => r,
       () => {
         r && e.setProps(c(r));
@@ -19,7 +19,7 @@ function h(r) {
     ));
   }
   function t() {
-    const e = l(n);
+    const e = u(n);
     return e || console.error(
       "The table instance has not been obtained yet, please make sure the table is presented when performing the table operation!"
     ), e;
@@ -36,7 +36,7 @@ function h(r) {
     },
     getColumns: () => {
       const e = t().getColumns() || [];
-      return D(e);
+      return p(e);
     },
     setColumns: (e) => {
       t().setColumns(e);
@@ -46,7 +46,8 @@ function h(r) {
     deleteTableDataRecord: (e, a) => t().deleteTableDataRecord(e, a),
     insertTableDataRecord: (e, a, m) => t().insertTableDataRecord(e, a, m),
     updateTableDataRecord: (e, a) => t().updateTableDataRecord(e, a),
-    findTableDataRecord: (e) => t().findTableDataRecord(e)
+    findTableDataRecord: (e) => t().findTableDataRecord(e),
+    expandTreeLevel: (e) => t().expandTreeLevel(e)
   }];
 }
 export {

package/es/components/tooltip/index.d.ts

@@ -2,7 +2,7 @@ import Tooltip from './tooltip.vue';
 export declare const VftTooltip: import("vft/es/utils").SFCWithInstall<{
     new (...args: any[]): import("vue").CreateComponentPublicInstanceWithMixins<Readonly<import("vue").ExtractPropTypes<{
         role: {
-            type: import("vue").PropType<"dialog" | "menu" | "grid" | "group" | "listbox" | "tooltip" | "tree" | "navigation">;
+            type: import("vue").PropType<"tree" | "dialog" | "menu" | "grid" | "group" | "listbox" | "tooltip" | "navigation">;
         };
         showArrow: {
             type: import("vue").PropType<boolean>;
@@ -173,7 +173,7 @@ export declare const VftTooltip: import("vft/es/utils").SFCWithInstall<{
         Defaults: {};
     }, Readonly<import("vue").ExtractPropTypes<{
         role: {
-            type: import("vue").PropType<"dialog" | "menu" | "grid" | "group" | "listbox" | "tooltip" | "tree" | "navigation">;
+            type: import("vue").PropType<"tree" | "dialog" | "menu" | "grid" | "group" | "listbox" | "tooltip" | "navigation">;
         };
         showArrow: {
             type: import("vue").PropType<boolean>;
@@ -334,7 +334,7 @@ export declare const VftTooltip: import("vft/es/utils").SFCWithInstall<{
     __isSuspense?: never;
 } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
     role: {
-        type: import("vue").PropType<"dialog" | "menu" | "grid" | "group" | "listbox" | "tooltip" | "tree" | "navigation">;
+        type: import("vue").PropType<"tree" | "dialog" | "menu" | "grid" | "group" | "listbox" | "tooltip" | "navigation">;
     };
     showArrow: {
         type: import("vue").PropType<boolean>;

package/es/components/tree/index.d.ts

@@ -97,12 +97,12 @@ export declare const VftTree: SFCWithInstall<{
         };
     }>> & Readonly<{
         "onCurrent-change"?: (() => any) | undefined;
-        onCheck?: (() => any) | undefined;
         "onCheck-change"?: (() => any) | undefined;
         "onNode-click"?: (() => any) | undefined;
         "onNode-contextmenu"?: (() => any) | undefined;
         "onNode-collapse"?: (() => any) | undefined;
         "onNode-expand"?: (() => any) | undefined;
+        onCheck?: (() => any) | undefined;
         "onNode-drag-start"?: (() => any) | undefined;
         "onNode-drag-end"?: (() => any) | undefined;
         "onNode-drop"?: (() => any) | undefined;
@@ -134,12 +134,12 @@ export declare const VftTree: SFCWithInstall<{
         updateNode: (data: import("./tree.type").TreeData, refNode: import("./tree.type").TreeKey | import("./tree.type").TreeNodeData | import("./model/node").default) => void;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
         "current-change": () => void;
-        check: () => void;
         "check-change": () => void;
         "node-click": () => void;
         "node-contextmenu": () => void;
         "node-collapse": () => void;
         "node-expand": () => void;
+        check: () => void;
         "node-drag-start": () => void;
         "node-drag-end": () => void;
         "node-drop": () => void;
@@ -251,12 +251,12 @@ export declare const VftTree: SFCWithInstall<{
         };
     }>> & Readonly<{
         "onCurrent-change"?: (() => any) | undefined;
-        onCheck?: (() => any) | undefined;
         "onCheck-change"?: (() => any) | undefined;
         "onNode-click"?: (() => any) | undefined;
         "onNode-contextmenu"?: (() => any) | undefined;
         "onNode-collapse"?: (() => any) | undefined;
         "onNode-expand"?: (() => any) | undefined;
+        onCheck?: (() => any) | undefined;
         "onNode-drag-start"?: (() => any) | undefined;
         "onNode-drag-end"?: (() => any) | undefined;
         "onNode-drop"?: (() => any) | undefined;
@@ -388,12 +388,12 @@ export declare const VftTree: SFCWithInstall<{
     };
 }>> & Readonly<{
     "onCurrent-change"?: (() => any) | undefined;
-    onCheck?: (() => any) | undefined;
     "onCheck-change"?: (() => any) | undefined;
     "onNode-click"?: (() => any) | undefined;
     "onNode-contextmenu"?: (() => any) | undefined;
     "onNode-collapse"?: (() => any) | undefined;
     "onNode-expand"?: (() => any) | undefined;
+    onCheck?: (() => any) | undefined;
     "onNode-drag-start"?: (() => any) | undefined;
     "onNode-drag-end"?: (() => any) | undefined;
     "onNode-drop"?: (() => any) | undefined;
@@ -425,12 +425,12 @@ export declare const VftTree: SFCWithInstall<{
     updateNode: (data: import("./tree.type").TreeData, refNode: import("./tree.type").TreeKey | import("./tree.type").TreeNodeData | import("./model/node").default) => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "current-change": () => void;
-    check: () => void;
     "check-change": () => void;
     "node-click": () => void;
     "node-contextmenu": () => void;
     "node-collapse": () => void;
     "node-expand": () => void;
+    check: () => void;
     "node-drag-start": () => void;
     "node-drag-end": () => void;
     "node-drop": () => void;

package/es/components/tree/tree.vue.d.ts

@@ -69,12 +69,12 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     updateNode: (data: TreeData, refNode: TreeKey | TreeNodeData | Node) => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "current-change": () => void;
-    check: () => void;
     "check-change": () => void;
     "node-click": () => void;
     "node-contextmenu": () => void;
     "node-collapse": () => void;
     "node-expand": () => void;
+    check: () => void;
     "node-drag-start": () => void;
     "node-drag-end": () => void;
     "node-drop": () => void;
@@ -94,12 +94,12 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     indent: number;
 }>>> & Readonly<{
     "onCurrent-change"?: (() => any) | undefined;
-    onCheck?: (() => any) | undefined;
     "onCheck-change"?: (() => any) | undefined;
     "onNode-click"?: (() => any) | undefined;
     "onNode-contextmenu"?: (() => any) | undefined;
     "onNode-collapse"?: (() => any) | undefined;
     "onNode-expand"?: (() => any) | undefined;
+    onCheck?: (() => any) | undefined;
     "onNode-drag-start"?: (() => any) | undefined;
     "onNode-drag-end"?: (() => any) | undefined;
     "onNode-drop"?: (() => any) | undefined;