@aplus-frontend/ui 0.4.22 → 0.4.23

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 R, renderList as Z, createBlock as ee, resolveDynamicComponent as Ie, renderSlot as v, 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 { noRenderAsFormItemValueList as re } 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 ae, 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";
@@ -16,8 +16,8 @@ import { useProvideApTable as Ze } from "./context.mjs";
 import "../scroll-bar/index.mjs";
 import { useStickyScroll as eo } from "./hooks/use-sticky-scroll.mjs";
 import { scrollbarSize as oo } from "../config-provider/css-var.mjs";
-import { useNamespace as ao } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as ro } from "../config-provider/hooks/use-global-config.mjs";
+import { useNamespace as ro } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as ao } from "../config-provider/hooks/use-global-config.mjs";
 import to from "./components/paragraph-ellipsis/index.vue2.mjs";
 import lo from "./components/setting/modal/index.vue2.mjs";
 import no from "../scroll-bar/index.vue.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"), {
+    } = ro("ap-table"), O = ao("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, a, r;
+      return E++, ((r = (a = (e = o.columns) == null ? void 0 : e.filter((t) => !t.hideInSearch && t.dataIndex && (t.valueType || t.customRenderFormItem) && !re.includes(t.valueType))) == null ? void 0 : a.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 : r.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 r, 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 a = await ((r = o.request) == null ? void 0 : r.call(o, e));
+        return (t = o.onLoad) == null || t.call(o, (a == null ? void 0 : a.data) || []), {
+          data: (a == null ? void 0 : a.data) || [],
+          total: (a == null ? void 0 : a.total) || 0
         };
       },
       filterFields: pe,
@@ -238,57 +238,57 @@ const No = /* @__PURE__ */ ze({
       formatParams: o.beforeSearchSubmit,
       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) => ({
+      var r;
+      let e = ((r = o.columns) == null ? void 0 : r.filter((t) => !t.hideInTable)) || [];
+      function a(t, d) {
+        return t.map((n) => ({
           resizable: Ye(n.resizable) ? n.resizable : o.columnResizable,
-          ...re(He(n), ["ellipsis"]),
+          ...ae(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 = ve(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: a(n.children || [], d || n)
         }));
       }
-      return l(e);
+      return a(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 a, r;
+      if (o.adaptive && (b.total > 0 || ((a = o.dataSource) == null ? void 0 : a.length)))
         return {
-          y: t(ie),
-          x: ((a = o.scroll) == null ? void 0 : a.x) || "100%"
+          y: l(ie),
+          x: ((r = o.scroll) == null ? void 0 : r.x) || "100%"
         };
       if (o.scroll)
         return o.scroll;
@@ -296,159 +296,168 @@ 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((a) => a.ellipsis))
         return "fixed";
     }), H = s(() => {
-      var a;
-      const e = t(_), l = t(v);
+      var r;
+      const e = l(_), a = l(T);
       return {
         ...o,
         ...e,
-        rowSelection: o.rowSelection === !0 || ((a = o.rowSelection) == null ? void 0 : a.mode) === "internal" ? {
-          ...l,
+        rowSelection: o.rowSelection === !0 || ((r = o.rowSelection) == null ? void 0 : r.mode) === "internal" ? {
+          ...a,
           // tips 如果是前端分页，则默认会走缓存
-          preserveSelectedRowKeys: y(o.dataSource) ? l.preserveSelectedRowKeys : !0
+          preserveSelectedRowKeys: g(o.dataSource) ? a.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, {
+    }), Re = s(() => [c(), o.card ? null : c("wrapper"), o.adaptive ? c("adaptive") : null, A ? ue(`sticky-${oo === 0 ? "absolute" : "relative"}`) : null].filter(Boolean));
+    function ve(e, a, r) {
+      return re.includes(e.valueType) ? r : e.copyable || e.ellipsis ? p(to, {
         copyable: e.copyable,
         ellipsis: e.ellipsis ? $e(e.ellipsis) ? {
-          tooltip: a,
+          tooltip: r,
           rows: 1
         } : {
           ...e.ellipsis,
-          tooltip: a
+          tooltip: r
         } : !1,
-        content: a
-      }, null) : a;
+        content: r
+      }, null) : r;
     }
-    Q(() => t(g).loading, (e) => {
-      var l;
-      (l = o.onLoadingChange) == null || l.call(o, e);
+    Q(() => l(b).loading, (e) => {
+      var a;
+      (a = o.onLoadingChange) == null || a.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 a, r, t;
+      (t = (r = (a = P.value) == null ? void 0 : a.apForm) == null ? void 0 : r.setFieldsValue) == null || t.call(r, 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 r, t, d;
+      const a = e ? "getFieldsValueTransformed" : "getFieldsValue";
+      return (d = (t = (r = P.value) == null ? void 0 : r.apForm) == null ? void 0 : t[a]) == 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 a, r;
+            return (r = (a = i == null ? void 0 : i.value) == null ? void 0 : a.scroll) == null ? void 0 : r.call(a, e);
+          }
+        },
         y: void 0
       }
-    }), (e, l) => (p(), F("div", {
+    }), (e, a) => (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(Re.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({
-        key: a.dataIndex,
-        item: a,
+      default: R(() => [(m(!0), k(J, null, Z($.value, (r) => (m(), ee(Ie(r.renderNode.Comp), w({
+        key: r.dataIndex,
+        item: r,
         ref_for: !0
-      }, a.fieldProps || {}, {
-        span: a.span,
-        "custom-render": a.renderNode.render
+      }, r.fieldProps || {}, {
+        span: r.span,
+        "custom-render": r.renderNode.render
       }), null, 16, ["item", "span", "custom-render"]))), 128))]),
       _: 2
     }, [C.searchFormExtra ? {
       name: "extra",
-      fn: w(() => [R(e.$slots, "searchFormExtra")]),
+      fn: R(() => [v(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"))
+    }, [v(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)) : v(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: a[0] || (a[0] = (r, t) => t.width = r)
     }), Y({
-      summary: w(() => [R(e.$slots, "summary", {
+      summary: R(() => [v(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: R(() => {
+        var r, 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 = (r = V.value) == null ? void 0 : r.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(ae)(C, ["title", "searchFormExtra", "headerCell", "summary"]), (r, t) => ({
+      name: t,
+      fn: R((d) => [v(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, {

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/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/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"),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"),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=Ce.useGlobalConfig("valueTypeMap"),{height:H,contentRef:M}=me.default(),B=e.ref(),F=e.ref(),{isStickyMode:q,scrollBarRef:i}=be.useStickyScroll(B),C=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(()=>C.value),updateColumns(r){d.value=r},updateSize(r){C.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:v,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(()=>[f(),t.card?null:f("wrapper"),t.adaptive?f("adaptive"):null,q?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(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(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=v.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=v.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:v,"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:C.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;

package/lib/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/lib/src/business/hooks/useTableRefresh.js

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

package/lib/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.4.22",
+  "version": "0.4.23",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -65,8 +65,8 @@
     "sortablejs": "^1.15.2",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuedraggable": "^4.1.0",
-    "@aplus-frontend/utils": "1.0.50",
-    "@aplus-frontend/hooks": "1.0.7"
+    "@aplus-frontend/hooks": "1.0.7",
+    "@aplus-frontend/utils": "1.0.50"
   },
   "peerDependencies": {
     "@aplus-frontend/antdv": "^1.0.12",