Merge branch 'next' into fix-custom-header

antvis · Oct 25, 2024 · 7f74920 · 7f74920
2 parents ced4d5c + de4ec94
commit 7f74920
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 10 deletions.
diff --git a/packages/s2-core/CHANGELOG.md b/packages/s2-core/CHANGELOG.md
@@ -1,3 +1,20 @@
+# [@antv/s2-v2.0.0-next.30](https://github.com/antvis/S2/compare/@antv/s2-v2.0.0-next.29...@antv/s2-v2.0.0-next.30) (2024-10-25)
+
+
+### Bug Fixes
+
+* **type:** 修复 g renderer 的错误类型定义 ([#2939](https://github.com/antvis/S2/issues/2939)) ([523b2cc](https://github.com/antvis/S2/commit/523b2ccb8884933060000854f28d9a6d8b2806f5))
+* 修复字段标记 mapping 函数部分场景缺失第三个参数 & 调整参数类型 ([#2927](https://github.com/antvis/S2/issues/2927)) ([676c1f6](https://github.com/antvis/S2/commit/676c1f68101a9191b48d23ce1ec15f852bcebc5d))
+* 修复数值单元格 tooltip 内的指标名展示错误 ([#2941](https://github.com/antvis/S2/issues/2941)) ([a426a46](https://github.com/antvis/S2/commit/a426a468d8cc1fe7ec0fd1db0e04938884ec0f46))
+* 修复父容器存在 transform 时, 在 canvas 内点击也会重置交互的问题 close [#2879](https://github.com/antvis/S2/issues/2879) ([#2942](https://github.com/antvis/S2/issues/2942)) ([010ed05](https://github.com/antvis/S2/commit/010ed050214568ea1902e4a426d6638afd3ae2f9))
+* 修复自定义计算总计时, 复制的数据不正确 close [#2928](https://github.com/antvis/S2/issues/2928) ([#2937](https://github.com/antvis/S2/issues/2937)) ([f82de36](https://github.com/antvis/S2/commit/f82de36d6bb92a2ae51577dbc40e16ced0b1792c))
+* 增加单元格单双击的判断范围 ([#2924](https://github.com/antvis/S2/issues/2924)) ([c40bbf9](https://github.com/antvis/S2/commit/c40bbf9a4bf29459a0cb6ac32e3a7c52068c4eb1))
+
+
+### Features
+
+* 优化 ViewMeta 类型定义和相关文档 ([#2935](https://github.com/antvis/S2/issues/2935)) ([55b6f55](https://github.com/antvis/S2/commit/55b6f551148672c1edd6442632ff9ffddc83aa72))
+
 # [@antv/s2-v2.0.0-next.29](https://github.com/antvis/S2/compare/@antv/s2-v2.0.0-next.28...@antv/s2-v2.0.0-next.29) (2024-10-12)
 
 

diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/s2",
-  "version": "2.0.0-next.29",
+  "version": "2.0.0-next.30",
   "private": false,
   "description": "effective spreadsheet render core lib",
   "keywords": [

diff --git a/packages/s2-core/src/interaction/event-controller.ts b/packages/s2-core/src/interaction/event-controller.ts
@@ -245,6 +245,11 @@ export class EventController {
         return false;
       }
 
+      // 开启 CSS transform 时, 降级处理, 不做 canvas 内的空白检测: https://github.com/antvis/S2/issues/2879
+      if (this.spreadsheet.container.getConfig().supportsCSSTransform) {
+        return canvas.contains(event.target as HTMLElement);
+      }
+
       return this.isMatchElement(event) && this.isMatchPoint(event);
     }
 

diff --git a/packages/s2-react/CHANGELOG.md b/packages/s2-react/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [@antv/s2-react-v2.0.0-next.29](https://github.com/antvis/S2/compare/@antv/s2-react-v2.0.0-next.28...@antv/s2-react-v2.0.0-next.29) (2024-10-25)
+
+
+### Bug Fixes
+
+* **type:** 修复 g renderer 的错误类型定义 ([#2939](https://github.com/antvis/S2/issues/2939)) ([523b2cc](https://github.com/antvis/S2/commit/523b2ccb8884933060000854f28d9a6d8b2806f5))
+* 修复下钻 icon 不应该默认全部展示和标题样式问题 ([#2925](https://github.com/antvis/S2/issues/2925)) ([55f1a40](https://github.com/antvis/S2/commit/55f1a40b85a5b8c03182f08accb856f56defc82c))
+* 修复排序菜单没有子节点时图标展示错误 & 调整默认样式 ([#2932](https://github.com/antvis/S2/issues/2932)) ([da5ebfb](https://github.com/antvis/S2/commit/da5ebfb9049eb33180dbc9c556480cd105acbe60))
+* 修复父容器存在 transform 时, 在 canvas 内点击也会重置交互的问题 close [#2879](https://github.com/antvis/S2/issues/2879) ([#2942](https://github.com/antvis/S2/issues/2942)) ([010ed05](https://github.com/antvis/S2/commit/010ed050214568ea1902e4a426d6638afd3ae2f9))
+* 修复通过修改引用的方式修改菜单配置时, tooltip 未重新渲染 ([#2933](https://github.com/antvis/S2/issues/2933)) ([82c1500](https://github.com/antvis/S2/commit/82c15002bd12b5c21cfae581711abf51553d8000))
+* 增加单元格单双击的判断范围 ([#2924](https://github.com/antvis/S2/issues/2924)) ([c40bbf9](https://github.com/antvis/S2/commit/c40bbf9a4bf29459a0cb6ac32e3a7c52068c4eb1))
+
 # [@antv/s2-react-v2.0.0-next.28](https://github.com/antvis/S2/compare/@antv/s2-react-v2.0.0-next.27...@antv/s2-react-v2.0.0-next.28) (2024-10-12)
 
 

diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/s2-react",
-  "version": "2.0.0-next.28",
+  "version": "2.0.0-next.29",
   "private": false,
   "description": "use S2 with react",
   "keywords": [

diff --git a/packages/s2-react/playground/config.tsx b/packages/s2-react/playground/config.tsx
@@ -346,7 +346,7 @@ export const s2Options: SheetComponentOptions = {
   },
   transformCanvasConfig() {
     return {
-      supportsCSSTransform: true,
+      supportsCSSTransform: false,
       supportsPointerEvents: false,
       // dblClickSpeed: 500,
       // devicePixelRatio: 3,

diff --git a/s2-site/docs/common/mini-chart.zh.md b/s2-site/docs/common/mini-chart.zh.md
@@ -13,7 +13,7 @@ order: 6
 | --- | ---- | --- | ---- | ------ |
 | type  | mini 图类型 | `line \| bar` |    ✓   |    |
 | encode  | 编码方式，声明 x 位置通道或 y 位置通道绑定的对应的列数据| `{x: string; y: string}` |  ✓   |    |
-| data  | 原始数据  | [Data[]](#data) |    |   ✓   |
+| data  | 原始数据  | [Data[]](#data) |    ✓   |    |
 | [key: string]  | 其他透传字段，用于自定义单元格的定制化展示   | `unknown` |   |  |
 
 #### BulletValue

diff --git a/s2-site/docs/manual/basic/tooltip.en.md b/s2-site/docs/manual/basic/tooltip.en.md
@@ -519,9 +519,7 @@ content </div>
 </p>
 </template>
 
-< script
-lang = "ts"
-setup >
+<script lang="ts">
 import { defineComponent } from 'vue';
 
 export default defineComponent({

diff --git a/s2-site/docs/manual/basic/tooltip.zh.md b/s2-site/docs/manual/basic/tooltip.zh.md
@@ -594,9 +594,7 @@ const onRowCellHover = ({ event, viewMeta }) => {
   <p>当前值：{{ meta?.label ?? meta?.fieldValue}} </p>
 </template>
 
-< script
-lang = "ts"
-setup >
+<script lang="ts">
 import { defineComponent } from 'vue';
 
 export default defineComponent({