@aplus-frontend/ui 0.4.22 → 0.4.24

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

@@ -2,8 +2,6 @@ import { OpenOptions, OpenReturnType, ApTableModalProps } from './interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, ShallowUnwrapRef, ComputedRef, Ref } from 'vue';
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
-import { UnwrapRefProps } from '../../utils';
-import { ScrollBarExpose } from '../../scroll-bar';
 type __VLS_Props = ApTableModalProps;
 declare const _default: DefineComponent<__VLS_Props, {
     open: <T>(selected?: any[], options?: OpenOptions) => Promise<OpenReturnType<T>>;
@@ -27,8 +25,11 @@ declare const _default: DefineComponent<__VLS_Props, {
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
         scrollBar: {
-            x: UnwrapRefProps<ScrollBarExpose>;
-            y: UnwrapRefProps<ScrollBarExpose>;
+            x: {
+                getCurrentScroll: () => number;
+                scroll: (percent: number) => void | undefined;
+            };
+            y: undefined;
         };
     } | null;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -72,7 +73,10 @@ declare const _default: DefineComponent<__VLS_Props, {
             selectedRows: ComputedRef<any[]>;
         };
         scrollBar: {
-            x: Ref< ScrollBarExpose | undefined, ScrollBarExpose | undefined>;
+            x: {
+                getCurrentScroll: () => 0 | Ref<number, number>;
+                scroll: (percent: number) => void | undefined;
+            };
             y: undefined;
         };
     }> | null;

package/es/src/business/hooks/usePageListApTable.d.ts

@@ -2,8 +2,6 @@ import { ApTableProps } from '../../';
 import { UseTableRefreshOption } from './useTableRefresh';
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
-import { UnwrapRefProps } from '../../utils';
-import { ScrollBarExpose } from '../../scroll-bar';
 export interface UsePageListApTable extends ApTableProps {
     /** 是否显示默认的行选择配置
      * @default true
@@ -52,8 +50,11 @@ export declare function usePageListApTable(props?: UsePageListApTable): [ApTable
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
         scrollBar: {
-            x: UnwrapRefProps<ScrollBarExpose>;
-            y: UnwrapRefProps<ScrollBarExpose>;
+            x: {
+                getCurrentScroll: () => number;
+                scroll: (percent: number) => void | undefined;
+            };
+            y: undefined;
         };
     } | null | undefined;
     getSearchFormValuesAndSorted: (transform?: boolean) => any;

package/es/src/business/hooks/useTableRefresh.mjs

@@ -1,55 +1,52 @@
-import { ref as x, onMounted as D, nextTick as g, onActivated as o, onDeactivated as E } from "vue";
+import { ref as Y, onMounted as x, nextTick as y, onActivated as D, onDeactivated as o } from "vue";
 import "../../index.mjs";
-import { useGlobalConfig as L } from "../../config-provider/hooks/use-global-config.mjs";
+import { useGlobalConfig as E } from "../../config-provider/hooks/use-global-config.mjs";
 function v(e) {
   return document.querySelector(e);
 }
-function q(e, r = ".demo") {
-  const s = v(r);
-  s && (s.scrollTop = e);
+function L(e, s = ".demo") {
+  const a = v(s);
+  a && (a.scrollTop = e);
 }
-function k(e) {
-  const r = L("scrollYDomName");
-  let s = !0;
-  const d = x(0), T = x(0), y = (["reset", "submit", void 0].includes(e == null ? void 0 : e.refreshType) ? e == null ? void 0 : e.refreshType : "submit") ?? "submit", b = (e == null ? void 0 : e.refreshBefore) ?? (() => !0);
+function C(e) {
+  const s = E("scrollYDomName");
+  let a = !0;
+  const d = Y(0), T = Y(0), g = (["reset", "submit", void 0].includes(e == null ? void 0 : e.refreshType) ? e == null ? void 0 : e.refreshType : "submit") ?? "submit", b = (e == null ? void 0 : e.refreshBefore) ?? (() => !0);
   let S = !0;
-  const n = (a) => {
-    if (s === !1) return;
-    const l = a.target;
+  const n = (c) => {
+    if (a === !1) return;
+    const l = c.target;
     T.value = l.scrollTop;
   };
-  return D(() => {
-    g(() => {
+  return x(() => {
+    y(() => {
       S = !1;
     });
-  }), o(() => {
-    const a = b == null ? void 0 : b();
+  }), D(() => {
+    const c = b == null ? void 0 : b();
     if (S) {
       setTimeout(() => {
-        const l = v(r.value);
+        const l = v(s.value);
         l && l.addEventListener("scroll", n);
       });
       return;
     }
-    a && setTimeout(() => {
-      var c, u, t, m, h, R, f, Y;
-      s = !0, (u = (c = e == null ? void 0 : e.apTableRef) == null ? void 0 : c.value) == null || u[y](), (Y = (f = (R = (h = (m = (t = e == null ? void 0 : e.apTableRef) == null ? void 0 : t.value) == null ? void 0 : m.scrollBar) == null ? void 0 : h.x) == null ? void 0 : R.value) == null ? void 0 : f.scroll) == null || Y.call(
-        f,
-        d.value
-      ), q(T.value, r.value);
-      const l = v(r.value);
+    c && setTimeout(() => {
+      var t, u, r, m, h, f, R;
+      a = !0, (u = (t = e == null ? void 0 : e.apTableRef) == null ? void 0 : t.value) == null || u[g](), (R = (f = (h = (m = (r = e == null ? void 0 : e.apTableRef) == null ? void 0 : r.value) == null ? void 0 : m.scrollBar) == null ? void 0 : h.x) == null ? void 0 : f.scroll) == null || R.call(f, d.value), L(T.value, s.value);
+      const l = v(s.value);
       l && l.addEventListener("scroll", n);
     });
-  }), E(() => {
-    var l, c, u, t, m;
-    s = !1, d.value = ((m = (t = (u = (c = (l = e == null ? void 0 : e.apTableRef) == null ? void 0 : l.value) == null ? void 0 : c.scrollBar) == null ? void 0 : u.x) == null ? void 0 : t.value) == null ? void 0 : m.currentScroll) ?? 0;
-    const a = v(r.value);
-    a && a.removeEventListener("scroll", n);
+  }), o(() => {
+    var l, t, u, r, m;
+    a = !1, d.value = ((m = (r = (u = (t = (l = e == null ? void 0 : e.apTableRef) == null ? void 0 : l.value) == null ? void 0 : t.scrollBar) == null ? void 0 : u.x) == null ? void 0 : r.getCurrentScroll) == null ? void 0 : m.call(r)) ?? 0;
+    const c = v(s.value);
+    c && c.removeEventListener("scroll", n);
   }), {
     tableScrollX: d,
     tableScrollY: T
   };
 }
 export {
-  k as useTableRefresh
+  C as useTableRefresh
 };

package/es/src/scroll-bar/index.vue.d.ts

@@ -1,8 +1,9 @@
 import { ScrollBarProps, ScrollBarDirection, InternalScrollBarProps } from './interface';
 import { DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, Ref, GlobalComponents, GlobalDirectives } from 'vue';
+declare function handleBarScroll(percent: number): void;
 declare const _default: DefineComponent<ScrollBarProps, {
     currentScroll: ComputedRef<number | undefined>;
-    scroll: (percent: number) => void | undefined;
+    scroll: typeof handleBarScroll;
     visible: ComputedRef<boolean>;
     rootElement: ComputedRef<HTMLElement | undefined>;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ScrollBarProps> & Readonly<{}>, {

package/es/src/scroll-bar/index.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as z, toRef as g, ref as d, watchEffect as x, unref as c, watch as _, computed as s, openBlock as k, createBlock as C, mergeProps as B, createCommentVNode as L } from "vue";
+import { defineComponent as z, toRef as g, ref as p, watchEffect as x, unref as a, watch as _, computed as s, openBlock as k, createBlock as C, mergeProps as B, createCommentVNode as L } from "vue";
 import "./internal.vue2.mjs";
 import { omit as R } from "lodash-unified";
 import { getScrollable as u, ensureRangeValue as w } from "./utils/index.mjs";
@@ -24,71 +24,68 @@ const W = /* @__PURE__ */ z({
     onScroll: {},
     onScrollEnd: {}
   },
-  setup(p, { expose: S }) {
-    const t = p, l = g(t, "scrollContainer"), n = d(), a = d(t.barLength);
-    function m() {
-      if (!l.value || !n.value) return;
-      const { totalSize: e, visibleSize: r, distance: o } = u(
-        l.value,
-        t.direction
-      ), i = o / (e + t.extraSize - r || 1) * 100;
-      n.value.scroll(i);
+  setup(S, { expose: m }) {
+    const r = S, o = g(r, "scrollContainer"), l = p(), n = p(r.barLength);
+    function v() {
+      if (!o.value || !l.value) return;
+      const { totalSize: e, visibleSize: t, distance: c } = u(
+        o.value,
+        r.direction
+      ), i = c / (e + r.extraSize - t || 1) * 100;
+      l.value.scroll(i);
     }
     function f() {
-      const { visibleSize: e, totalSize: r } = u(
-        l.value,
-        t.direction
+      const { visibleSize: e, totalSize: t } = u(
+        o.value,
+        r.direction
       );
-      a.value = w(
-        e / (r + t.extraSize || 1) * 100
+      n.value = w(
+        e / (t + r.extraSize || 1) * 100
       );
     }
-    y(l, () => {
+    y(o, () => {
       f();
     }), x(
       () => {
-        const e = c(l.value);
-        e && (f(), e.addEventListener("scroll", m));
+        const e = a(o.value);
+        e && (f(), e.addEventListener("scroll", v));
       },
       { flush: "post" }
     ), _(
-      () => t.barLength,
+      () => r.barLength,
       (e) => {
-        a.value = e;
+        n.value = e;
       }
     );
-    function v(e) {
-      const r = c(l);
-      if (!r) return;
-      const { totalSize: o, visibleSize: i, topOrLeft: b } = u(
-        r,
-        t.direction
+    function d(e) {
+      const t = a(o);
+      if (!t) return;
+      const { totalSize: c, visibleSize: i, topOrLeft: b } = u(
+        t,
+        r.direction
       );
-      if (o <= i) return;
+      if (c <= i) return;
       const h = `scroll${b}`;
-      r[h] = e * (o + t.extraSize - i) / 100;
+      t[h] = e * (c + r.extraSize - i) / 100;
     }
-    return S({
+    return m({
       currentScroll: s(() => {
         var e;
-        return c((e = n.value) == null ? void 0 : e.currentScroll);
+        return a((e = l.value) == null ? void 0 : e.currentScroll);
       }),
-      scroll: (e) => {
-        var r, o;
-        return (o = (r = n.value) == null ? void 0 : r.scroll) == null ? void 0 : o.call(r, e);
-      },
-      visible: s(() => a.value < 100),
+      scroll: d,
+      visible: s(() => n.value < 100),
       rootElement: s(() => {
         var e;
-        return c((e = n.value) == null ? void 0 : e.container);
+        return a((e = l.value) == null ? void 0 : e.container);
       })
-    }), (e, r) => a.value !== 100 ? (k(), C(E, B({
+    }), (e, t) => n.value !== 100 ? (k(), C(E, B({
       key: 0,
       ref_key: "barRef",
-      ref: n
-    }, c(R)(t, ["onScroll", "extraSize", "scrollContainer"]), {
-      "bar-length": a.value,
-      onScroll: v
+      ref: l
+    }, a(R)(r, ["onScroll", "extraSize", "scrollContainer"]), {
+      "bar-length": n.value,
+      onScroll: d
     }), null, 16, ["bar-length"])) : L("", !0);
   }
 });

package/es/src/scroll-bar/internal.vue.mjs

@@ -21,7 +21,7 @@ const I = /* @__PURE__ */ V({
     onScrollEnd: {}
   },
   setup(D, { expose: M }) {
-    const t = D, k = f(), c = f(), l = f(), { b: B, e: v, m: P, em: d, cssVar: R } = Y("scroll-bar"), r = f(t.scroll), { handleMouseDown: g } = X({
+    const t = D, k = f(), c = f(), l = f(), { b: B, e: v, m: P, em: d, cssVar: R } = Y("scroll-bar"), r = f(t.scroll), { handleMouseDown: p } = X({
       currentScroll: r,
       track: c,
       bar: l,
@@ -60,11 +60,11 @@ const I = /* @__PURE__ */ V({
       const n = o(c), i = o(l);
       if (!n || !i)
         return;
-      document.addEventListener("pointermove", S), document.addEventListener("pointerup", w);
+      document.addEventListener("pointermove", g), document.addEventListener("pointerup", S);
       const a = n.getBoundingClientRect(), y = i.getBoundingClientRect();
       t.direction === "vertical" ? (b = a.height, s = y.top - a.top, u = e.clientY) : (b = a.width, s = y.left - a.left, u = e.clientX), (E = t.onScrollStart) == null || E.call(t, o(r));
     }
-    function S(e) {
+    function g(e) {
       var a;
       e.stopPropagation(), e.preventDefault();
       let n;
@@ -72,16 +72,15 @@ const I = /* @__PURE__ */ V({
       const i = n / b / (100 - t.barLength) * 1e4;
       r.value = C(i), (a = t.onScroll) == null || a.call(t, o(r));
     }
-    function w(e) {
+    function S(e) {
       var n;
-      e.preventDefault(), document.removeEventListener("pointermove", S), document.removeEventListener("pointerup", w), (n = t.onScrollEnd) == null || n.call(t, o(r));
+      e.preventDefault(), document.removeEventListener("pointermove", g), document.removeEventListener("pointerup", S), (n = t.onScrollEnd) == null || n.call(t, o(r));
     }
-    function p(e) {
+    function w(e) {
       e.cancelable && (e.stopPropagation(), e.preventDefault());
     }
     function $(e) {
-      var n;
-      Math.abs(o(r) - e) <= 1e-3 || (r.value = C(e), (n = t.onScroll) == null || n.call(t, e));
+      Math.abs(o(r) - e) <= 1e-3 || (r.value = C(e));
     }
     return M({
       currentScroll: r,
@@ -111,8 +110,8 @@ const I = /* @__PURE__ */ V({
           e.showTrack ? null : o(d)("track", "hidden")
         ]),
         onPointerdown: n[0] || (n[0] = //@ts-ignore
-        (...i) => o(g) && o(g)(...i)),
-        onTouchstart: p
+        (...i) => o(p) && o(p)(...i)),
+        onTouchstart: w
       }, null, 34),
       L("div", {
         ref_key: "bar",
@@ -123,7 +122,7 @@ const I = /* @__PURE__ */ V({
           e.disabled ? o(d)("bar", "disabled") : null
         ]),
         onPointerdown: T,
-        onTouchstart: p
+        onTouchstart: w
       }, null, 34)
     ], 6));
   }

package/es/src/utils/index.d.ts

@@ -1,4 +1,3 @@
-import { Ref } from 'vue';
 import { Recordable } from '../type';
 /**
  * @description:  Set ui mount node
@@ -41,10 +40,3 @@ export declare function runFunction<T extends any[]>(func: any, ...restParams: T
  */
 export declare function getRouteType(): "history" | "hash";
 export declare function getScrollbarSize(): number;
-export type UnwrapRef<T> = T extends Ref<infer U> ? U : T;
-/**
- * 将传入的泛型中所有类型为 Ref<x> 转换为类型 x
- */
-export type UnwrapRefProps<T> = {
-    [K in keyof T]: UnwrapRef<T[K]>;
-};

package/index.ts

@@ -0,0 +1,19 @@
+import * as components from './src/index';
+import { App } from 'vue';
+import pathMap from './src/path-map';
+
+export * from './src/index';
+export * from './src/hooks';
+
+export { pathMap };
+
+export default {
+  install: (app: App) => {
+    for (const c in components) {
+      const comp = (components as any)[c];
+      if (comp.install) {
+        app.use(comp);
+      }
+    }
+  }
+};

package/lib/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/lib/src/ap-table/ap-table.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),A=require("@aplus-frontend/antdv"),ie=require("@aplus-frontend/antdv/es/theme/internal"),fe=require("../ap-form/index.js"),U=require("./constants.js");require("../config-provider/index.js");const pe=require("./hooks/use-table-paging-ng.js"),c=require("lodash-unified"),s=require("./utils.js"),me=require("./hooks/use-table-content-height.js"),ye=require("./hooks/use-table-row-selection.js"),ge=require("../utils/index.js");require("./components/setting/modal/index.vue.js");require("./components/paragraph-ellipsis/index.vue.js");const Se=require("./context.js");require("../scroll-bar/index.js");const be=require("./hooks/use-sticky-scroll.js"),he=require("../config-provider/css-var.js"),we=require("../config-provider/hooks/use-namespace.js"),Ce=require("../config-provider/hooks/use-global-config.js"),ve=require("./components/paragraph-ellipsis/index.vue2.js"),Re=require("./components/setting/modal/index.vue2.js"),Be=require("../scroll-bar/index.vue.js"),xe=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},rowSelection:{type:[Boolean,Object]},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1},columnResizable:{type:Boolean,default:!1},settings:{type:[Boolean,Object],default:void 0}},setup(D,{expose:$}){const t=D;let R=0;const y=e.useSlots(),[,j]=ie.useToken(),{e:h,b:i,be:B,m:W}=we.useNamespace("ap-table"),x=Ce.useGlobalConfig("valueTypeMap"),{height:H,contentRef:M}=me.default(),k=e.ref(),T=e.ref(),{isStickyMode:F,scrollBarRef:q}=be.useStickyScroll(k),w=e.ref(t.size),d=e.ref([]),z=e.ref([]);Se.useProvideApTable({columns:e.computed(()=>d.value),columnsBackup:e.computed(()=>z.value),size:e.computed(()=>w.value),updateColumns(r){d.value=r},updateSize(r){w.value=r},dataSource:e.computed(()=>e.unref(p).records)});const N=e.computed(()=>{var r,a,o;return R++,((o=(a=(r=t.columns)==null?void 0:r.filter(n=>!n.hideInSearch&&n.dataIndex&&(n.valueType||n.customRenderFormItem)&&!U.noRenderAsFormItemValueList.includes(n.valueType)))==null?void 0:a.sort((n,u)=>{let l=s.getColumnOrder(n.order);return s.getColumnOrder(u.order)-l}))==null?void 0:o.map(n=>{const u=s.updateFormProps(n,s.getFieldProps(n.fieldProps,{})),l={...n,fieldProps:{label:n.title,name:n.dataIndex,...u||{},_signal:R},renderNode:void 0};return l.renderNode=s.getSearchFormItemRenderNode(l,e.unref(x)),l}))||[]}),G=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.sorter===!0)return r.key||r.dataIndex}).filter(Boolean)),J=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.filters&&!r.onFilter)return r.key||r.dataIndex}).filter(Boolean)),Q=e.computed(()=>c.isUndefined(t.dataSource)?p.records:t.dataSource),{rowSelection:g,selectedRows:S,...b}=ye.default({fixed:!0,...t.rowSelection===!0?{}:t.rowSelection,rowKey:t.rowKey,dataSource:Q}),{formRef:C,submit:P,reset:_,tableProps:V,refresh:X,data:p,setDataSource:Y,getColumnSFConfig:Z}=pe.useTablePaging({async request(r){var o,n;if(!g.value.preserveSelectedRowKeys&&c.isUndefined(t.dataSource)&&b.clearAll(),!c.isUndefined(t.dataSource))return{data:t.dataSource||[],total:t.dataSource.length||0};const a=await((o=t.request)==null?void 0:o.call(t,r));return(n=t.onLoad)==null||n.call(t,(a==null?void 0:a.data)||[]),{data:(a==null?void 0:a.data)||[],total:(a==null?void 0:a.total)||0}},filterFields:J,sortFields:G,defaultParams:t.params,defaultData:t.defaultData,manual:t.manual,formatParams:t.beforeSearchSubmit,pagination:t.pagination}),ee=()=>{var o;let r=((o=t.columns)==null?void 0:o.filter(n=>!n.hideInTable))||[];function a(n,u){return n.map(l=>({resizable:ge.isDef(l.resizable)?l.resizable:t.columnResizable,...c.omit(s.apColumnToColumn(l),["ellipsis"]),...Z(l),fixed:u?u.fixed:l.fixed,title:s.getTableTitle(l,B("table-header","title"),y.headerCell,e.unref(j).colorPrimary),customRender({value:f,...m}){var K,L;const I=s.getTableRenderType(l),ue=s.getTableRenderProps({...l,valueType:I},{value:f,...m}),de=s.getTableCellRenderNode(I,ue,m.record,e.unref(x)),O=((K=l.renderText)==null?void 0:K.call(l,{value:f,...m}))||f,ce=l.renderText?e.createVNode(e.Fragment,null,[(L=l.renderText)==null?void 0:L.call(l,{value:f,...m})]):de;let v=ne(l,O,ce);return l.customRender&&(v=l.customRender({value:f,...m,column:l,originalNode:v,originalText:O})),v},children:a(l.children||[],u||l)}))}return a(r)};e.watchEffect(()=>{const r=ee();d.value=r,z.value=r});const re=e.computed(()=>{var a,o;if(t.adaptive&&(p.total>0||((a=t.dataSource)==null?void 0:a.length)))return{y:e.unref(H),x:((o=t.scroll)==null?void 0:o.x)||"100%"};if(t.scroll)return t.scroll}),te=e.computed(()=>{var r;if(t.tableLayout)return t.tableLayout;if((r=t.columns)!=null&&r.some(a=>a.ellipsis))return"fixed"}),E=e.computed(()=>{var o;const r=e.unref(V),a=e.unref(g);return{...t,...r,rowSelection:t.rowSelection===!0||((o=t.rowSelection)==null?void 0:o.mode)==="internal"?{...a,preserveSelectedRowKeys:c.isUndefined(t.dataSource)?a.preserveSelectedRowKeys:!0}:s.falseToUndefined(t.rowSelection),loading:c.isUndefined(t.loading)?r.loading:t.loading,pagination:t.pagination===!1?!1:r.pagination,scroll:e.unref(re)}}),oe=e.computed(()=>[i(),t.card?null:i("wrapper"),t.adaptive?i("adaptive"):null,F?W(`sticky-${he.scrollbarSize===0?"absolute":"relative"}`):null].filter(Boolean));function ne(r,a,o){return U.noRenderAsFormItemValueList.includes(r.valueType)?o:r.copyable||r.ellipsis?e.createVNode(ve.default,{copyable:r.copyable,ellipsis:r.ellipsis?c.isBoolean(r.ellipsis)?{tooltip:o,rows:1}:{...r.ellipsis,tooltip:o}:!1,content:o},null):o}e.watch(()=>e.unref(p).loading,r=>{var a;(a=t.onLoadingChange)==null||a.call(t,r)}),e.watch(()=>t.dataSource,r=>{Y(r)},{immediate:!0});function ae(r){var a,o,n;(n=(o=(a=C.value)==null?void 0:a.apForm)==null?void 0:o.setFieldsValue)==null||n.call(o,r)}function le(r=!1){var o,n,u;const a=r?"getFieldsValueTransformed":"getFieldsValue";return(u=(n=(o=C.value)==null?void 0:o.apForm)==null?void 0:n[a])==null?void 0:u.call(n,!0)}function se(){return e.unref(d)}return $({submit:()=>P(),reset:()=>_(),refresh:()=>X(),setSearchFormValues:ae,getSearchFormValues:le,getShownColumns:se,dataSource:e.computed(()=>e.unref(p).records),rowSelection:{selectedRows:e.computed(()=>e.unref(S)),...b},scrollBar:{x:q,y:void 0}}),(r,a)=>(e.openBlock(),e.createElementBlock("div",{ref_key:"tableWrapperRef",ref:k,class:e.normalizeClass(oe.value)},[e.unref(c.isUndefined)(r.dataSource)&&r.searchForm!==!1&&N.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(h)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(fe.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:C,"custom-reset":"","submit-loading":e.unref(V).loading,onSubmit:e.unref(P),onReset:e.unref(_)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(N.value,o=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.renderNode.Comp),e.mergeProps({key:o.dataIndex,item:o,ref_for:!0},o.fieldProps||{},{span:o.span,"custom-render":o.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[y.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:M,class:e.normalizeClass([e.unref(h)("table-wrapper"),r.card?e.unref(h)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(i)("header-wrapper"))},[r.settings?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(i)("header"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(B)("header","title"))},[e.renderSlot(r.$slots,"title",e.mergeProps({selectedRows:e.unref(S),selectedRowKeys:e.unref(g).selectedRowKeys,shownColumns:d.value},b))],2),y.title?(e.openBlock(),e.createBlock(e.unref(A.Divider),{key:0,type:"vertical"})):e.createCommentVNode("",!0),e.createVNode(Re.default,{config:r.settings===!0?{}:r.settings},null,8,["config"])],2)):e.renderSlot(r.$slots,"title",e.mergeProps({key:1,selectedRows:e.unref(S),selectedRowKeys:e.unref(g).selectedRowKeys,shownColumns:d.value},b))],2),e.createVNode(e.unref(A.Table),e.mergeProps({ref_key:"antdTableRef",ref:T,class:e.unref(i)("table")},E.value,{size:w.value,"table-layout":te.value,columns:d.value,onResizeColumn:a[0]||(a[0]=(o,n)=>n.width=o)}),e.createSlots({summary:e.withCtx(()=>[e.renderSlot(r.$slots,"summary",{columns:d.value,records:E.value.dataSource,selectedRows:e.unref(S)})]),_:2},[e.unref(F)?{name:"bottomPaginationTop",fn:e.withCtx(()=>{var o,n;return[e.createVNode(e.unref(Be.default),{ref_key:"scrollBarRef",ref:q,"scroll-container":(n=(o=T.value)==null?void 0:o.table)==null?void 0:n.scrollBodyRef,direction:"horizontal"},null,8,["scroll-container"])]}),key:"0"}:void 0,e.renderList(e.unref(c.omit)(y,["title","searchFormExtra","headerCell","summary"]),(o,n)=>({name:n,fn:e.withCtx(u=>[e.renderSlot(r.$slots,n,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040,["class","size","table-layout","columns"])],6)],2))}});exports.default=xe;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),A=require("@aplus-frontend/antdv"),ie=require("@aplus-frontend/antdv/es/theme/internal"),fe=require("../ap-form/index.js"),U=require("./constants.js");require("../config-provider/index.js");const pe=require("./hooks/use-table-paging-ng.js"),c=require("lodash-unified"),s=require("./utils.js"),me=require("./hooks/use-table-content-height.js"),ye=require("./hooks/use-table-row-selection.js"),ge=require("../utils/index.js");require("./components/setting/modal/index.vue.js");require("./components/paragraph-ellipsis/index.vue.js");const Se=require("./context.js");require("../scroll-bar/index.js");const be=require("./hooks/use-sticky-scroll.js"),he=require("../config-provider/css-var.js"),we=require("../config-provider/hooks/use-namespace.js"),ve=require("../config-provider/hooks/use-global-config.js"),Ce=require("./components/paragraph-ellipsis/index.vue2.js"),Re=require("./components/setting/modal/index.vue2.js"),xe=require("../scroll-bar/index.vue.js"),ke=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!1},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},rowSelection:{type:[Boolean,Object]},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1},columnResizable:{type:Boolean,default:!1},settings:{type:[Boolean,Object],default:void 0}},setup(D,{expose:$}){const t=D;let x=0;const g=e.useSlots(),[,j]=ie.useToken(),{e:w,b:f,be:k,m:W}=we.useNamespace("ap-table"),T=ve.useGlobalConfig("valueTypeMap"),{height:H,contentRef:M}=me.default(),B=e.ref(),F=e.ref(),{isStickyMode:q,scrollBarRef:i}=be.useStickyScroll(B),v=e.ref(t.size),d=e.ref([]),z=e.ref([]);Se.useProvideApTable({columns:e.computed(()=>d.value),columnsBackup:e.computed(()=>z.value),size:e.computed(()=>v.value),updateColumns(r){d.value=r},updateSize(r){v.value=r},dataSource:e.computed(()=>e.unref(m).records)});const N=e.computed(()=>{var r,n,o;return x++,((o=(n=(r=t.columns)==null?void 0:r.filter(a=>!a.hideInSearch&&a.dataIndex&&(a.valueType||a.customRenderFormItem)&&!U.noRenderAsFormItemValueList.includes(a.valueType)))==null?void 0:n.sort((a,u)=>{let l=s.getColumnOrder(a.order);return s.getColumnOrder(u.order)-l}))==null?void 0:o.map(a=>{const u=s.updateFormProps(a,s.getFieldProps(a.fieldProps,{})),l={...a,fieldProps:{label:a.title,name:a.dataIndex,...u||{},_signal:x},renderNode:void 0};return l.renderNode=s.getSearchFormItemRenderNode(l,e.unref(T)),l}))||[]}),G=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.sorter===!0)return r.key||r.dataIndex}).filter(Boolean)),J=e.computed(()=>s.recursionApColumns(e.unref(d),r=>{if(r.filters&&!r.onFilter)return r.key||r.dataIndex}).filter(Boolean)),Q=e.computed(()=>c.isUndefined(t.dataSource)?m.records:t.dataSource),{rowSelection:S,selectedRows:b,...h}=ye.default({fixed:!0,...t.rowSelection===!0?{}:t.rowSelection,rowKey:t.rowKey,dataSource:Q}),{formRef:C,submit:P,reset:_,tableProps:V,refresh:X,data:m,setDataSource:Y,getColumnSFConfig:Z}=pe.useTablePaging({async request(r){var o,a;if(!S.value.preserveSelectedRowKeys&&c.isUndefined(t.dataSource)&&h.clearAll(),!c.isUndefined(t.dataSource))return{data:t.dataSource||[],total:t.dataSource.length||0};const n=await((o=t.request)==null?void 0:o.call(t,r));return(a=t.onLoad)==null||a.call(t,(n==null?void 0:n.data)||[]),{data:(n==null?void 0:n.data)||[],total:(n==null?void 0:n.total)||0}},filterFields:J,sortFields:G,defaultParams:t.params,defaultData:t.defaultData,manual:t.manual,formatParams:t.beforeSearchSubmit,pagination:t.pagination}),ee=()=>{var o;let r=((o=t.columns)==null?void 0:o.filter(a=>!a.hideInTable))||[];function n(a,u){return a.map(l=>({resizable:ge.isDef(l.resizable)?l.resizable:t.columnResizable,...c.omit(s.apColumnToColumn(l),["ellipsis"]),...Z(l),fixed:u?u.fixed:l.fixed,title:s.getTableTitle(l,k("table-header","title"),g.headerCell,e.unref(j).colorPrimary),customRender({value:p,...y}){var K,L;const I=s.getTableRenderType(l),ue=s.getTableRenderProps({...l,valueType:I},{value:p,...y}),de=s.getTableCellRenderNode(I,ue,y.record,e.unref(T)),O=((K=l.renderText)==null?void 0:K.call(l,{value:p,...y}))||p,ce=l.renderText?e.createVNode(e.Fragment,null,[(L=l.renderText)==null?void 0:L.call(l,{value:p,...y})]):de;let R=ne(l,O,ce);return l.customRender&&(R=l.customRender({value:p,...y,column:l,originalNode:R,originalText:O})),R},children:n(l.children||[],u||l)}))}return n(r)};e.watchEffect(()=>{const r=ee();d.value=r,z.value=r});const re=e.computed(()=>{var n,o;if(t.adaptive&&(m.total>0||((n=t.dataSource)==null?void 0:n.length)))return{y:e.unref(H),x:((o=t.scroll)==null?void 0:o.x)||"100%"};if(t.scroll)return t.scroll}),te=e.computed(()=>{var r;if(t.tableLayout)return t.tableLayout;if((r=t.columns)!=null&&r.some(n=>n.ellipsis))return"fixed"}),E=e.computed(()=>{var o;const r=e.unref(V),n=e.unref(S);return{...t,...r,rowSelection:t.rowSelection===!0||((o=t.rowSelection)==null?void 0:o.mode)==="internal"?{...n,preserveSelectedRowKeys:c.isUndefined(t.dataSource)?n.preserveSelectedRowKeys:!0}:s.falseToUndefined(t.rowSelection),loading:c.isUndefined(t.loading)?r.loading:t.loading,pagination:t.pagination===!1?!1:r.pagination,scroll:e.unref(re)}}),oe=e.computed(()=>{var r;return[f(),t.card?null:f("wrapper"),t.adaptive?f("adaptive"):null,q.value&&((r=i.value)!=null&&r.visible)?W(`sticky-${he.scrollbarSize===0?"absolute":"relative"}`):null].filter(Boolean)});function ne(r,n,o){return U.noRenderAsFormItemValueList.includes(r.valueType)?o:r.copyable||r.ellipsis?e.createVNode(Ce.default,{copyable:r.copyable,ellipsis:r.ellipsis?c.isBoolean(r.ellipsis)?{tooltip:o,rows:1}:{...r.ellipsis,tooltip:o}:!1,content:o},null):o}e.watch(()=>e.unref(m).loading,r=>{var n;(n=t.onLoadingChange)==null||n.call(t,r)}),e.watch(()=>t.dataSource,r=>{Y(r)},{immediate:!0});function ae(r){var n,o,a;(a=(o=(n=C.value)==null?void 0:n.apForm)==null?void 0:o.setFieldsValue)==null||a.call(o,r)}function le(r=!1){var o,a,u;const n=r?"getFieldsValueTransformed":"getFieldsValue";return(u=(a=(o=C.value)==null?void 0:o.apForm)==null?void 0:a[n])==null?void 0:u.call(a,!0)}function se(){return e.unref(d)}return $({submit:()=>P(),reset:()=>_(),refresh:()=>X(),setSearchFormValues:ae,getSearchFormValues:le,getShownColumns:se,dataSource:e.computed(()=>e.unref(m).records),rowSelection:{selectedRows:e.computed(()=>e.unref(b)),...h},scrollBar:{x:{getCurrentScroll:()=>{var r;return((r=i==null?void 0:i.value)==null?void 0:r.currentScroll)??0},scroll:r=>{var n,o;return(o=(n=i==null?void 0:i.value)==null?void 0:n.scroll)==null?void 0:o.call(n,r)}},y:void 0}}),(r,n)=>(e.openBlock(),e.createElementBlock("div",{ref_key:"tableWrapperRef",ref:B,class:e.normalizeClass(oe.value)},[e.unref(c.isUndefined)(r.dataSource)&&r.searchForm!==!1&&N.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(r.card?e.unref(w)("search-wrapper"):null),style:e.normalizeStyle(r.searchFormWrapperStyle)},[e.createVNode(e.unref(fe.ApForm).SearchForm,e.mergeProps(r.searchForm||{},{ref_key:"formRef",ref:C,"custom-reset":"","submit-loading":e.unref(V).loading,onSubmit:e.unref(P),onReset:e.unref(_)}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(N.value,o=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.renderNode.Comp),e.mergeProps({key:o.dataIndex,item:o,ref_for:!0},o.fieldProps||{},{span:o.span,"custom-render":o.renderNode.render}),null,16,["item","span","custom-render"]))),128))]),_:2},[g.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(r.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["submit-loading","onSubmit","onReset"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:M,class:e.normalizeClass([e.unref(w)("table-wrapper"),r.card?e.unref(w)("table-wrapper-card"):null]),style:e.normalizeStyle(r.tableWrapperStyle)},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(f)("header-wrapper"))},[r.settings?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(e.unref(f)("header"))},[e.createElementVNode("div",{class:e.normalizeClass(e.unref(k)("header","title"))},[e.renderSlot(r.$slots,"title",e.mergeProps({selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),g.title?(e.openBlock(),e.createBlock(e.unref(A.Divider),{key:0,type:"vertical"})):e.createCommentVNode("",!0),e.createVNode(Re.default,{config:r.settings===!0?{}:r.settings},null,8,["config"])],2)):e.renderSlot(r.$slots,"title",e.mergeProps({key:1,selectedRows:e.unref(b),selectedRowKeys:e.unref(S).selectedRowKeys,shownColumns:d.value},h))],2),e.createVNode(e.unref(A.Table),e.mergeProps({ref_key:"antdTableRef",ref:F,class:e.unref(f)("table")},E.value,{size:v.value,"table-layout":te.value,columns:d.value,onResizeColumn:n[0]||(n[0]=(o,a)=>a.width=o)}),e.createSlots({summary:e.withCtx(()=>[e.renderSlot(r.$slots,"summary",{columns:d.value,records:E.value.dataSource,selectedRows:e.unref(b)})]),_:2},[e.unref(q)?{name:"bottomPaginationTop",fn:e.withCtx(()=>{var o,a;return[e.createVNode(e.unref(xe.default),{ref_key:"scrollBarRef",ref:i,"scroll-container":(a=(o=F.value)==null?void 0:o.table)==null?void 0:a.scrollBodyRef,direction:"horizontal"},null,8,["scroll-container"])]}),key:"0"}:void 0,e.renderList(e.unref(c.omit)(g,["title","searchFormExtra","headerCell","summary"]),(o,a)=>({name:a,fn:e.withCtx(u=>[e.renderSlot(r.$slots,a,e.normalizeProps(e.guardReactiveProps(u||{})))])}))]),1040,["class","size","table-layout","columns"])],6)],2))}});exports.default=ke;

package/lib/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/lib/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/lib/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/lib/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/lib/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, {

package/lib/src/business/ap-table-modal/table-modal.vue.d.ts

@@ -2,8 +2,6 @@ import { OpenOptions, OpenReturnType, ApTableModalProps } from './interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, ShallowUnwrapRef, ComputedRef, Ref } from 'vue';
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
-import { UnwrapRefProps } from '../../utils';
-import { ScrollBarExpose } from '../../scroll-bar';
 type __VLS_Props = ApTableModalProps;
 declare const _default: DefineComponent<__VLS_Props, {
     open: <T>(selected?: any[], options?: OpenOptions) => Promise<OpenReturnType<T>>;
@@ -27,8 +25,11 @@ declare const _default: DefineComponent<__VLS_Props, {
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
         scrollBar: {
-            x: UnwrapRefProps<ScrollBarExpose>;
-            y: UnwrapRefProps<ScrollBarExpose>;
+            x: {
+                getCurrentScroll: () => number;
+                scroll: (percent: number) => void | undefined;
+            };
+            y: undefined;
         };
     } | null;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -72,7 +73,10 @@ declare const _default: DefineComponent<__VLS_Props, {
             selectedRows: ComputedRef<any[]>;
         };
         scrollBar: {
-            x: Ref< ScrollBarExpose | undefined, ScrollBarExpose | undefined>;
+            x: {
+                getCurrentScroll: () => 0 | Ref<number, number>;
+                scroll: (percent: number) => void | undefined;
+            };
             y: undefined;
         };
     }> | null;