vft 0.0.127 → 0.0.129

package/es/components/super-form/use/helper.js

@@ -1,5 +1,5 @@
-import { FormCompEnum as r, isInput as E } from "../component-map.js";
-import { isNumber as i } from "@vft/utils";
+import { isNumber as E } from "@vft/utils";
+import { FormCompEnum as r, isInput as i } from "../component-map.js";
 function t(u, e) {
   return [r.INPUT, r.INPUT_NUMBER].includes(u) ? "请输入" + e : [r.PASSWORD].includes(u) ? "请输入密码" : [r.SELECT].includes(u) ? "请选择" + e : [
     r.TIME_PICKER,
@@ -12,7 +12,7 @@ function t(u, e) {
   ].includes(u) ? "请选择时间" : "";
 }
 function s(u, e) {
-  return u && E(u) && e && i(e) ? `${e}` : e;
+  return u && i(u) && e && E(e) ? `${e}` : e;
 }
 export {
   t as createPlaceholderMessage,

package/es/components/super-form/use/use-form-events.js

@@ -1,8 +1,8 @@
-import { unref as c, nextTick as M, toRaw as B } from "vue";
-import { isFunction as g, formatToDate as U, isDef as z, isString as j, isObject as m, isArray as I, deepMerge as tt, isNullOrUndefined as G, isEmpty as nt, isEmptyObject as et } from "@vft/utils";
-import { handleInputNumberValue as it } from "./helper.js";
-import { cloneDeep as w, get as ct, uniqBy as ot, isEqual as rt, set as H } from "lodash";
-import { isInput as st, FormCompEnum as x, isDatePicker as at } from "../component-map.js";
+import { isFunction as B, formatToDate as U, isDef as z, isString as g, isObject as m, isArray as I, deepMerge as M, isNullOrUndefined as G, isEmpty as tt, isEmptyObject as nt } from "@vft/utils";
+import { cloneDeep as w, get as et, uniqBy as it, isEqual as ct, set as H } from "lodash";
+import { unref as c, nextTick as ot, toRaw as j } from "vue";
+import { isInput as rt, FormCompEnum as x, isDatePicker as st } from "../component-map.js";
+import { handleInputNumberValue as at } from "./helper.js";
 function ut(v, F = {}) {
   const a = /^\[(.+)\]$/;
   if (a.test(v)) {
@@ -46,24 +46,24 @@ function yt({
 }) {
   async function P(t) {
     const { resetFunc: n, submitOnReset: s } = c(F);
-    n && g(n) && await n();
+    n && B(n) && await n();
     const i = c(f);
     if (i) {
       if (t != null && t.length)
         return i.resetFields(t);
       Object.keys(a).forEach((o) => {
         const e = c(d).find((u) => u.field === o), r = w(y.value[o]);
-        a[o] = st(e == null ? void 0 : e.component) ? r || "" : r;
-      }), M(() => O()), v("reset", B(a)), s && await q();
+        a[o] = rt(e == null ? void 0 : e.component) ? r || "" : r;
+      }), ot(() => O()), v("reset", j(a)), s && await q();
     }
   }
   async function S(t) {
     const n = c(d).map((e) => e.field).filter(Boolean), s = ".", i = n.filter((e) => String(e).indexOf(s) >= 0), o = [];
     n.forEach((e) => {
       const r = c(d).find((l) => l.field === e);
-      let u = ct(t, e);
+      let u = et(t, e);
       const A = Reflect.has(t, e);
-      u = it(r == null ? void 0 : r.component, u);
+      u = at(r == null ? void 0 : r.component, u);
       const { componentProps: N } = r || {};
       let h = N;
       typeof N == "function" && (h = h({ formModel: c(a) }));
@@ -97,14 +97,14 @@ function yt({
     const n = w(c(d));
     if (!t)
       return;
-    let s = j(t) ? [t] : t;
-    j(t) && (s = [t]);
+    let s = g(t) ? [t] : t;
+    g(t) && (s = [t]);
     for (const i of s)
       W(i, n);
     p.value = n;
   }
   function W(t, n) {
-    if (j(t)) {
+    if (g(t)) {
       const s = n.findIndex((i) => i.field === t);
       s !== -1 && (delete a[t], n.splice(s, 1));
     }
@@ -145,11 +145,11 @@ function yt({
       if (n.forEach((u) => {
         e.field === u.field && (r = u), u.defaultValue && u.field && i.push(u.field);
       }), r !== void 0 && e.field === r.field) {
-        const u = tt(e, r);
+        const u = M(e, r);
         o.push(u);
       } else
         o.push(e);
-    }), V(o, i), p.value = ot(o, "field");
+    }), V(o, i), p.value = it(o, "field");
   }
   function V(t, n) {
     if (I(n) && (n == null ? void 0 : n.length) === 0)
@@ -158,17 +158,17 @@ function yt({
     m(t) && s.push(t), I(t) && (s = [...t]);
     const i = {}, o = T();
     s.forEach((e) => {
-      e.component !== x.DIVIDER && Reflect.has(e, "field") && e.field && !G(e.defaultValue) && (!(e.field in o) || G(o[e.field]) || nt(o[e.field])) && (i[e.field] = e.defaultValue);
-    }), et(i) || S(i);
+      e.component !== x.DIVIDER && Reflect.has(e, "field") && e.field && !G(e.defaultValue) && (!(e.field in o) || G(o[e.field]) || tt(o[e.field])) && (i[e.field] = e.defaultValue);
+    }), nt(i) || S(i);
   }
   function T() {
-    return c(f) ? D(B(c(a))) : {};
+    return c(f) ? D(j(c(a))) : {};
   }
   function _(t) {
-    return c(f) ? B(c(a))[t] : {};
+    return c(f) ? j(c(a))[t] : {};
   }
   function K(t) {
-    return c(d).some((n) => n.field === t ? at(n.component) : !1);
+    return c(d).some((n) => n.field === t ? st(n.component) : !1);
   }
   async function C(t) {
     var n;
@@ -190,7 +190,7 @@ function yt({
     const { autoCleanErrorMessage: n, watchDataIsChange: s } = c(F);
     t && t.preventDefault(), n && await O();
     const { submitFunc: i, beforeSubmitFunc: o } = c(F);
-    if (o && g(o) && await o(), i && g(i)) {
+    if (o && B(o) && await o(), i && B(i)) {
       await i();
       return;
     }
@@ -198,7 +198,7 @@ function yt({
       try {
         const r = await L(), u = D(r);
         if (s) {
-          const A = rt(J.value, u);
+          const A = ct(J.value, u);
           v("submit", u, !A);
         } else
           v("submit", u);

package/es/components/super-form/use/use-form-values.js

@@ -1,6 +1,6 @@
 import { isObject as T, isArray as A, isFunction as O, isString as V, formatToDate as D, isNullOrUndefined as Y } from "@vft/utils";
-import { unref as b } from "vue";
 import { set as h, cloneDeep as E } from "lodash";
+import { unref as b } from "vue";
 function F(m, e, a) {
   const c = /^\[(.+)\]$/;
   if (c.test(m)) {

package/es/components/super-form/use/use-form.js

@@ -1,5 +1,5 @@
-import { unref as o, ref as i, watch as l, nextTick as f } from "vue";
-import { tryOnBeforeUnmount as u } from "@vueuse/core";
+import { tryOnBeforeUnmount as l } from "@vueuse/core";
+import { unref as o, ref as i, watch as f, nextTick as u } from "vue";
 function d(n) {
   const r = {};
   return Object.keys(n).map((s) => {
@@ -12,12 +12,12 @@ function w(n) {
     const e = o(r);
     return e || console.error(
       "The form instance has not been obtained, please make sure that the form has been rendered when performing the form operation!"
-    ), await f(), e;
+    ), await u(), e;
   }
   function c(e) {
-    u(() => {
+    l(() => {
       r.value = null, s.value = null;
-    }), !(o(s) && e === o(r)) && (r.value = e, s.value = !0, l(
+    }), !(o(s) && e === o(r)) && (r.value = e, s.value = !0, f(
       () => n,
       () => {
         n && e.setProps(d(n));

package/es/components/switch/index.js

@@ -1,9 +1,9 @@
-import { withInstall as t } from "../../utils/vue/install.js";
-import "vue";
-import "@vft/utils";
-import "lodash";
 import "@vueuse/core";
+import "@vft/utils";
 import "../../utils/ns-cover.js";
+import "lodash";
+import { withInstall as t } from "../../utils/vue/install.js";
+import "vue";
 import o from "./switch.vue2.js";
 const c = t(o);
 export {

package/es/components/switch/switch.vue2.js

@@ -1,12 +1,12 @@
 import { defineComponent as H, computed as s, ref as T, watch as w, onMounted as Z, openBlock as n, createElementBlock as u, normalizeClass as r, normalizeStyle as M, withModifiers as ee, createElementVNode as B, unref as o, withKeys as ae, createBlock as V, normalizeProps as E, mergeProps as I, createCommentVNode as c, toDisplayString as N, nextTick as oe } from "vue";
 import { singleAttrToObj as U, addUnit as ie, isPromise as j, isBoolean as te } from "@vft/utils";
-import { debugWarn as G, throwError as le } from "../../utils/error.js";
-import "lodash";
-import "@vueuse/core";
+import "../form/index.js";
+import { VftIcon as C } from "../icon/index.js";
 import { UPDATE_MODEL_EVENT as P, CHANGE_EVENT as S, INPUT_EVENT as _ } from "../../constants/event.js";
+import "@vueuse/core";
+import { debugWarn as G, throwError as le } from "../../utils/error.js";
 import "../../utils/ns-cover.js";
-import { VftIcon as C } from "../icon/index.js";
-import "../form/index.js";
+import "lodash";
 import { useNamespace as ne } from "../../hooks/use-namespace/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
@@ -175,7 +175,7 @@ const de = ["onClick"], ve = ["id", "aria-checked", "aria-disabled", "name", "tr
               key: 0,
               rotate: "",
               class: r(o(i).is("loading")),
-              icon: "ico-ep:loading"
+              icon: "icon-loading"
             }, null, 8, ["class"])) : c("", !0)
           ], 2)
         ], 6),

package/es/components/table/field.js

@@ -1,95 +1,95 @@
 import { createVNode as p, ref as I, Fragment as Y, isVNode as _ } from "vue";
 import { formatToDateTime as l, isNullOrUndefined as M } from "@vft/utils";
-import "../divider/index.js";
-import "../icon/index.js";
+import "../alert/index.js";
 import "../avatar/index.js";
-import "../empty/index.js";
-import "../result/index.js";
-import "../tabs/index.js";
-import "../popper/index.js";
-import "../collapse-transition/index.js";
-import "../tooltip/index.js";
-import "../popover/index.js";
-import "../menu/index.js";
-import "../context-menu/context-menu.vue2.js";
-import "../multiple-tabs/index.js";
-import "../header-layout/index.js";
-import "../footer-layout/index.js";
-import "../iframe-layout/index.js";
-import "../router-view-content/index.js";
-import "../logo/index.js";
 import "../backtop/index.js";
-import "../container/index.js";
+import { VftButton as D } from "../button/index.js";
+import "../card/index.js";
+import "../check-tag/index.js";
+import "../checkbox/index.js";
+import "../clamp/index.js";
+import "../clamp-toggle/index.js";
+import "../col/index.js";
+import "../collapse-transition/index.js";
+import "../color-picker/index.js";
 import "../config-provider/index.js";
+import "../container/index.js";
+import "../context-menu/context-menu.vue2.js";
+import "../date-picker/index.js";
+import "../date-time-select/index.js";
 import "../descriptions/index.js";
+import "../dialog/index.js";
+import "../divider/index.js";
+import "../drawer/index.js";
+import "../dropdown/index.js";
+import "../empty/index.js";
+import "../exception/index.js";
+import "../footer-layout/index.js";
+import "../form/index.js";
 import "../full-screen/index.js";
+import "../header-layout/index.js";
+import "../horizontal-menu/index.js";
+import "../icon/index.js";
 import "../icon-text/index.js";
+import "../iframe-layout/index.js";
 import "../image/index.js";
+import "../image-viewer/index.js";
 import "../input/index.js";
+import "../input-number/index.js";
 import "../link/index.js";
-import "../pagination/index.js";
-import { VftTag as D } from "../tag/index.js";
-import "../side-menu/index.js";
-import "../qrcode/index.js";
+import "../list-cell/index.js";
+import "../logo/index.js";
+import "../menu/index.js";
+import "../multiple-tabs/index.js";
 import "../overlay/index.js";
-import "../clamp/index.js";
-import "../clamp-toggle/index.js";
 import "../page-wrapper/index.js";
-import "../exception/index.js";
-import "../search/index.js";
-import "../form/index.js";
-import { VftButton as E } from "../button/index.js";
-import "../checkbox/index.js";
+import "../pagination/index.js";
+import { VftPopconfirm as F } from "../popconfirm/index.js";
+import "../popover/index.js";
+import "../popper/index.js";
+import "../qrcode/index.js";
 import "../radio/index.js";
-import "../switch/index.js";
-import "../color-picker/index.js";
+import "../result/index.js";
+import "../router-view-content/index.js";
+import "../row/index.js";
 import "../scrollbar/index.js";
-import "../dropdown/index.js";
-import "../virtual-list/components/fixed-size-list.js";
-import "../virtual-list/components/dynamic-size-list.js";
-import "../virtual-list/components/fixed-size-grid.js";
-import "../virtual-list/components/dynamic-size-grid.js";
-import "../virtual-list/props.js";
+import "../search/index.js";
 import "../select/index.js";
-import "../verify-code/index.js";
+import "../side-menu/index.js";
+import "../skeleton/index.js";
+import "../slider/index.js";
+import "../space/index.js";
+import "../switch/index.js";
 import "./index.js";
-import "../image-viewer/index.js";
-import "../list-cell/index.js";
-import "../dialog/index.js";
-import "../date-time-select/index.js";
-import "../col/index.js";
-import "../row/index.js";
-import "../horizontal-menu/index.js";
+import "../tabs/index.js";
+import { VftTag as E } from "../tag/index.js";
 import "../time-picker/index.js";
-import "../date-picker/index.js";
-import "../check-tag/index.js";
+import "../tooltip/index.js";
 import "../tree/index.js";
-import "../skeleton/index.js";
-import "../space/index.js";
-import "../card/index.js";
-import { VftPopconfirm as F } from "../popconfirm/index.js";
-import "../alert/index.js";
-import "../drawer/index.js";
-import "../input-number/index.js";
-import "../slider/index.js";
+import "../verify-code/index.js";
+import "../virtual-list/components/dynamic-size-grid.js";
+import "../virtual-list/components/dynamic-size-list.js";
+import "../virtual-list/components/fixed-size-grid.js";
+import "../virtual-list/components/fixed-size-list.js";
+import "../virtual-list/props.js";
 import "../autocomplete/index.js";
-import "../super-form/index.js";
+import "../modal/index.js";
 import "../progress/index.js";
+import "../super-form/index.js";
 import "../upload/index.js";
-import "../modal/index.js";
-import "../md-container/index.js";
+import "../md-code-demo/index.js";
+import "../md-code-tabs/index.js";
 import "../md-comment/index.js";
+import "../md-container/index.js";
 import "../md-tabs/index.js";
 import "../md-vue-playground/index.js";
-import "../md-code-demo/index.js";
-import "../md-code-tabs/index.js";
-import "../message/index.js";
+import "@vueuse/core";
+import "../../utils/ns-cover.js";
+import "lodash";
 import "../config-provider/hooks/use-global-config.js";
 import "@popperjs/core";
-import "lodash";
 import "../../hooks/use-z-index/index.js";
-import "@vueuse/core";
-import "../../utils/ns-cover.js";
+import "../message/index.js";
 function u(i) {
   return typeof i == "function" || Object.prototype.toString.call(i) === "[object Object]" && !_(i);
 }
@@ -164,9 +164,9 @@ const ei = {
       row: n
     }) => {
       let m = n == null ? void 0 : n[i];
-      return M(m) ? "-" : (e && Number(m) === 0 && (m = !1), m ? p(D, null, u(o) ? o : {
+      return M(m) ? "-" : (e && Number(m) === 0 && (m = !1), m ? p(E, null, u(o) ? o : {
         default: () => [o]
-      }) : p(D, {
+      }) : p(E, {
         type: "danger"
       }, u(r) ? r : {
         default: () => [r]
@@ -195,7 +195,7 @@ const ei = {
           s.value = !1;
         });
       };
-      return p(Y, null, [n ? p(E, {
+      return p(Y, null, [n ? p(D, {
         size: "small",
         type: "primary",
         onClick: () => t == null ? void 0 : t(f)
@@ -206,7 +206,7 @@ const ei = {
         onConfirm: a,
         title: i
       }, {
-        reference: () => p(E, {
+        reference: () => p(D, {
           loading: s.value,
           size: "small",
           type: "danger"

package/es/components/table/index.js

@@ -1,9 +1,9 @@
-import { withInstall as E } from "../../utils/vue/install.js";
-import "vue";
-import "@vft/utils";
-import "lodash";
 import "@vueuse/core";
+import "@vft/utils";
 import "../../utils/ns-cover.js";
+import "lodash";
+import { withInstall as E } from "../../utils/vue/install.js";
+import "vue";
 import r from "./table.vue2.js";
 import { ACTION_FIELD as F, CHECKED_FIELD as L, CREATE_TIME_FIELD as a, DATE_FIELD as f, DATE_TIME_FIELD as A, ID_FIELD as l, NAME_FIELD as s, SEQ_FIELD as M, STATUS_FIELD as n, UPDATE_TIME_FIELD as u } from "./field.js";
 import { useTable as C } from "./use/use-table.js";

package/es/components/table/table.vue2.js

@@ -1,26 +1,26 @@
 import { defineComponent as v, useAttrs as M, ref as g, getCurrentInstance as q, computed as f, unref as e, watch as W, nextTick as X, toRaw as Y, resolveComponent as j, openBlock as w, createElementBlock as Z, normalizeClass as J, createVNode as S, mergeProps as x, withCtx as b, withDirectives as Q, createElementVNode as U, createBlock as $, createCommentVNode as ee } from "vue";
-import { VftEmpty as oe } from "../empty/index.js";
-import { VftPagination as te } from "../pagination/index.js";
-import { useNamespace as ae } from "../../hooks/use-namespace/index.js";
-import "@popperjs/core";
-import "lodash";
-import "../../hooks/use-z-index/index.js";
+import { isFunction as oe } from "@vft/utils";
+import { VftEmpty as te } from "../empty/index.js";
+import { vLoading as ae } from "../loading/directive.js";
 import "@vueuse/core";
-import { isFunction as ne } from "@vft/utils";
 import "../../utils/ns-cover.js";
+import "lodash";
+import { useNamespace as ne } from "../../hooks/use-namespace/index.js";
+import "@popperjs/core";
+import "../../hooks/use-z-index/index.js";
 import "../icon/index.js";
-import { vLoading as re } from "../loading/directive.js";
-import { usePagination as le } from "./use/use-pagination.js";
-import { PAGE_SIZE as ie } from "./constants.js";
+import { VftPagination as re } from "../pagination/index.js";
+import { PAGE_SIZE as le } from "./constants.js";
+import { useColumns as ie } from "./use/use-columns.js";
 import { useDataSource as se } from "./use/use-data-source.js";
 import { useLoading as ge } from "./use/use-loading.js";
-import { useColumns as fe } from "./use/use-columns.js";
+import { usePagination as fe } from "./use/use-pagination.js";
 import { EmptyEnum as pe } from "../empty/constants.js";
 const ue = {
   "vft-loading-text": "加载中..."
 }, p = (
   /* hoist-static*/
-  ae("table")
+  ne("table")
 ), me = v({
   name: "vft-table"
 }), Te = /* @__PURE__ */ v({
@@ -31,7 +31,7 @@ const ue = {
     },
     api: {},
     pageSize: {
-      default: ie
+      default: le
     },
     total: {},
     rowkey: {
@@ -232,10 +232,10 @@ const ue = {
       setPagination: m,
       getShowPagination: d,
       getCurrentPage: k
-    } = le(t), {
+    } = fe(t), {
       getViewColumns: D,
       setColumns: T
-    } = fe(t);
+    } = ie(t);
     W(() => k(), (a) => {
       X(() => {
         c({
@@ -274,7 +274,7 @@ const ue = {
       const {
         onChange: o
       } = e(t);
-      o && ne(o) && o.call(void 0, ...a);
+      o && oe(o) && o.call(void 0, ...a);
     }
     const K = f(() => window.innerHeight - e(t).extraSysHeight + "px"), y = f(() => {
       var o, r;
@@ -313,12 +313,12 @@ const ue = {
         ref_key: "xGrid",
         ref: u
       }, y.value), {
-        empty: b(() => [S(e(oe), {
+        empty: b(() => [S(e(te), {
           type: e(pe).NO_DATA
         }, null, 8, ["type"])]),
-        loading: b(() => [Q(U("div", ue, null, 512), [[e(re), y.value.loading]])]),
+        loading: b(() => [Q(U("div", ue, null, 512), [[e(ae), y.value.loading]])]),
         _: 1
-      }, 16), e(d) ? (w(), $(e(te), x({
+      }, 16), e(d) ? (w(), $(e(re), x({
         key: 0
       }, e(i), {
         class: [e(p).e("pager"), e(p).m("pager-" + e(i).pagePlacement)],

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

@@ -1,18 +1,18 @@
-import { ref as g, unref as t, computed as l, watch as d, toRaw as h } from "vue";
-import { isNullOrUndefined as v, isArray as p } from "@vft/utils";
-import { cloneDeep as c } from "lodash";
+import { isNullOrUndefined as g, isArray as d } from "@vft/utils";
+import { cloneDeep as l } from "lodash";
+import { ref as h, unref as t, computed as c, watch as v, toRaw as p } from "vue";
 function y(o) {
-  const e = g(t(o).columns);
+  const e = h(t(o).columns);
   let s = t(o).columns;
-  const u = l(() => {
-    const r = c(t(e));
+  const u = c(() => {
+    const r = l(t(e));
     return r ? r.map((n) => (!n.formatter && !n.slots && !n.cellRender && (n.formatter = ({
       cellValue: f
-    }) => v(f) || f === "" ? "-" : f), n)) : [];
-  }), m = l(() => t(u));
+    }) => g(f) || f === "" ? "-" : f), n)) : [];
+  }), m = c(() => t(u));
   function i(r) {
-    const n = c(r);
-    if (p(n)) {
+    const n = l(r);
+    if (d(n)) {
       if (n.length <= 0) {
         e.value = [];
         return;
@@ -20,11 +20,11 @@ function y(o) {
       e.value = n;
     }
   }
-  d(() => t(o).columns, (r) => {
+  v(() => t(o).columns, (r) => {
     e.value = r || e.value, s = (r == null ? void 0 : r.filter((n) => !n.flag)) ?? [];
   }, {});
   function a() {
-    return h(t(u));
+    return p(t(u));
   }
   function C() {
     return s;

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

@@ -1,7 +1,7 @@
-import { ref as S, watchEffect as X, unref as r, watch as z, computed as Y, onMounted as $ } from "vue";
-import { useTimeoutFn as L } from "@vueuse/core";
-import { isFunction as D, isBoolean as N, delObjAttrNotExist as ee, isString as te, isEmptyObject as ae, isNullOrUndefined as P, isObject as _, isPlainObject as re, isNumber as ie } from "@vft/utils";
-import { merge as ne, get as x } from "lodash";
+import { isFunction as S, isBoolean as z, delObjAttrNotExist as X, isString as Y, isEmptyObject as $, isNullOrUndefined as N, isObject as P, isPlainObject as L, isNumber as ee } from "@vft/utils";
+import { useTimeoutFn as te } from "@vueuse/core";
+import { merge as ae, get as _ } from "lodash";
+import { ref as D, watchEffect as re, unref as r, watch as x, computed as ie, onMounted as ne } from "vue";
 import { PAGE_SIZE as ce } from "../constants.js";
 function me(l, {
   tableData: k,
@@ -9,10 +9,10 @@ function me(l, {
   getPaginationInfo: y,
   setPagination: o
 }, p) {
-  const t = S([]), M = S({});
-  X(() => {
+  const t = D([]), M = D({});
+  re(() => {
     k.value = r(t);
-  }), z(() => r(l).data, () => {
+  }), x(() => r(l).data, () => {
     const { data: e, api: a } = r(l);
     !a && e && (t.value = e);
   }, {
@@ -21,7 +21,7 @@ function me(l, {
   function q(e) {
     o(e), d({});
   }
-  const O = Y(() => {
+  const O = ie(() => {
     const e = r(t);
     return !e || e.length === 0 ? r(t) : r(t);
   });
@@ -36,7 +36,7 @@ function me(l, {
       transformParams: K,
       extraParams: v
     } = r(l);
-    if (!(!a || !D(a)))
+    if (!(!a || !S(a)))
       try {
         T(!0);
         const { pageField: g, sizeField: Q, listField: V, totalField: W } = Object.assign(
@@ -52,21 +52,21 @@ function me(l, {
         let b = {}, c = e;
         const { currentPage: A = 1, pageSize: E = ce } = r(y);
         if (K) {
-          if (N(h) && !h || N(y) ? b = {} : (b[g] = e && e.page || A, b[Q] = E), c = ne(
+          if (z(h) && !h || z(y) ? b = {} : (b[g] = e && e.page || A, b[Q] = E), c = ae(
             e,
             b
-          ), n && D(n)) {
+          ), n && S(n)) {
             const F = await n(c);
             c = { ...c, ...F };
           }
-          s && ee(c, te(s) ? s === "strict" : !1);
+          s && X(c, Y(s) ? s === "strict" : !1);
         }
-        c && !ae(c) && !P(v) ? _(c) && _(v) && (c = Object.assign({}, c, v)) : P(v) || (c = v);
+        c && !$(c) && !N(v) ? P(c) && P(v) && (c = Object.assign({}, c, v)) : N(v) || (c = v);
         const f = await a(c);
         M.value = f;
         const R = Array.isArray(f);
-        let m = R ? f : x(f, V);
-        const w = R ? f.length : x(f, W);
+        let m = R ? f : _(f, V);
+        const w = R ? f.length : _(f, W);
         if (Number(w)) {
           const F = Math.ceil(w / E);
           if (A > F)
@@ -74,7 +74,7 @@ function me(l, {
               currentPage: F
             }), await d(e);
         }
-        return u && D(u) && (m = await u(m) || m), t.value = m, o({
+        return u && S(u) && (m = await u(m) || m), t.value = m, o({
           total: w || 0
         }), e && e.page && o({
           currentPage: e.page || 1
@@ -117,7 +117,7 @@ function me(l, {
     }
   }
   function U(e, a = 0) {
-    const i = re(e) ? [e] : e;
+    const i = L(e) ? [e] : e;
     return t.value.splice(a, 0, ...i), r(t);
   }
   function Z(e, a) {
@@ -126,7 +126,7 @@ function me(l, {
     const { rowkey: i } = r(l), n = t.value.findIndex((h) => h[a || i] === e[a || i]);
     t.value.splice(n, 1);
     const { total: u } = r(y);
-    ie(u) && o({
+    ee(u) && o({
       total: u - 1
     });
   }
@@ -136,12 +136,12 @@ function me(l, {
   function J() {
     return O.value;
   }
-  const j = S(!0);
-  return $(() => {
-    L(() => {
+  const j = D(!0);
+  return ne(() => {
+    te(() => {
       r(l).immediate && d(), j.value = !1;
     }, 16);
-  }), z(() => r(l).api, () => {
+  }), x(() => r(l).api, () => {
     r(l).watchApiFetch && !j.value && r(l).immediate && d();
   }), {
     setTableData: H,