@aplus-frontend/ui 0.4.22 → 0.4.24

package/es/src/ap-table/ap-table.vue.d.ts

@@ -2,7 +2,6 @@ import { ApColumnType, ApTableProps } from './interface';
 import { ColumnsType, ColumnType } from '@aplus-frontend/antdv/es/table';
 import { RowSelectionReturnType } from './hooks/use-table-row-selection';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, ComputedRef, Ref, VNode, RendererNode, RendererElement } from 'vue';
-import { ScrollBarExpose } from '../scroll-bar';
 declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & ApTableProps<RecordType> & Partial<{}>> & PublicProps;
     expose(exposed: ShallowUnwrapRef<{
@@ -24,7 +23,10 @@ declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __V
             selectedRows: ComputedRef<RecordType[]>;
         };
         scrollBar: {
-            x: Ref< ScrollBarExpose | undefined, ScrollBarExpose | undefined>;
+            x: {
+                getCurrentScroll: () => 0 | Ref<number, number>;
+                scroll: (percent: number) => void | undefined;
+            };
             y: undefined;
         };
     }>): void;

package/es/src/ap-table/ap-table.vue2.mjs

@@ -1,11 +1,11 @@
-import { defineComponent as ze, useSlots as Pe, ref as S, computed as s, unref as t, createVNode as f, Fragment as J, watchEffect as Ne, watch as Q, openBlock as p, createElementBlock as F, normalizeClass as m, normalizeStyle as X, mergeProps as h, createSlots as Y, withCtx as w, renderList as Z, createBlock as ee, resolveDynamicComponent as Ie, renderSlot as R, createCommentVNode as oe, createElementVNode as N, normalizeProps as Ee, guardReactiveProps as Ke } from "vue";
+import { defineComponent as ze, useSlots as Pe, ref as h, computed as s, unref as l, createVNode as p, Fragment as J, watchEffect as Ne, watch as Q, openBlock as m, createElementBlock as k, normalizeClass as y, normalizeStyle as X, mergeProps as w, createSlots as Y, withCtx as v, renderList as Z, createBlock as ee, resolveDynamicComponent as Ie, renderSlot as R, createCommentVNode as oe, createElementVNode as I, normalizeProps as Ee, guardReactiveProps as Ke } from "vue";
 import { Divider as Oe, Table as Le } from "@aplus-frontend/antdv";
 import { useToken as Ve } from "@aplus-frontend/antdv/es/theme/internal";
 import { ApForm as Ae } from "../ap-form/index.mjs";
 import { noRenderAsFormItemValueList as ae } from "./constants.mjs";
 import "../config-provider/index.mjs";
 import { useTablePaging as De } from "./hooks/use-table-paging-ng.mjs";
-import { isUndefined as y, omit as re, isBoolean as $e } from "lodash-unified";
+import { isUndefined as g, omit as re, isBoolean as $e } from "lodash-unified";
 import { getColumnOrder as te, updateFormProps as We, getFieldProps as je, getSearchFormItemRenderNode as _e, recursionApColumns as le, apColumnToColumn as He, getTableTitle as Ue, getTableRenderType as qe, getTableRenderProps as Me, getTableCellRenderNode as Ge, falseToUndefined as Je } from "./utils.mjs";
 import Qe from "./hooks/use-table-content-height.mjs";
 import Xe from "./hooks/use-table-row-selection.mjs";
@@ -149,85 +149,85 @@ const No = /* @__PURE__ */ ze({
     expose: se
   }) {
     const o = ne;
-    let I = 0;
+    let E = 0;
     const C = Pe(), [, de] = Ve(), {
-      e: x,
-      b: i,
-      be: E,
+      e: B,
+      b: c,
+      be: K,
       m: ue
-    } = ao("ap-table"), K = ro("valueTypeMap"), {
+    } = ao("ap-table"), O = ro("valueTypeMap"), {
       height: ie,
       contentRef: ce
-    } = Qe(), O = S(), L = S(), {
-      isStickyMode: V,
-      scrollBarRef: A
-    } = eo(O), k = S(o.size), u = S([]), D = S([]);
+    } = Qe(), L = h(), V = h(), {
+      isStickyMode: A,
+      scrollBarRef: i
+    } = eo(L), z = h(o.size), u = h([]), D = h([]);
     Ze({
       columns: s(() => u.value),
       columnsBackup: s(() => D.value),
-      size: s(() => k.value),
+      size: s(() => z.value),
       updateColumns(e) {
         u.value = e;
       },
       updateSize(e) {
-        k.value = e;
+        z.value = e;
       },
-      dataSource: s(() => t(g).records)
+      dataSource: s(() => l(b).records)
     });
     const $ = s(() => {
-      var e, l, a;
-      return I++, ((a = (l = (e = o.columns) == null ? void 0 : e.filter((r) => !r.hideInSearch && r.dataIndex && (r.valueType || r.customRenderFormItem) && !ae.includes(r.valueType))) == null ? void 0 : l.sort((r, d) => {
-        let n = te(r.order);
+      var e, r, a;
+      return E++, ((a = (r = (e = o.columns) == null ? void 0 : e.filter((t) => !t.hideInSearch && t.dataIndex && (t.valueType || t.customRenderFormItem) && !ae.includes(t.valueType))) == null ? void 0 : r.sort((t, d) => {
+        let n = te(t.order);
         return te(d.order) - n;
-      })) == null ? void 0 : a.map((r) => {
-        const d = We(r, je(r.fieldProps, {})), n = {
-          ...r,
+      })) == null ? void 0 : a.map((t) => {
+        const d = We(t, je(t.fieldProps, {})), n = {
+          ...t,
           fieldProps: {
-            label: r.title,
-            name: r.dataIndex,
+            label: t.title,
+            name: t.dataIndex,
             ...d || {},
-            _signal: I
+            _signal: E
           },
           renderNode: void 0
         };
-        return n.renderNode = _e(n, t(K)), n;
+        return n.renderNode = _e(n, l(O)), n;
       })) || [];
-    }), fe = s(() => le(t(u), (e) => {
+    }), fe = s(() => le(l(u), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), pe = s(() => le(t(u), (e) => {
+    }).filter(Boolean)), pe = s(() => le(l(u), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), me = s(() => y(o.dataSource) ? g.records : o.dataSource), {
-      rowSelection: v,
-      selectedRows: T,
-      ...B
+    }).filter(Boolean)), me = s(() => g(o.dataSource) ? b.records : o.dataSource), {
+      rowSelection: T,
+      selectedRows: F,
+      ...x
     } = Xe({
       fixed: !0,
       ...o.rowSelection === !0 ? {} : o.rowSelection,
       rowKey: o.rowKey,
       dataSource: me
     }), {
-      formRef: z,
+      formRef: P,
       submit: W,
       reset: j,
       tableProps: _,
       refresh: ye,
-      data: g,
+      data: b,
       setDataSource: ge,
       getColumnSFConfig: be
     } = De({
       async request(e) {
-        var a, r;
-        if (!v.value.preserveSelectedRowKeys && y(o.dataSource) && B.clearAll(), !y(o.dataSource))
+        var a, t;
+        if (!T.value.preserveSelectedRowKeys && g(o.dataSource) && x.clearAll(), !g(o.dataSource))
           return {
             data: o.dataSource || [],
             total: o.dataSource.length || 0
           };
-        const l = await ((a = o.request) == null ? void 0 : a.call(o, e));
-        return (r = o.onLoad) == null || r.call(o, (l == null ? void 0 : l.data) || []), {
-          data: (l == null ? void 0 : l.data) || [],
-          total: (l == null ? void 0 : l.total) || 0
+        const r = await ((a = o.request) == null ? void 0 : a.call(o, e));
+        return (t = o.onLoad) == null || t.call(o, (r == null ? void 0 : r.data) || []), {
+          data: (r == null ? void 0 : r.data) || [],
+          total: (r == null ? void 0 : r.total) || 0
         };
       },
       filterFields: pe,
@@ -239,55 +239,55 @@ const No = /* @__PURE__ */ ze({
       pagination: o.pagination
     }), Se = () => {
       var a;
-      let e = ((a = o.columns) == null ? void 0 : a.filter((r) => !r.hideInTable)) || [];
-      function l(r, d) {
-        return r.map((n) => ({
+      let e = ((a = o.columns) == null ? void 0 : a.filter((t) => !t.hideInTable)) || [];
+      function r(t, d) {
+        return t.map((n) => ({
           resizable: Ye(n.resizable) ? n.resizable : o.columnResizable,
           ...re(He(n), ["ellipsis"]),
           ...be(n),
           fixed: d ? d.fixed : n.fixed,
-          title: Ue(n, E("table-header", "title"), C.headerCell, t(de).colorPrimary),
+          title: Ue(n, K("table-header", "title"), C.headerCell, l(de).colorPrimary),
           customRender({
-            value: c,
-            ...b
+            value: f,
+            ...S
           }) {
             var M, G;
-            const U = qe(n), Fe = Me({
+            const U = qe(n), xe = Me({
               ...n,
               valueType: U
             }, {
-              value: c,
-              ...b
-            }), xe = Ge(U, Fe, b.record, t(K)), q = ((M = n.renderText) == null ? void 0 : M.call(n, {
-              value: c,
-              ...b
-            })) || c, ke = n.renderText ? f(J, null, [(G = n.renderText) == null ? void 0 : G.call(n, {
-              value: c,
-              ...b
-            })]) : xe;
-            let P = Ce(n, q, ke);
-            return n.customRender && (P = n.customRender({
-              value: c,
-              ...b,
+              value: f,
+              ...S
+            }), ke = Ge(U, xe, S.record, l(O)), q = ((M = n.renderText) == null ? void 0 : M.call(n, {
+              value: f,
+              ...S
+            })) || f, Be = n.renderText ? p(J, null, [(G = n.renderText) == null ? void 0 : G.call(n, {
+              value: f,
+              ...S
+            })]) : ke;
+            let N = Re(n, q, Be);
+            return n.customRender && (N = n.customRender({
+              value: f,
+              ...S,
               column: n,
-              originalNode: P,
+              originalNode: N,
               originalText: q
-            })), P;
+            })), N;
           },
-          children: l(n.children || [], d || n)
+          children: r(n.children || [], d || n)
         }));
       }
-      return l(e);
+      return r(e);
     };
     Ne(() => {
       const e = Se();
       u.value = e, D.value = e;
     });
     const he = s(() => {
-      var l, a;
-      if (o.adaptive && (g.total > 0 || ((l = o.dataSource) == null ? void 0 : l.length)))
+      var r, a;
+      if (o.adaptive && (b.total > 0 || ((r = o.dataSource) == null ? void 0 : r.length)))
         return {
-          y: t(ie),
+          y: l(ie),
           x: ((a = o.scroll) == null ? void 0 : a.x) || "100%"
         };
       if (o.scroll)
@@ -296,26 +296,29 @@ const No = /* @__PURE__ */ ze({
       var e;
       if (o.tableLayout)
         return o.tableLayout;
-      if ((e = o.columns) != null && e.some((l) => l.ellipsis))
+      if ((e = o.columns) != null && e.some((r) => r.ellipsis))
         return "fixed";
     }), H = s(() => {
       var a;
-      const e = t(_), l = t(v);
+      const e = l(_), r = l(T);
       return {
         ...o,
         ...e,
         rowSelection: o.rowSelection === !0 || ((a = o.rowSelection) == null ? void 0 : a.mode) === "internal" ? {
-          ...l,
+          ...r,
           // tips 如果是前端分页，则默认会走缓存
-          preserveSelectedRowKeys: y(o.dataSource) ? l.preserveSelectedRowKeys : !0
+          preserveSelectedRowKeys: g(o.dataSource) ? r.preserveSelectedRowKeys : !0
         } : Je(o.rowSelection),
-        loading: y(o.loading) ? e.loading : o.loading,
+        loading: g(o.loading) ? e.loading : o.loading,
         pagination: o.pagination === !1 ? !1 : e.pagination,
-        scroll: t(he)
+        scroll: l(he)
       };
-    }), Re = s(() => [i(), o.card ? null : i("wrapper"), o.adaptive ? i("adaptive") : null, V ? ue(`sticky-${oo === 0 ? "absolute" : "relative"}`) : null].filter(Boolean));
-    function Ce(e, l, a) {
-      return ae.includes(e.valueType) ? a : e.copyable || e.ellipsis ? f(to, {
+    }), ve = s(() => {
+      var e;
+      return [c(), o.card ? null : c("wrapper"), o.adaptive ? c("adaptive") : null, A.value && ((e = i.value) != null && e.visible) ? ue(`sticky-${oo === 0 ? "absolute" : "relative"}`) : null].filter(Boolean);
+    });
+    function Re(e, r, a) {
+      return ae.includes(e.valueType) ? a : e.copyable || e.ellipsis ? p(to, {
         copyable: e.copyable,
         ellipsis: e.ellipsis ? $e(e.ellipsis) ? {
           tooltip: a,
@@ -327,59 +330,68 @@ const No = /* @__PURE__ */ ze({
         content: a
       }, null) : a;
     }
-    Q(() => t(g).loading, (e) => {
-      var l;
-      (l = o.onLoadingChange) == null || l.call(o, e);
+    Q(() => l(b).loading, (e) => {
+      var r;
+      (r = o.onLoadingChange) == null || r.call(o, e);
     }), Q(() => o.dataSource, (e) => {
       ge(e);
     }, {
       immediate: !0
     });
-    function ve(e) {
-      var l, a, r;
-      (r = (a = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : a.setFieldsValue) == null || r.call(a, e);
+    function Ce(e) {
+      var r, a, t;
+      (t = (a = (r = P.value) == null ? void 0 : r.apForm) == null ? void 0 : a.setFieldsValue) == null || t.call(a, e);
     }
     function Te(e = !1) {
-      var a, r, d;
-      const l = e ? "getFieldsValueTransformed" : "getFieldsValue";
-      return (d = (r = (a = z.value) == null ? void 0 : a.apForm) == null ? void 0 : r[l]) == null ? void 0 : d.call(r, !0);
+      var a, t, d;
+      const r = e ? "getFieldsValueTransformed" : "getFieldsValue";
+      return (d = (t = (a = P.value) == null ? void 0 : a.apForm) == null ? void 0 : t[r]) == null ? void 0 : d.call(t, !0);
     }
-    function Be() {
-      return t(u);
+    function Fe() {
+      return l(u);
     }
     return se({
       submit: () => W(),
       reset: () => j(),
       refresh: () => ye(),
-      setSearchFormValues: ve,
+      setSearchFormValues: Ce,
       getSearchFormValues: Te,
-      getShownColumns: Be,
-      dataSource: s(() => t(g).records),
+      getShownColumns: Fe,
+      dataSource: s(() => l(b).records),
       rowSelection: {
-        selectedRows: s(() => t(T)),
-        ...B
+        selectedRows: s(() => l(F)),
+        ...x
       },
       scrollBar: {
-        x: A,
+        x: {
+          getCurrentScroll: () => {
+            var e;
+            return ((e = i == null ? void 0 : i.value) == null ? void 0 : e.currentScroll) ?? 0;
+          },
+          scroll: (e) => {
+            var r, a;
+            return (a = (r = i == null ? void 0 : i.value) == null ? void 0 : r.scroll) == null ? void 0 : a.call(r, e);
+          }
+        },
         y: void 0
       }
-    }), (e, l) => (p(), F("div", {
+    }), (e, r) => (m(), k("div", {
       ref_key: "tableWrapperRef",
-      ref: O,
-      class: m(Re.value)
-    }, [t(y)(e.dataSource) && e.searchForm !== !1 && $.value.length > 0 ? (p(), F("div", {
+      ref: L,
+      class: y(ve.value)
+    }, [l(g)(e.dataSource) && e.searchForm !== !1 && $.value.length > 0 ? (m(), k("div", {
       key: 0,
-      class: m(e.card ? t(x)("search-wrapper") : null),
+      class: y(e.card ? l(B)("search-wrapper") : null),
       style: X(e.searchFormWrapperStyle)
-    }, [f(t(Ae).SearchForm, h(e.searchForm || {}, {
+    }, [p(l(Ae).SearchForm, w(e.searchForm || {}, {
       ref_key: "formRef",
-      ref: z,
+      ref: P,
       "custom-reset": "",
-      "submit-loading": t(_).loading,
-      onSubmit: t(W),
-      onReset: t(j)
+      "submit-loading": l(_).loading,
+      onSubmit: l(W),
+      onReset: l(j)
     }), Y({
-      default: w(() => [(p(!0), F(J, null, Z($.value, (a) => (p(), ee(Ie(a.renderNode.Comp), h({
+      default: v(() => [(m(!0), k(J, null, Z($.value, (a) => (m(), ee(Ie(a.renderNode.Comp), w({
         key: a.dataIndex,
         item: a,
         ref_for: !0
@@ -390,65 +402,65 @@ const No = /* @__PURE__ */ ze({
       _: 2
     }, [C.searchFormExtra ? {
       name: "extra",
-      fn: w(() => [R(e.$slots, "searchFormExtra")]),
+      fn: v(() => [R(e.$slots, "searchFormExtra")]),
       key: "0"
-    } : void 0]), 1040, ["submit-loading", "onSubmit", "onReset"])], 6)) : oe("", !0), N("div", {
+    } : void 0]), 1040, ["submit-loading", "onSubmit", "onReset"])], 6)) : oe("", !0), I("div", {
       ref_key: "contentRef",
       ref: ce,
-      class: m([t(x)("table-wrapper"), e.card ? t(x)("table-wrapper-card") : null]),
+      class: y([l(B)("table-wrapper"), e.card ? l(B)("table-wrapper-card") : null]),
       style: X(e.tableWrapperStyle)
-    }, [N("div", {
-      class: m(t(i)("header-wrapper"))
-    }, [e.settings ? (p(), F("div", {
+    }, [I("div", {
+      class: y(l(c)("header-wrapper"))
+    }, [e.settings ? (m(), k("div", {
       key: 0,
-      class: m(t(i)("header"))
-    }, [N("div", {
-      class: m(t(E)("header", "title"))
-    }, [R(e.$slots, "title", h({
-      selectedRows: t(T),
-      selectedRowKeys: t(v).selectedRowKeys,
+      class: y(l(c)("header"))
+    }, [I("div", {
+      class: y(l(K)("header", "title"))
+    }, [R(e.$slots, "title", w({
+      selectedRows: l(F),
+      selectedRowKeys: l(T).selectedRowKeys,
       shownColumns: u.value
-    }, B))], 2), C.title ? (p(), ee(t(Oe), {
+    }, x))], 2), C.title ? (m(), ee(l(Oe), {
       key: 0,
       type: "vertical"
-    })) : oe("", !0), f(lo, {
+    })) : oe("", !0), p(lo, {
       config: e.settings === !0 ? {} : e.settings
-    }, null, 8, ["config"])], 2)) : R(e.$slots, "title", h({
+    }, null, 8, ["config"])], 2)) : R(e.$slots, "title", w({
       key: 1,
-      selectedRows: t(T),
-      selectedRowKeys: t(v).selectedRowKeys,
+      selectedRows: l(F),
+      selectedRowKeys: l(T).selectedRowKeys,
       shownColumns: u.value
-    }, B))], 2), f(t(Le), h({
+    }, x))], 2), p(l(Le), w({
       ref_key: "antdTableRef",
-      ref: L,
-      class: t(i)("table")
+      ref: V,
+      class: l(c)("table")
     }, H.value, {
-      size: k.value,
+      size: z.value,
       "table-layout": we.value,
       columns: u.value,
-      onResizeColumn: l[0] || (l[0] = (a, r) => r.width = a)
+      onResizeColumn: r[0] || (r[0] = (a, t) => t.width = a)
     }), Y({
-      summary: w(() => [R(e.$slots, "summary", {
+      summary: v(() => [R(e.$slots, "summary", {
         columns: u.value,
         records: H.value.dataSource,
-        selectedRows: t(T)
+        selectedRows: l(F)
       })]),
       _: 2
-    }, [t(V) ? {
+    }, [l(A) ? {
       name: "bottomPaginationTop",
-      fn: w(() => {
-        var a, r;
-        return [f(t(no), {
+      fn: v(() => {
+        var a, t;
+        return [p(l(no), {
           ref_key: "scrollBarRef",
-          ref: A,
-          "scroll-container": (r = (a = L.value) == null ? void 0 : a.table) == null ? void 0 : r.scrollBodyRef,
+          ref: i,
+          "scroll-container": (t = (a = V.value) == null ? void 0 : a.table) == null ? void 0 : t.scrollBodyRef,
           direction: "horizontal"
         }, null, 8, ["scroll-container"])];
       }),
       key: "0"
-    } : void 0, Z(t(re)(C, ["title", "searchFormExtra", "headerCell", "summary"]), (a, r) => ({
-      name: r,
-      fn: w((d) => [R(e.$slots, r, Ee(Ke(d || {})))])
+    } : void 0, Z(l(re)(C, ["title", "searchFormExtra", "headerCell", "summary"]), (a, t) => ({
+      name: t,
+      fn: v((d) => [R(e.$slots, t, Ee(Ke(d || {})))])
     }))]), 1040, ["class", "size", "table-layout", "columns"])], 6)], 2));
   }
 });

package/es/src/ap-table/interface.d.ts

@@ -8,8 +8,6 @@ import { ApActionGroupProps } from '../ap-action';
 import { ApTableIndexProps } from './components/interface';
 import { EllipsisConfig } from '@aplus-frontend/antdv/es/typography/Base';
 import { RowSelectionReturnType } from './hooks/use-table-row-selection';
-import { ScrollBarExpose } from '../scroll-bar/interface';
-import { UnwrapRefProps } from '../utils';
 export type ValueEnumType = {
     text: string;
     /**
@@ -374,7 +372,10 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
      * 滚动条实例
      */
     scrollBar: {
-        x: Ref<UnwrapRefProps<ScrollBarExpose>>;
-        y: Ref<UnwrapRefProps<ScrollBarExpose>>;
+        x: {
+            getCurrentScroll: () => number;
+            scroll: (percent: number) => void | undefined;
+        };
+        y: undefined;
     };
 };

package/es/src/business/ap-table-modal/hooks/use-create-table-modal.d.ts

@@ -1,8 +1,6 @@
 import { OpenOptions, UseCreateTableModalProps, OpenReturnType } from '../interface';
 import { Recordable } from '../../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
-import { UnwrapRefProps } from '../../../utils';
-import { ScrollBarExpose } from '../../../scroll-bar';
 export declare function useCreateTableModal(props: UseCreateTableModalProps): {
     readonly openModal: <T>(selected?: any[], options?: OpenOptions) => Promise< OpenReturnType<T> | undefined>;
     readonly closeModal: () => void;
@@ -28,8 +26,11 @@ export declare function useCreateTableModal(props: UseCreateTableModalProps): {
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
         scrollBar: {
-            x: UnwrapRefProps<ScrollBarExpose>;
-            y: UnwrapRefProps<ScrollBarExpose>;
+            x: {
+                getCurrentScroll: () => number;
+                scroll: (percent: number) => void | undefined;
+            };
+            y: undefined;
         };
     } | null | undefined;
     readonly isDestroyed: true;

package/es/src/business/ap-table-modal/hooks/use-table-modal.d.ts

@@ -1,8 +1,6 @@
 import { ApTableModalProps, OpenOptions } from '../interface';
 import { Recordable } from '../../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
-import { UnwrapRefProps } from '../../../utils';
-import { ScrollBarExpose } from '../../..';
 /** 函数式调用弹框表格 */
 export declare function useTableModal<TableRowType = Record<string, any>>(props: ApTableModalProps<TableRowType>): {
     reloadApTableData: () => void;
@@ -26,8 +24,11 @@ export declare function useTableModal<TableRowType = Record<string, any>>(props:
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
         scrollBar: {
-            x: UnwrapRefProps<ScrollBarExpose>;
-            y: UnwrapRefProps<ScrollBarExpose>;
+            x: {
+                getCurrentScroll: () => number;
+                scroll: (percent: number) => void | undefined;
+            };
+            y: undefined;
         };
     } | null | undefined;
     isDestroyed: true;

package/es/src/business/ap-table-modal/hooks/use-table-select-modal.d.ts

@@ -1,8 +1,6 @@
 import { OpenOptions, UseTableSelectModalProps } from '../interface';
 import { Recordable } from '../../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
-import { UnwrapRefProps } from '../../../utils';
-import { ScrollBarExpose } from '../../..';
 export declare function useTableSelectModal<TableRowType = Record<string, any>>(props: UseTableSelectModalProps<TableRowType>): {
     reloadApTableData: () => void;
     resetApTableData: () => void;
@@ -25,8 +23,11 @@ export declare function useTableSelectModal<TableRowType = Record<string, any>>(
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
         scrollBar: {
-            x: UnwrapRefProps<ScrollBarExpose>;
-            y: UnwrapRefProps<ScrollBarExpose>;
+            x: {
+                getCurrentScroll: () => number;
+                scroll: (percent: number) => void | undefined;
+            };
+            y: undefined;
         };
     } | null | undefined;
     isDestroyed: true;

package/es/src/business/ap-table-modal/index.d.ts

@@ -4,8 +4,6 @@ import { CreateComponentPublicInstanceWithMixins, ComponentOptionsMixin, PublicP
 import { ApTableModalProps, OpenOptions, OpenReturnType } from './interface';
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
-import { UnwrapRefProps } from '../../utils';
-import { ScrollBarExpose } from '../..';
 /**
  *
  */
@@ -34,8 +32,11 @@ declare const ApTableModal: {
             } | undefined;
             getShownColumns: () => TableColumnsType<any>;
             scrollBar: {
-                x: UnwrapRefProps<ScrollBarExpose>;
-                y: UnwrapRefProps<ScrollBarExpose>;
+                x: {
+                    getCurrentScroll: () => number;
+                    scroll: (percent: number) => void | undefined;
+                };
+                y: undefined;
             };
         } | null;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -77,7 +78,10 @@ declare const ApTableModal: {
                 selectedRows: ComputedRef<any[]>;
             };
             scrollBar: {
-                x: Ref< ScrollBarExpose | undefined, ScrollBarExpose | undefined>;
+                x: {
+                    getCurrentScroll: () => 0 | Ref<number, number>;
+                    scroll: (percent: number) => void | undefined;
+                };
                 y: undefined;
             };
         }> | null;
@@ -112,8 +116,11 @@ declare const ApTableModal: {
             } | undefined;
             getShownColumns: () => TableColumnsType<any>;
             scrollBar: {
-                x: UnwrapRefProps<ScrollBarExpose>;
-                y: UnwrapRefProps<ScrollBarExpose>;
+                x: {
+                    getCurrentScroll: () => number;
+                    scroll: (percent: number) => void | undefined;
+                };
+                y: undefined;
             };
         } | null;
     }, {}, {}, {}, {
@@ -161,8 +168,11 @@ declare const ApTableModal: {
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
         scrollBar: {
-            x: UnwrapRefProps<ScrollBarExpose>;
-            y: UnwrapRefProps<ScrollBarExpose>;
+            x: {
+                getCurrentScroll: () => number;
+                scroll: (percent: number) => void | undefined;
+            };
+            y: undefined;
         };
     } | null;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {