vft 0.0.133 → 0.0.136

package/es/components/super-form/super-form-item.vue2.js

@@ -91,14 +91,15 @@ import { useNamespace as ne } from "../../hooks/use-namespace/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
 import "../message/index.js";
-import { FormCompEnum as s, componentMap as B, isInput as se, isDatePicker as le, isRangePicker as me } from "./component-map.js";
+import "../infinite-scroll/index.js";
+import { FormCompEnum as s, componentMap as B, isInput as se, isDatePicker as me, isRangePicker as le } from "./component-map.js";
 import { createPlaceholderMessage as U } from "./use/helper.js";
 function q(r) {
   return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !Q(r);
 }
 const ae = H({
   inheritAttrs: !1
-}), Qt = /* @__PURE__ */ H({
+}), Zt = /* @__PURE__ */ H({
   ...ae,
   __name: "super-form-item",
   props: {
@@ -180,8 +181,8 @@ const ae = H({
       } = r.schema, {
         disabled: a = !1
       } = u(x);
-      let l = !!e || a;
-      return w(t) && (l = t), P(t) && (l = t(u(E))), l;
+      let m = !!e || a;
+      return w(t) && (m = t), P(t) && (m = t(u(E))), m;
     });
     function O() {
       const {
@@ -189,10 +190,10 @@ const ae = H({
         ifShow: t
       } = r.schema, {
         showAdvancedButton: a
-      } = r.formProps, l = a && w(r.isAdvanced) ? r.isAdvanced : !0;
-      let m = !0, c = !0;
-      return w(e) && (m = e), w(t) && (c = t), P(e) && (m = e(u(E))), P(t) && (c = t(u(E))), m = m && l, {
-        isShow: m,
+      } = r.formProps, m = a && w(r.isAdvanced) ? r.isAdvanced : !0;
+      let l = !0, c = !0;
+      return w(e) && (l = e), w(t) && (c = t), P(e) && (l = e(u(E))), P(t) && (c = t(u(E))), l = l && m, {
+        isShow: l,
         isIfShow: c
       };
     }
@@ -201,12 +202,12 @@ const ae = H({
         rules: e = [],
         type: t = s.INPUT,
         rulesMessageJoinLabel: a,
-        label: l,
-        title: m,
+        label: m,
+        title: l,
         dynamicRule: c,
         required: R,
         dynamicRuleAdd: C = !0
-      } = r.schema, p = l || m;
+      } = r.schema, p = m || l;
       if (P(c) && !C)
         return c(u(E));
       let o = _(e);
@@ -247,14 +248,14 @@ const ae = H({
         renderComponentContent: e,
         type: t = s.INPUT,
         field: a,
-        changeEvent: l = "change",
-        valueField: m,
+        changeEvent: m = "change",
+        valueField: l,
         label: c,
         title: R,
         placeholderJoinLabel: C = !0
       } = r.schema;
-      let p = l;
-      se(t) ? p = "input" : (le(t) || t === s.TIME_PICKER) && (p = "update:modelValue");
+      let p = m;
+      se(t) ? p = "input" : (me(t) || t === s.TIME_PICKER) && (p = "update:modelValue");
       const o = `on${re(p)}`, b = {
         [o]: (...n) => {
           const [i] = n;
@@ -271,9 +272,9 @@ const ae = H({
         ...u(x),
         disabled: u(G)
       };
-      !d.disabled && y && !me(t) && t && (d.placeholder = ((S = u(x)) == null ? void 0 : S.placeholder) || U(t, C ? c || R : ""));
+      !d.disabled && y && !le(t) && t && (d.placeholder = ((S = u(x)) == null ? void 0 : S.placeholder) || U(t, C ? c || R : ""));
       const f = {
-        [m || "model-value"]: r.formModel[a]
+        [l || "model-value"]: r.formModel[a]
       }, g = {
         ...b,
         ...d,
@@ -295,9 +296,9 @@ const ae = H({
         showLabel: e = !0,
         label: t,
         title: a,
-        subLabel: l
-      } = r.schema, m = t || a;
-      return e && m ? l ? h("span", null, [m, Z(" "), h("span", null, [l])]) : m : void 0;
+        subLabel: m
+      } = r.schema, l = t || a;
+      return e && l ? m ? h("span", null, [l, Z(" "), h("span", null, [m])]) : l : void 0;
     }
     const k = z();
     function v(e, t = "default", a) {
@@ -305,32 +306,32 @@ const ae = H({
         return null;
       if (!P(e[t]))
         return console.error(`${t} is not a function!`), null;
-      const l = e[t];
-      return l ? l(a) : null;
+      const m = e[t];
+      return m ? m(a) : null;
     }
     function $() {
       const {
         itemProps: e,
         slot: t,
         render: a,
-        field: l,
-        suffix: m,
+        field: m,
+        suffix: l,
         prefix: c,
         prefixParentStyle: R
       } = r.schema, {
         autoCleanErrorMessage: C,
         compFullWidth: p
-      } = r.formProps, o = () => t ? v(k, t, u(E)) : a ? a(u(E)) : W(), b = !!m, A = !!c, y = P(m) ? m(u(E)) : m, T = P(c) ? c(u(E)) : c, d = () => {
+      } = r.formProps, o = () => t ? v(k, t, u(E)) : a ? a(u(E)) : W(), b = !!l, A = !!c, y = P(l) ? l(u(E)) : l, T = P(c) ? c(u(E)) : c, d = () => {
         r.updateSchema([{
-          field: l,
+          field: m,
           itemProps: {
             error: ""
           }
         }]);
       }, M = () => h(ie, F({
-        prop: l,
+        prop: m,
         class: [{
-          [D.is(m)]: b
+          [D.is(l)]: b
         }, {
           [D.is("comp-full-width")]: p
         }, D.e("item")]
@@ -359,12 +360,12 @@ const ae = H({
       const {
         colProps: t = {},
         colSlot: a,
-        renderColContent: l,
-        type: m = s.INPUT,
+        renderColContent: m,
+        type: l = s.INPUT,
         render: c,
         quickColSpan: R
       } = r.schema;
-      if (!B.has(m) && !l && !c)
+      if (!B.has(l) && !m && !c)
         return null;
       const {
         baseColProps: C = {},
@@ -381,8 +382,8 @@ const ae = H({
       }, {
         isIfShow: y,
         isShow: T
-      } = O(), d = u(E), M = () => a ? v(k, a, d) : l ? l(d) : $();
-      if (m === s.DIVIDER) {
+      } = O(), d = u(E), M = () => a ? v(k, a, d) : m ? m(d) : $();
+      if (l === s.DIVIDER) {
         let f;
         return h(L, F({
           span: 24
@@ -399,5 +400,5 @@ const ae = H({
   }
 });
 export {
-  Qt as default
+  Zt as default
 };

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

@@ -1,4 +1,4 @@
-import { defineComponent as ot, useAttrs as ft, reactive as ct, ref as l, computed as h, unref as o, watch as y, nextTick as dt, onMounted as Bt, resolveComponent as ht, openBlock as m, createBlock as c, mergeProps as v, withKeys as yt, withCtx as g, normalizeProps as d, renderSlot as _, createElementBlock as vt, Fragment as gt, renderList as Y, createSlots as bt, guardReactiveProps as Z, createVNode as Ft, createCommentVNode as b } from "vue";
+import { defineComponent as ot, useAttrs as ft, reactive as ct, ref as m, computed as h, unref as o, watch as y, nextTick as dt, onMounted as Bt, resolveComponent as ht, openBlock as l, createBlock as c, mergeProps as v, withKeys as yt, withCtx as g, normalizeProps as d, renderSlot as _, createElementBlock as vt, Fragment as gt, renderList as Y, createSlots as bt, guardReactiveProps as Z, createVNode as Ft, createCommentVNode as b } from "vue";
 import { cloneDeep as tt, pick as wt, deepMerge as St } from "@vft/utils";
 import "../alert/index.js";
 import "../avatar/index.js";
@@ -91,6 +91,7 @@ import { useNamespace as Rt } from "../../hooks/use-namespace/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
 import "../message/index.js";
+import "../infinite-scroll/index.js";
 import { FormCompEnum as Et } from "./component-map.js";
 import et from "./super-form-action.vue2.js";
 import Vt from "./super-form-item.vue2.js";
@@ -103,7 +104,7 @@ const It = (
   Rt("super-form")
 ), Tt = ot({
   name: "vft-super-form"
-}), Vo = /* @__PURE__ */ ot({
+}), _o = /* @__PURE__ */ ot({
   ...Tt,
   props: {
     rowProps: {
@@ -229,7 +230,7 @@ const It = (
     expose: it,
     emit: O
   }) {
-    const M = rt, at = ft(), n = ct({}), F = l({}), B = l(!1), w = l({}), D = l(null), S = l(null), I = l(), e = h(() => ({
+    const M = rt, at = ft(), n = ct({}), F = m({}), B = m(!1), w = m({}), D = m(null), S = m(null), I = m(), e = h(() => ({
       ...M,
       ...o(w)
     })), p = h(() => ({
@@ -266,9 +267,9 @@ const It = (
       appendSchemaByField: $,
       removeSchemaByField: q,
       resetFields: E,
-      scrollToField: lt,
+      scrollToField: mt,
       getFieldValue: G,
-      setFormItemError: mt
+      setFormItemError: lt
     } = Mt({
       emit: O,
       getProps: e,
@@ -333,7 +334,7 @@ const It = (
       validateField: P,
       validate: N,
       submit: s,
-      scrollToField: lt
+      scrollToField: mt
     };
     Bt(() => {
       T(), O("register", K);
@@ -353,11 +354,11 @@ const It = (
       validateField: P,
       validate: N,
       submit: s,
-      setFormItemError: mt
+      setFormItemError: lt
     }), (t, r) => {
       var V;
       const i = ht("vft-col");
-      return B.value && ((V = a.value) != null && V.length) ? (m(), c(o(Ct), v({
+      return B.value && ((V = a.value) != null && V.length) ? (l(), c(o(Ct), v({
         key: 0
       }, p.value, {
         ref_key: "formElRef",
@@ -368,12 +369,12 @@ const It = (
       }), {
         default: g(() => {
           var z, U, W, j;
-          return [(z = a.value) != null && z.length ? (m(), c(o(Pt), d(v({
+          return [(z = a.value) != null && z.length ? (l(), c(o(Pt), d(v({
             key: 0
           }, (U = p.value) == null ? void 0 : U.rowProps)), {
             default: g(() => {
               var J, Q, X;
-              return [_(t.$slots, "formHeader"), (m(!0), vt(gt, null, Y(a.value, (u) => (m(), c(Vt, {
+              return [_(t.$slots, "formHeader"), (l(!0), vt(gt, null, Y(a.value, (u) => (l(), c(Vt, {
                 key: u.field,
                 tableAction: t.tableAction,
                 formActionType: K,
@@ -394,7 +395,7 @@ const It = (
               } : {})), {
                 default: g(() => {
                   var u, f;
-                  return [(u = e.value) != null && u.showActionButtonGroup && ((f = e.value) != null && f.actionInline) ? (m(), c(et, d(v({
+                  return [(u = e.value) != null && u.showActionButtonGroup && ((f = e.value) != null && f.actionInline) ? (l(), c(et, d(v({
                     key: 0
                   }, x.value)), null, 16)) : b("", !0)];
                 }),
@@ -402,7 +403,7 @@ const It = (
               }, 16)];
             }),
             _: 3
-          }, 16)) : b("", !0), (W = e.value) != null && W.showActionButtonGroup && !((j = e.value) != null && j.actionInline) ? (m(), c(et, d(v({
+          }, 16)) : b("", !0), (W = e.value) != null && W.showActionButtonGroup && !((j = e.value) != null && j.actionInline) ? (l(), c(et, d(v({
             key: 1
           }, x.value)), null, 16)) : b("", !0), _(t.$slots, "formFooter")];
         }),
@@ -412,5 +413,5 @@ const It = (
   }
 });
 export {
-  Vo as default
+  _o as default
 };

package/es/components/table/field.js

@@ -91,28 +91,29 @@ import "../config-provider/hooks/use-global-config.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
 import "../message/index.js";
+import "../infinite-scroll/index.js";
 function u(i) {
   return typeof i == "function" || Object.prototype.toString.call(i) === "[object Object]" && !_(i);
 }
-const ni = {
+const ui = {
   type: "seq",
   title: "序号",
   minWidth: 100,
   fixed: "left"
-}, ui = {
+}, si = {
   type: "checkbox",
   title: "",
   minWidth: 60,
   fixed: "left"
-}, si = {
+}, fi = {
   field: "id",
   title: "Id",
   minWidth: 100
-}, fi = {
+}, di = {
   field: "name",
   title: "名称",
   minWidth: 100
-}, di = ({
+}, Di = ({
   format: i = "YYYY-MM-DD",
   field: t = "date",
   title: o = "时间"
@@ -134,7 +135,7 @@ const ni = {
   formatter: ({
     row: r
   }) => r[t] ? l(r[t], i) : "-"
-}), Di = ({
+}), Ei = ({
   format: i = "YYYY-MM-DD HH:mm:ss",
   field: t = "createTime",
   title: o = "创建时间"
@@ -142,7 +143,7 @@ const ni = {
   format: i,
   field: t,
   title: o
-}), Ei = ({
+}), li = ({
   format: i = "YYYY-MM-DD HH:mm:ss",
   field: t = "updateTime",
   title: o = "更新时间"
@@ -150,7 +151,7 @@ const ni = {
   format: i,
   field: t,
   title: o
-}), li = ({
+}), ci = ({
   field: i = "status",
   title: t = "状态",
   normalText: o = "正常",
@@ -174,7 +175,7 @@ const ni = {
       }));
     }
   }
-}), ci = ({
+}), ai = ({
   confirmText: i = "确认删除?",
   leftCallback: t,
   rightCallback: o,
@@ -219,14 +220,14 @@ const ni = {
   }
 });
 export {
-  ci as ACTION_FIELD,
-  ui as CHECKED_FIELD,
-  Di as CREATE_TIME_FIELD,
-  di as DATE_FIELD,
+  ai as ACTION_FIELD,
+  si as CHECKED_FIELD,
+  Ei as CREATE_TIME_FIELD,
+  Di as DATE_FIELD,
   c as DATE_TIME_FIELD,
-  si as ID_FIELD,
-  fi as NAME_FIELD,
-  ni as SEQ_FIELD,
-  li as STATUS_FIELD,
-  Ei as UPDATE_TIME_FIELD
+  fi as ID_FIELD,
+  di as NAME_FIELD,
+  ui as SEQ_FIELD,
+  ci as STATUS_FIELD,
+  li as UPDATE_TIME_FIELD
 };

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

@@ -77,8 +77,8 @@ export declare const VftTable: import("vft/es/utils").SFCWithInstall<{
             }>) => void)[] | undefined;
             onChange?: ((val: number) => any) | undefined;
             readonly round?: boolean | undefined;
-            readonly fit?: boolean | undefined;
             readonly sticky?: boolean | import("./types").StickyOption | undefined;
+            readonly fit?: boolean | undefined;
             readonly cellClassName?: import("vxe-table").VxeTablePropTypes.CellClassName<import("vxe-table").VxeTableDataRow> | undefined;
             readonly rowKey?: boolean | undefined;
             readonly columnKey?: boolean | undefined;
@@ -214,12 +214,12 @@ export declare const VftTable: import("vft/es/utils").SFCWithInstall<{
             round: {
                 type: import("vue").PropType<boolean>;
             };
-            fit: {
-                type: import("vue").PropType<boolean>;
-            };
             sticky: {
                 type: import("vue").PropType<boolean | import("./types").StickyOption>;
             };
+            fit: {
+                type: import("vue").PropType<boolean>;
+            };
             autoResize: {
                 type: import("vue").PropType<boolean>;
                 default: boolean;
@@ -634,12 +634,12 @@ export declare const VftTable: import("vft/es/utils").SFCWithInstall<{
         round: {
             type: import("vue").PropType<boolean>;
         };
-        fit: {
-            type: import("vue").PropType<boolean>;
-        };
         sticky: {
             type: import("vue").PropType<boolean | import("./types").StickyOption>;
         };
+        fit: {
+            type: import("vue").PropType<boolean>;
+        };
         autoResize: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -1006,12 +1006,12 @@ export declare const VftTable: import("vft/es/utils").SFCWithInstall<{
     round: {
         type: import("vue").PropType<boolean>;
     };
-    fit: {
-        type: import("vue").PropType<boolean>;
-    };
     sticky: {
         type: import("vue").PropType<boolean | import("./types").StickyOption>;
     };
+    fit: {
+        type: import("vue").PropType<boolean>;
+    };
     autoResize: {
         type: import("vue").PropType<boolean>;
         default: boolean;

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

@@ -38,12 +38,12 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     round: {
         type: import("vue").PropType<boolean>;
     };
-    fit: {
-        type: import("vue").PropType<boolean>;
-    };
     sticky: {
         type: import("vue").PropType<boolean | import("./types").StickyOption>;
     };
+    fit: {
+        type: import("vue").PropType<boolean>;
+    };
     autoResize: {
         type: import("vue").PropType<boolean>;
         default: boolean;
@@ -406,12 +406,12 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     round: {
         type: import("vue").PropType<boolean>;
     };
-    fit: {
-        type: import("vue").PropType<boolean>;
-    };
     sticky: {
         type: import("vue").PropType<boolean | import("./types").StickyOption>;
     };
+    fit: {
+        type: import("vue").PropType<boolean>;
+    };
     autoResize: {
         type: import("vue").PropType<boolean>;
         default: boolean;

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

@@ -1,19 +1,19 @@
-import { isFunction as D, isBoolean as P, delObjAttrNotExist as Y, isString as $, isEmptyObject as ee, isNullOrUndefined as x, isObject as C, isPlainObject as te, isNumber as ae } from "@vft/utils";
+import { isFunction as D, isBoolean as p, delObjAttrNotExist as Y, isString as $, isEmptyObject as ee, isNullOrUndefined as x, isObject as C, isPlainObject as te, isNumber as ae } from "@vft/utils";
 import { useTimeoutFn as re } from "@vueuse/core";
-import { merge as ie, get as k } from "lodash";
-import { ref as p, watchEffect as ne, unref as i, watch as M, computed as le, onMounted as ce } from "vue";
+import { merge as ne, get as k } from "lodash";
+import { ref as O, watchEffect as ie, unref as n, watch as M, computed as le, onMounted as ce } from "vue";
 import { PAGE_SIZE as ue } from "../constants.js";
 function ge(u, {
   tableData: q,
-  setLoading: O,
+  setLoading: j,
   getPaginationInfo: y,
   setPagination: m
-}, j) {
-  const a = p([]), A = p({});
-  ne(() => {
-    q.value = i(a);
-  }), M(() => i(u).data, () => {
-    const { data: e, api: t } = i(u);
+}, A) {
+  const a = O([]), E = O({});
+  ie(() => {
+    q.value = n(a);
+  }), M(() => n(u).data, () => {
+    const { data: e, api: t } = n(u);
     !t && e && (a.value = e);
   }, {
     immediate: !0
@@ -21,24 +21,24 @@ function ge(u, {
   function B(e) {
     m(e), d({});
   }
-  const E = le(() => {
-    const e = i(a);
-    return !e || e.length === 0 ? i(a) : i(a);
+  const R = le(() => {
+    const e = n(a);
+    return !e || e.length === 0 ? n(a) : n(a);
   });
   async function d(e) {
     const {
       api: t,
       fetchSetting: r = {},
-      beforeFetch: n,
+      beforeFetch: i,
       afterFetch: c,
       pagination: o,
       delEmptyParams: s,
       transformParams: K,
       extraParams: g
-    } = i(u);
+    } = n(u);
     if (!(!t || !D(t)))
       try {
-        O(!0);
+        j(!0);
         const { pageField: w, sizeField: Q, listField: W, totalField: X } = Object.assign(
           {},
           {
@@ -50,57 +50,59 @@ function ge(u, {
           r
         );
         let F = {}, l = e;
-        const { currentPage: z = 1, pageSize: I = ue } = i(y);
+        const { currentPage: I = 1, pageSize: N = ue } = n(y);
         if (K) {
-          if (P(o) && !o || P(y) ? F = {} : (F[w] = e && e.page || z, F[Q] = I), l = ie(
+          if (p(o) && !o || p(y) ? F = {} : (F[w] = e && e.page || I, F[Q] = N), l = ne(
             e,
             F
-          ), n && D(n)) {
-            const v = await n(l);
+          ), i && D(i)) {
+            const v = await i(l);
             console.log(v, "000000"), l = { ...l, ...v }, console.log(l, "1111111");
           }
           s && Y(l, $(s) ? s === "strict" : !1);
         }
         l && !ee(l) && !x(g) ? C(l) && C(g) && (l = Object.assign({}, l, g)) : x(g) || (l = g);
-        const h = await t(l), N = Array.isArray(h);
-        let f = N ? h : k(h, W);
-        const S = N ? h.length : k(h, X);
+        const h = await t(l), P = Array.isArray(h);
+        let f = P ? h : k(h, W);
+        const S = P ? h.length : k(h, X);
         if (Number(S)) {
-          const v = Math.ceil(S / I);
-          if (z > v)
+          const v = Math.ceil(S / N);
+          if (I > v)
             return m({
               currentPage: v
             }), await d(e);
         }
-        return c && D(c) && (f = await c(f) || f), console.log(f, "resultItemsresultItemsresultItems"), a.value = f, A.value = f, m({
+        return c && D(c) && (f = await c(f) || f), console.log(f, "resultItemsresultItemsresultItems"), a.value = f, E.value = f, m({
           total: S || 0
         }), e && e.page && m({
           currentPage: e.page || 1
-        }), j("fetch-success", {
-          items: i(f),
+        }), A("fetch-success", {
+          items: n(f),
           total: S
         }), f;
       } catch (w) {
-        console.log(w), j("fetch-error", w), a.value = [], m({
+        console.log(w), A("fetch-error", w), a.value = [], m({
           total: 0
         });
       } finally {
-        O(!1);
+        j(!1);
       }
   }
-  function R() {
-    return A.value;
+  function _() {
+    return E.value;
   }
   async function G(e) {
-    return await d(e);
+    return m({
+      currentPage: (e == null ? void 0 : e.page) || 1
+    }), await d(e);
   }
   function L(e) {
     if (!a.value || a.value.length === 0)
       return;
-    const { rowkey: t } = i(u);
-    return ((n) => {
+    const { rowkey: t } = n(u);
+    return ((i) => {
       let c;
-      return n.some(function(s) {
+      return i.some(function(s) {
         if (Reflect.has(s, t) && s[t] === e)
           return c = s, !0;
       }), c;
@@ -112,21 +114,21 @@ function ge(u, {
   function V(e, t) {
     const r = L(e);
     if (r) {
-      for (const n in r)
-        Reflect.has(t, n) && (r[n] = t[n]);
+      for (const i in r)
+        Reflect.has(t, i) && (r[i] = t[i]);
       return r;
     }
   }
   function Z(e, t = 0) {
     const r = te(e) ? [e] : e;
-    return a.value.splice(t, 0, ...r), i(a);
+    return a.value.splice(t, 0, ...r), n(a);
   }
   function H(e, t) {
     if (!a.value || a.value.length === 0)
       return;
-    const { rowkey: r } = i(u), n = a.value.findIndex((o) => o[t || r] === e[t || r]);
-    a.value.splice(n, 1);
-    const { total: c } = i(y);
+    const { rowkey: r } = n(u), i = a.value.findIndex((o) => o[t || r] === e[t || r]);
+    a.value.splice(i, 1);
+    const { total: c } = n(y);
     ae(c) && m({
       total: c - 1
     });
@@ -135,29 +137,29 @@ function ge(u, {
     a.value = e;
   }
   function b() {
-    return E.value;
+    return R.value;
   }
   function J(e) {
     var r;
     const t = String(e).trim().toLowerCase();
     if (t) {
-      const n = (r = b == null ? void 0 : b()) == null ? void 0 : r.filter((c) => {
+      const i = (r = b == null ? void 0 : b()) == null ? void 0 : r.filter((c) => {
         var o;
         for (const s in c)
           if ((o = String(c[s]).trim().toLowerCase()) != null && o.includes(t))
             return !0;
       });
-      T(n);
+      T(i);
     } else
-      T(R());
+      T(_());
   }
-  const _ = p(!0);
+  const z = O(!0);
   return ce(() => {
     re(() => {
-      i(u).immediate && d(), _.value = !1;
+      n(u).immediate && d(), z.value = !1;
     }, 16);
-  }), M(() => i(u).api, () => {
-    i(u).watchApiFetch && !_.value && i(u).immediate && d();
+  }), M(() => n(u).api, () => {
+    n(u).watchApiFetch && !z.value && n(u).immediate && d();
   }), {
     setTableData: T,
     updateTableData: U,
@@ -166,9 +168,9 @@ function ge(u, {
     deleteTableDataRecord: H,
     reload: G,
     handleTableChange: B,
-    getDataSourceRef: E,
+    getDataSourceRef: R,
     getDataSource: b,
-    getRawDataSource: R,
+    getRawDataSource: _,
     tableSearch: J
   };
 }