fix(Table): improve page size change handling and ensure current page stays within bounds

Author: RSS1102

packages/components/pagination/pagination.tsx

@@ -183,34 +183,28 @@ export default defineComponent({
     };
 
     const onSelectorChange: (e: string) => void = (e) => {
-      if (props.disabled) {
-        return;
-      }
-      const pageSize: number = parseInt(e, 10);
-      let pageCount = 1;
-      if (pageSize > 0) {
-        pageCount = Math.max(Math.ceil(props.total / pageSize), 1);
-      }
+      if (props.disabled) return;
 
-      let isIndexChange = false;
+      const pageSize: number = parseInt(e, 10);
+      const newPageCount = pageSize > 0 ? Math.max(Math.ceil(props.total / pageSize), 1) : 1;
 
-      if (innerCurrent.value > pageCount) {
-        isIndexChange = true;
-      }
+      // 当前页在变更 pageSize 之后是否会超出新的页码范围
+      const prevCurrent = innerCurrent.value;
+      const willExceed = prevCurrent > newPageCount;
 
-      /**
-       * 分页大小变化事件
-       * @param {Number} pageSize 分页大小
-       * @param {Number} index 当前页
-       */
       const pageInfo = {
-        current: isIndexChange ? pageCount : innerCurrent.value,
-        previous: innerCurrent.value,
+        current: willExceed ? newPageCount : prevCurrent,
+        previous: prevCurrent,
         pageSize,
       };
+
+      // 先设置 pageSize（会触发 onPageSizeChange/onChange 等回调），让外部有机会同步受控 current
       setInnerPageSize(pageSize, pageInfo);
-      if (isIndexChange) {
-        toPage(pageCount, pageInfo);
+
+      if (willExceed) {
+        // 当前页超出新页码范围时，跳转到最后一页（保持原始同步行为），
+        // Table 层将优先使用外部受控的 pagination.current 来避免覆盖外部设置（方案 A）。
+        toPage(newPageCount, pageInfo);
       } else {
         props.onChange?.(pageInfo);
       }

packages/components/table/hooks/usePagination.tsx

@@ -1,4 +1,4 @@
-import { Ref, ref, SetupContext, toRefs, watch } from 'vue';
+import { Ref, ref, SetupContext, toRefs, watch, nextTick } from 'vue';
 import { useConfig } from '@tdesign/shared-hooks';
 import Pagination, { PageInfo, PaginationProps } from '../../pagination';
 import { TdBaseTableProps, TableRowData } from '../type';
@@ -72,20 +72,32 @@ export default function usePagination(
           size={props.size === 'large' ? null : props.size}
           {...paginationProps}
           onChange={(pageInfo: PageInfo) => {
+            // 先触发外部 pagination.onChange/onPageSizeChange 回调
             props.pagination?.onChange?.(pageInfo);
-            innerPagination.value = pageInfo;
-            updateDataSourceAndPaginate(pageInfo.current, pageInfo.pageSize);
-            props.onPageChange?.(pageInfo, dataSource.value);
 
-            // 当切换分页时，内容区域滚动到顶部
-            const ref = tableContentRef.value;
-            if (ref.scrollTo) {
-              ref.scrollTo({ top: 0, left: 0 });
-            } else {
-              // 兼容测试环境或旧浏览器
-              ref.scrollTop = 0;
-              ref.scrollLeft = 0;
-            }
+            // 延迟到下一个 tick 再读取受控的 pagination.value，这样如果外部在
+            // onPageSizeChange 中同步设置了 pagination.current（例如重置为 1），
+            // 我们可以优先使用外部受控值，避免竞态覆盖。
+            nextTick(() => {
+              const finalPageInfo = {
+                ...pageInfo,
+                current: pagination.value?.current ?? pageInfo.current,
+                pageSize: pagination.value?.pageSize ?? pageInfo.pageSize,
+              };
+              innerPagination.value = finalPageInfo;
+              updateDataSourceAndPaginate(finalPageInfo.current, finalPageInfo.pageSize);
+              props.onPageChange?.(finalPageInfo, dataSource.value);
+
+              // 当切换分页时，内容区域滚动到顶部
+              const ref = tableContentRef.value;
+              if (ref.scrollTo) {
+                ref.scrollTo({ top: 0, left: 0 });
+              } else {
+                // 兼容测试环境或旧浏览器
+                ref.scrollTop = 0;
+                ref.scrollLeft = 0;
+              }
+            });
           }}
           v-slots={{ totalContent: context.slots.totalContent }}
         />