From 02c3bb830c880e267c5b84694dada8ca0297c531 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Thu, 25 Apr 2024 16:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/1188=E3=80=91BasicTable?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8AscrollToFirstRowOnChange=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/props.ts       | 4 +++-
 src/components/Table/src/types/table.ts | 6 ++++--
 src/settings/componentSetting.ts        | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/Table/src/props.ts b/src/components/Table/src/props.ts
index 3425c35..72984e9 100644
--- a/src/components/Table/src/props.ts
+++ b/src/components/Table/src/props.ts
@@ -128,7 +128,9 @@ export const basicProps = {
     type: Function as PropType<(record: TableCustomRecord<any>, index: number) => string>,
   },
   scroll: {
-    type: Object as PropType<{ x: number | true; y: number }>,
+    // update-begin--author:liaozhiyang---date:20240424---for：【issues/1188】BasicTable加上scrollToFirstRowOnChange类型定义
+    type: Object as PropType<{ x?: number | true; y?: number; scrollToFirstRowOnChange?: boolean }>,
+    // update-end--author:liaozhiyang---date:20240424---for：【issues/1188】BasicTable加上scrollToFirstRowOnChange类型定义
     default: null,
   },
   beforeEditSubmit: {
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index c3a463d..585621b 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -152,6 +152,7 @@ export interface BasicTableProps<T = any> {
   inset?: boolean;
   // 显示表格设置
   showTableSetting?: boolean;
+  // 表格上方操作按钮设置
   tableSetting?: TableSetting;
   // 斑马纹
   striped?: boolean;
@@ -205,7 +206,6 @@ export interface BasicTableProps<T = any> {
   canResize?: boolean;
   // 自适应高度偏移， 计算结果-偏移量
   resizeHeightOffset?: number;
-
   // 在分页改变的时候清空选项
   clearSelectOnPageChange?: boolean;
   //
@@ -319,7 +319,9 @@ export interface BasicTableProps<T = any> {
    * you need to add style .ant-table td { white-space: nowrap; }.
    * @type object
    */
-  scroll?: { x?: number | true | 'max-content'; y?: number };
+  // update-begin--author:liaozhiyang---date:20240424---for：【issues/1188】BasicTable加上scrollToFirstRowOnChange类型定义
+  scroll?: { x?: number | true | 'max-content'; y?: number; scrollToFirstRowOnChange?: boolean };
+  // update-end--author:liaozhiyang---date:20240424---for：【issues/1188】BasicTable加上scrollToFirstRowOnChange类型定义
 
   /**
    * Whether to show table header
diff --git a/src/settings/componentSetting.ts b/src/settings/componentSetting.ts
index a396939..e33f342 100644
--- a/src/settings/componentSetting.ts
+++ b/src/settings/componentSetting.ts
@@ -47,6 +47,9 @@ export default {
     defaultFilterFn: (data: Partial<Recordable<string[]>>) => {
       return data;
     },
+    // update-begin--author:liaozhiyang---date:20240424---for：【issues/1188】BasicTable加上scrollToFirstRowOnChange类型定义
+    scrollToFirstRowOnChange: false,
+    // update-end--author:liaozhiyang---date:20240424---for：【issues/1188】BasicTable加上scrollToFirstRowOnChange类型定义
   },
   // 滚动组件配置
   scrollbar: {