vft 0.0.496 → 0.0.498

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

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

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

@@ -1,13 +1,13 @@
 import { getDynamicProps as c } from "@vft/utils";
-import { tryOnBeforeUnmount as m } from "@vueuse/core";
-import { ref as u, unref as l, watch as f, toRaw as b } from "vue";
-function g(r) {
+import { tryOnBeforeUnmount as f } from "@vueuse/core";
+import { ref as u, unref as l, watch as b, toRaw as D } from "vue";
+function h(r) {
   const n = u(null), o = u(!1), d = u(null);
   let s;
   function i(e, a) {
-    m(() => {
+    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 = f(
+    }), !(l(o) && e === l(n)) && (n.value = e, d.value = a, r && e.setProps(c(r)), o.value = !0, s?.(), s = b(
       () => r,
       () => {
         r && e.setProps(c(r));
@@ -36,7 +36,7 @@ function g(r) {
     },
     getColumns: () => {
       const e = t().getColumns() || [];
-      return b(e);
+      return D(e);
     },
     setColumns: (e) => {
       t().setColumns(e);
@@ -44,11 +44,11 @@ function g(r) {
     setTableData: (e) => t()?.setTableData(e),
     setPagination: (e) => t().setPagination(e),
     deleteTableDataRecord: (e, a) => t().deleteTableDataRecord(e, a),
-    insertTableDataRecord: (e, a) => t().insertTableDataRecord(e, a),
+    insertTableDataRecord: (e, a, m) => t().insertTableDataRecord(e, a, m),
     updateTableDataRecord: (e, a) => t().updateTableDataRecord(e, a),
     findTableDataRecord: (e) => t().findTableDataRecord(e)
   }];
 }
 export {
-  g as useTable
+  h as useTable
 };

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

@@ -62,22 +62,10 @@ export declare const VftTree: SFCWithInstall<{
         filterNodeMethod: {
             type: import("vue").PropType<import("./tree.type").FilterNodeMethodFunction>;
         };
-        allowDrop: {
-            type: import("vue").PropType<any>;
-        };
-        renderContent: {
-            type: import("vue").PropType<any>;
-        };
-        accordion: {
-            type: import("vue").PropType<boolean>;
-        };
         renderAfterExpand: {
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        showCheckbox: {
-            type: import("vue").PropType<boolean>;
-        };
         nodeKey: {
             type: import("vue").PropType<string>;
         };
@@ -85,12 +73,24 @@ export declare const VftTree: SFCWithInstall<{
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
+        renderContent: {
+            type: import("vue").PropType<any>;
+        };
+        showCheckbox: {
+            type: import("vue").PropType<boolean>;
+        };
         allowDrag: {
             type: import("vue").PropType<any>;
         };
+        allowDrop: {
+            type: import("vue").PropType<any>;
+        };
         highlightCurrent: {
             type: import("vue").PropType<boolean>;
         };
+        accordion: {
+            type: import("vue").PropType<boolean>;
+        };
         indent: {
             type: import("vue").PropType<number>;
             default: number;
@@ -98,17 +98,17 @@ export declare const VftTree: SFCWithInstall<{
     }>> & Readonly<{
         "onCurrent-change"?: (() => any) | undefined;
         onCheck?: (() => any) | undefined;
-        "onNode-drag-start"?: (() => any) | undefined;
-        "onNode-drag-leave"?: (() => any) | undefined;
-        "onNode-drag-enter"?: (() => any) | undefined;
-        "onNode-drag-over"?: (() => any) | undefined;
-        "onNode-drag-end"?: (() => any) | undefined;
-        "onNode-drop"?: (() => any) | undefined;
-        "onNode-expand"?: (() => any) | undefined;
         "onCheck-change"?: (() => any) | undefined;
         "onNode-click"?: (() => any) | undefined;
         "onNode-contextmenu"?: (() => any) | undefined;
         "onNode-collapse"?: (() => any) | undefined;
+        "onNode-expand"?: (() => any) | undefined;
+        "onNode-drag-start"?: (() => any) | undefined;
+        "onNode-drag-end"?: (() => any) | undefined;
+        "onNode-drop"?: (() => any) | undefined;
+        "onNode-drag-leave"?: (() => any) | undefined;
+        "onNode-drag-enter"?: (() => any) | undefined;
+        "onNode-drag-over"?: (() => any) | undefined;
     }>, {
         filter: (value: any) => void;
         getNodeKey: (node: import("./model/node").default) => any;
@@ -135,17 +135,17 @@ export declare const VftTree: SFCWithInstall<{
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
         "current-change": () => void;
         check: () => void;
-        "node-drag-start": () => void;
-        "node-drag-leave": () => void;
-        "node-drag-enter": () => void;
-        "node-drag-over": () => void;
-        "node-drag-end": () => void;
-        "node-drop": () => void;
-        "node-expand": () => void;
         "check-change": () => void;
         "node-click": () => void;
         "node-contextmenu": () => void;
         "node-collapse": () => void;
+        "node-expand": () => void;
+        "node-drag-start": () => void;
+        "node-drag-end": () => void;
+        "node-drop": () => void;
+        "node-drag-leave": () => void;
+        "node-drag-enter": () => void;
+        "node-drag-over": () => void;
     }, import("vue").PublicProps, {
         data: Array<any>;
         props: import("./tree.type").TreeComponentProps["props"];
@@ -216,22 +216,10 @@ export declare const VftTree: SFCWithInstall<{
         filterNodeMethod: {
             type: import("vue").PropType<import("./tree.type").FilterNodeMethodFunction>;
         };
-        allowDrop: {
-            type: import("vue").PropType<any>;
-        };
-        renderContent: {
-            type: import("vue").PropType<any>;
-        };
-        accordion: {
-            type: import("vue").PropType<boolean>;
-        };
         renderAfterExpand: {
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        showCheckbox: {
-            type: import("vue").PropType<boolean>;
-        };
         nodeKey: {
             type: import("vue").PropType<string>;
         };
@@ -239,12 +227,24 @@ export declare const VftTree: SFCWithInstall<{
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
+        renderContent: {
+            type: import("vue").PropType<any>;
+        };
+        showCheckbox: {
+            type: import("vue").PropType<boolean>;
+        };
         allowDrag: {
             type: import("vue").PropType<any>;
         };
+        allowDrop: {
+            type: import("vue").PropType<any>;
+        };
         highlightCurrent: {
             type: import("vue").PropType<boolean>;
         };
+        accordion: {
+            type: import("vue").PropType<boolean>;
+        };
         indent: {
             type: import("vue").PropType<number>;
             default: number;
@@ -252,17 +252,17 @@ export declare const VftTree: SFCWithInstall<{
     }>> & Readonly<{
         "onCurrent-change"?: (() => any) | undefined;
         onCheck?: (() => any) | undefined;
-        "onNode-drag-start"?: (() => any) | undefined;
-        "onNode-drag-leave"?: (() => any) | undefined;
-        "onNode-drag-enter"?: (() => any) | undefined;
-        "onNode-drag-over"?: (() => any) | undefined;
-        "onNode-drag-end"?: (() => any) | undefined;
-        "onNode-drop"?: (() => any) | undefined;
-        "onNode-expand"?: (() => any) | undefined;
         "onCheck-change"?: (() => any) | undefined;
         "onNode-click"?: (() => any) | undefined;
         "onNode-contextmenu"?: (() => any) | undefined;
         "onNode-collapse"?: (() => any) | undefined;
+        "onNode-expand"?: (() => any) | undefined;
+        "onNode-drag-start"?: (() => any) | undefined;
+        "onNode-drag-end"?: (() => any) | undefined;
+        "onNode-drop"?: (() => any) | undefined;
+        "onNode-drag-leave"?: (() => any) | undefined;
+        "onNode-drag-enter"?: (() => any) | undefined;
+        "onNode-drag-over"?: (() => any) | undefined;
     }>, {
         filter: (value: any) => void;
         getNodeKey: (node: import("./model/node").default) => any;
@@ -353,22 +353,10 @@ export declare const VftTree: SFCWithInstall<{
     filterNodeMethod: {
         type: import("vue").PropType<import("./tree.type").FilterNodeMethodFunction>;
     };
-    allowDrop: {
-        type: import("vue").PropType<any>;
-    };
-    renderContent: {
-        type: import("vue").PropType<any>;
-    };
-    accordion: {
-        type: import("vue").PropType<boolean>;
-    };
     renderAfterExpand: {
         type: import("vue").PropType<boolean>;
         default: boolean;
     };
-    showCheckbox: {
-        type: import("vue").PropType<boolean>;
-    };
     nodeKey: {
         type: import("vue").PropType<string>;
     };
@@ -376,12 +364,24 @@ export declare const VftTree: SFCWithInstall<{
         type: import("vue").PropType<boolean>;
         default: boolean;
     };
+    renderContent: {
+        type: import("vue").PropType<any>;
+    };
+    showCheckbox: {
+        type: import("vue").PropType<boolean>;
+    };
     allowDrag: {
         type: import("vue").PropType<any>;
     };
+    allowDrop: {
+        type: import("vue").PropType<any>;
+    };
     highlightCurrent: {
         type: import("vue").PropType<boolean>;
     };
+    accordion: {
+        type: import("vue").PropType<boolean>;
+    };
     indent: {
         type: import("vue").PropType<number>;
         default: number;
@@ -389,17 +389,17 @@ export declare const VftTree: SFCWithInstall<{
 }>> & Readonly<{
     "onCurrent-change"?: (() => any) | undefined;
     onCheck?: (() => any) | undefined;
-    "onNode-drag-start"?: (() => any) | undefined;
-    "onNode-drag-leave"?: (() => any) | undefined;
-    "onNode-drag-enter"?: (() => any) | undefined;
-    "onNode-drag-over"?: (() => any) | undefined;
-    "onNode-drag-end"?: (() => any) | undefined;
-    "onNode-drop"?: (() => any) | undefined;
-    "onNode-expand"?: (() => any) | undefined;
     "onCheck-change"?: (() => any) | undefined;
     "onNode-click"?: (() => any) | undefined;
     "onNode-contextmenu"?: (() => any) | undefined;
     "onNode-collapse"?: (() => any) | undefined;
+    "onNode-expand"?: (() => any) | undefined;
+    "onNode-drag-start"?: (() => any) | undefined;
+    "onNode-drag-end"?: (() => any) | undefined;
+    "onNode-drop"?: (() => any) | undefined;
+    "onNode-drag-leave"?: (() => any) | undefined;
+    "onNode-drag-enter"?: (() => any) | undefined;
+    "onNode-drag-over"?: (() => any) | undefined;
 }>, {
     filter: (value: any) => void;
     getNodeKey: (node: import("./model/node").default) => any;
@@ -426,17 +426,17 @@ export declare const VftTree: SFCWithInstall<{
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "current-change": () => void;
     check: () => void;
-    "node-drag-start": () => void;
-    "node-drag-leave": () => void;
-    "node-drag-enter": () => void;
-    "node-drag-over": () => void;
-    "node-drag-end": () => void;
-    "node-drop": () => void;
-    "node-expand": () => void;
     "check-change": () => void;
     "node-click": () => void;
     "node-contextmenu": () => void;
     "node-collapse": () => void;
+    "node-expand": () => void;
+    "node-drag-start": () => void;
+    "node-drag-end": () => void;
+    "node-drop": () => void;
+    "node-drag-leave": () => void;
+    "node-drag-enter": () => void;
+    "node-drag-over": () => void;
 }, string, {
     data: Array<any>;
     props: import("./tree.type").TreeComponentProps["props"];