From 001573f2dedbf069c996deb1579bcc9525f5efa8 Mon Sep 17 00:00:00 2001
From: Jinke Li <a1231236677287@163.com>
Date: Fri, 13 Dec 2024 10:01:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=8C=E5=A4=B4?=
 =?UTF-8?q?=E5=9C=88=E9=80=89=E5=A4=8D=E5=88=B6=E6=97=B6=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=8B=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=20close=20#2975=20(#3029)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修复行头圈选复制时部分场景下数据重复 close #2975

* chore: 还原
---
 .../brush-selection/base-brush-selection.ts         |  7 +++++--
 s2-site/docs/manual/migration-v2.zh.md              | 13 +++++++++++++
 s2-site/examples/basic/pivot/demo/grid.ts           | 10 +++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/s2-core/src/interaction/brush-selection/base-brush-selection.ts b/packages/s2-core/src/interaction/brush-selection/base-brush-selection.ts
index c90f19f0bf..fb70510a8e 100644
--- a/packages/s2-core/src/interaction/brush-selection/base-brush-selection.ts
+++ b/packages/s2-core/src/interaction/brush-selection/base-brush-selection.ts
@@ -158,8 +158,11 @@ export class BaseBrushSelection
 
     let newX = this.endBrushPoint?.x + x;
     let newY = this.endBrushPoint?.y + y;
-    let needScrollForX = true;
-    let needScrollForY = true;
+    // 有滚动条才需要滚动
+    let needScrollForX = isRowHeader
+      ? !!facet.hRowScrollBar
+      : !!facet.hScrollBar;
+    let needScrollForY = !!facet.vScrollBar;
     const vScrollBarWidth = facet.vScrollBar?.getBBox()?.width;
     // 额外加缩进，保证 getShape 在 panelBox 内
     const extraPixel = 2;
diff --git a/s2-site/docs/manual/migration-v2.zh.md b/s2-site/docs/manual/migration-v2.zh.md
index 8c4a327f44..167b224adc 100644
--- a/s2-site/docs/manual/migration-v2.zh.md
+++ b/s2-site/docs/manual/migration-v2.zh.md
@@ -1016,6 +1016,19 @@ splitLine: {
 }
 ```
 
+#### 自定义 hook 变更
+
+1. 原 `layoutDataPosition` 废弃，新增 `layoutCellMeta` 用于自定义单元格元数据。
+
+```diff
+const s2Options = {
+-  layoutDataPosition: (s2, getCellData) => {}
++  layoutCellMeta: (cellMeta) => {}
+}
+```
+
+具体请查看 [自定义单元格元数据](/examples/custom/custom-layout/#custom-layout-cell-meta) 相关示例。
+
 ### 组件层 (s2-react) <Badge>@antv/s2-react</Badge>
 
 #### 移除 Ant Design 组件库依赖
diff --git a/s2-site/examples/basic/pivot/demo/grid.ts b/s2-site/examples/basic/pivot/demo/grid.ts
index 78c599dcbf..d01777f692 100644
--- a/s2-site/examples/basic/pivot/demo/grid.ts
+++ b/s2-site/examples/basic/pivot/demo/grid.ts
@@ -43,10 +43,14 @@ fetch(
       width: 600,
       height: 480,
       hierarchyType: 'grid',
+      // 数值挂行头时, 自定义角头虚拟数值字段文本, 默认 "数值"
+      cornerExtraFieldText: '自定义',
       interaction: {
-        copy: { enable: true },
-        withFormat: true,
-        withHeader: true,
+        copy: {
+          enable: true,
+          withFormat: true,
+          withHeader: true,
+        },
       },
       // 显示序号
       // seriesNumber: {