From 1a22a519ca7edc208dbc02c15fe1bb7127ba9568 Mon Sep 17 00:00:00 2001 From: Jinke Li Date: Mon, 13 May 2024 10:04:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=F0=9F=A4=96=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=20changelog=20=E6=96=87=E4=BB=B6=20(#2713)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-core/CHANGELOG.md | 8 ++++++++ packages/s2-core/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/s2-core/CHANGELOG.md b/packages/s2-core/CHANGELOG.md index 905c2ce3fd..a3077af223 100644 --- a/packages/s2-core/CHANGELOG.md +++ b/packages/s2-core/CHANGELOG.md @@ -1,3 +1,11 @@ +# [@antv/s2-v1.55.4](https://github.com/antvis/S2/compare/@antv/s2-v1.55.3...@antv/s2-v1.55.4) (2024-05-11) + + +### Bug Fixes + +* 修复无汇总数据时前端计算汇总值缺少聚合方式导致排序失效的问题 ([#2711](https://github.com/antvis/S2/issues/2711)) ([ab53003](https://github.com/antvis/S2/commit/ab53003456cdaca5935cea2bac4b3b78c1bce855)) +* 修复明细表含有空数据占位符时排序错误 close [#2707](https://github.com/antvis/S2/issues/2707) ([#2708](https://github.com/antvis/S2/issues/2708)) ([8174c38](https://github.com/antvis/S2/commit/8174c38c6a6b10d6e6564eef2365d0f39a5da909)) + # [@antv/s2-v1.55.3](https://github.com/antvis/S2/compare/@antv/s2-v1.55.2...@antv/s2-v1.55.3) (2024-04-30) diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json index 94166d74e2..3532f4356d 100644 --- a/packages/s2-core/package.json +++ b/packages/s2-core/package.json @@ -1,7 +1,7 @@ { "private": false, "name": "@antv/s2", - "version": "1.55.3", + "version": "1.55.4", "main": "lib/index.js", "unpkg": "dist/index.min.js", "jsdelivr": "dist/index.min.js", From 827462b2b1af8c0650734d6c74ac73087e56c7f8 Mon Sep 17 00:00:00 2001 From: Wenjun Xu <906626481@qq.com> Date: Thu, 23 May 2024 17:47:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=9C=A8=20resize=20=E6=97=B6?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=20preventDefault=20=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9=20chrome=20125=20=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84=E5=A4=84=E7=90=86=20(#2739)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-core/src/interaction/row-column-resize.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/s2-core/src/interaction/row-column-resize.ts b/packages/s2-core/src/interaction/row-column-resize.ts index c0cedae59a..a249b8394d 100644 --- a/packages/s2-core/src/interaction/row-column-resize.ts +++ b/packages/s2-core/src/interaction/row-column-resize.ts @@ -155,6 +155,8 @@ export class RowColumnResize extends BaseEvent implements BaseEventImplement { private bindMouseDown() { this.spreadsheet.on(S2Event.LAYOUT_RESIZE_MOUSE_DOWN, (event) => { + event?.preventDefault?.(); + const shape = event.target as IGroup; const originalEvent = event.originalEvent as MouseEvent; const resizeInfo = this.getCellAppendInfo(event.target);