-
- 
-
## 👬 Contributors
diff --git a/README.md b/README.md
index d636c4b73d..341116452c 100644
--- a/README.md
+++ b/README.md
@@ -64,8 +64,9 @@ S2 是 AntV 在多维交叉分析表格领域的解决方案，完全基于数
## 📦 安装
```bash
-$ npm install @antv/s2
-# yarn add @antv/s2
+$ npm install @antv/s2 --save
+# yarn add @antv/s2 --save
+# pnpm install @antv/s2 --save
```
## 🔨 使用
@@ -73,7 +74,7 @@ $ npm install @antv/s2
### 1. 数据准备
-
-
-
## 👬 Contributors
diff --git a/packages/s2-core/CHANGELOG.md b/packages/s2-core/CHANGELOG.md
index 8e9027b7d8..a2a3ec4035 100644
--- a/packages/s2-core/CHANGELOG.md
+++ b/packages/s2-core/CHANGELOG.md
@@ -1,3 +1,13 @@
+# [@antv/s2-v1.51.2](https://github.com/antvis/S2/compare/@antv/s2-v1.51.1...@antv/s2-v1.51.2) (2023-10-27)
+
+
+### Bug Fixes
+
+* **interaction:** 修复拖动水平滚动条后单元格选中状态被重置 close [#2376](https://github.com/antvis/S2/issues/2376) ([#2380](https://github.com/antvis/S2/issues/2380)) ([b2e9700](https://github.com/antvis/S2/commit/b2e97008122f5320342fd069a08f6e821a5c9ad6))
+* **layout:** 修复在紧凑模式列头宽度未按文本自适应 close [#2385](https://github.com/antvis/S2/issues/2385) ([#2392](https://github.com/antvis/S2/issues/2392)) ([2edd99c](https://github.com/antvis/S2/commit/2edd99c367116bad661a02893a303311787eb647))
+* 修复分组汇总时，按汇总排序获取排序数据为空 ([#2370](https://github.com/antvis/S2/issues/2370)) ([2443762](https://github.com/antvis/S2/commit/24437622e1b259288bf7f8f3505837088a6e1b9d))
+* 修复树状角头，当有存在icon时，内容与box宽度恰好相等，出现换行 close [#2389](https://github.com/antvis/S2/issues/2389) ([#2390](https://github.com/antvis/S2/issues/2390)) ([19497b3](https://github.com/antvis/S2/commit/19497b34aaa9bd19ca5f410926f3035f1aa76d09))
+
# [@antv/s2-v1.51.1](https://github.com/antvis/S2/compare/@antv/s2-v1.51.0...@antv/s2-v1.51.1) (2023-10-13)
diff --git a/packages/s2-core/__tests__/bugs/issue-2385-spec.ts b/packages/s2-core/__tests__/bugs/issue-2385-spec.ts
new file mode 100644
index 0000000000..4e3e56430a
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/issue-2385-spec.ts
@@ -0,0 +1,57 @@
+/**
+ * @description spec for issue #2385
+ * https://github.com/antvis/S2/issues/2385
+ */
+import { createPivotSheet, getContainer } from '../util/helpers';
+import * as mockDataConfig from '../data/data-issue-2385.json';
+import type { S2Options } from '../../src';
+import { PivotSheet, TableSheet } from '@/sheet-type';
+
+const s2Options: S2Options = {
+ width: 800,
+ height: 600,
+ style: {
+ cellCfg: {
+ width: 200,
+ },
+ layoutWidthType: 'compact',
+ },
+};
+
+describe('Compare Layout Tests', () => {
+ test('should get max col width for pivot sheet', () => {
+ const s2 = new PivotSheet(getContainer(), mockDataConfig, s2Options);
+ s2.setTheme({
+ dataCell: {
+ text: {
+ fontSize: 20,
+ },
+ },
+ });
+ s2.render();
+
+ const colLeafNodes = s2.facet.layoutResult.colLeafNodes;
+ expect(Math.floor(colLeafNodes[0].width)).toBeCloseTo(179);
+ expect(Math.floor(colLeafNodes[1].width)).toEqual(98);
+ });
+
+ test('should get max col width for table sheet', () => {
+ const s2 = new TableSheet(getContainer(), mockDataConfig, s2Options);
+ s2.setDataCfg({
+ fields: {
+ columns: ['price'],
+ },
+ });
+ s2.setTheme({
+ dataCell: {
+ text: {
+ fontSize: 20,
+ },
+ },
+ });
+ s2.render();
+
+ const colLeafNodes = s2.facet.layoutResult.colLeafNodes;
+ expect(Math.floor(colLeafNodes[0].width)).toBeCloseTo(165);
+ });
+});
diff --git a/packages/s2-core/__tests__/data/data-issue-2385.json b/packages/s2-core/__tests__/data/data-issue-2385.json
new file mode 100644
index 0000000000..c8ad719d5c
--- /dev/null
+++ b/packages/s2-core/__tests__/data/data-issue-2385.json
@@ -0,0 +1,272 @@
+{
+ "data": [
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "笔",
+ "price": "11111111"
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "纸张",
+ "price": "2"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "笔",
+ "price": "2"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "纸张",
+ "price": "133.333"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "笔",
+ "price": "3"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "纸张",
+ "price": "2"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "笔",
+ "price": "4"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "纸张",
+ "price": "1"
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "笔",
+ "price": "11111111111111111"
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "纸张",
+ "price": "2"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "笔",
+ "price": "2"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "纸张",
+ "price": "666.333"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "笔",
+ "price": "3"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "纸张",
+ "price": "2"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "笔",
+ "price": "4"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "纸张",
+ "price": "1"
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "笔",
+ "cost": "33.333"
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "纸张",
+ "cost": "1.5"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "笔",
+ "cost": "1.5"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "纸张",
+ "cost": "0.2"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "笔",
+ "cost": "2"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "纸张",
+ "cost": "1"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "笔",
+ "cost": "3"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "纸张",
+ "cost": "33.333"
+ },
+ {
+ "price": "15.5"
+ },
+ {
+ "province": "浙江",
+ "price": "5.5"
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "price": "3"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "price": "2.5"
+ },
+ {
+ "province": "吉林",
+ "price": "10"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "price": "5"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "price": "5"
+ },
+ {
+ "type": "笔",
+ "price": "10"
+ },
+ {
+ "type": "笔",
+ "province": "浙江",
+ "price": "3"
+ },
+ {
+ "type": "笔",
+ "province": "吉林",
+ "price": "7"
+ },
+ {
+ "type": "纸张",
+ "price": "5.5"
+ },
+ {
+ "type": "纸张",
+ "province": "浙江",
+ "price": "2.5"
+ },
+ {
+ "type": "纸张",
+ "province": "吉林",
+ "price": "3"
+ },
+ {
+ "cost": "10.2"
+ },
+ {
+ "province": "浙江",
+ "cost": "3.7"
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "cost": "2"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "cost": "1.7"
+ },
+ {
+ "province": "吉林",
+ "cost": "6.5"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "cost": "3"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "cost": "3.5"
+ },
+ {
+ "type": "笔",
+ "cost": "7"
+ },
+ {
+ "type": "笔",
+ "province": "浙江",
+ "cost": "2"
+ },
+ {
+ "type": "笔",
+ "province": "吉林",
+ "cost": "5"
+ },
+ {
+ "type": "纸张",
+ "cost": "3.2"
+ },
+ {
+ "type": "纸张",
+ "province": "浙江",
+ "cost": "1.7"
+ },
+ {
+ "type": "纸张",
+ "province": "吉林",
+ "cost": "1.5"
+ }
+ ],
+ "fields": {
+ "rows": ["province", "city"],
+ "columns": ["type"],
+ "values": ["price"],
+ "valueInCols": true
+ }
+}
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/corner-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/corner-spec.ts.snap
index b3dc716fbd..f3430d0399 100644
--- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/corner-spec.ts.snap
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/corner-spec.ts.snap
@@ -188,7 +188,7 @@ Array [
"rowIndex": undefined,
"seriesNumberWidth": 0,
"value": "province/city/数值",
- "width": 150,
+ "width": 151,
"x": 0,
"y": 0,
},
@@ -253,7 +253,7 @@ Array [
"rowIndex": undefined,
"seriesNumberWidth": 80,
"value": "province/city/数值",
- "width": 150,
+ "width": 151,
"x": 80,
"y": 0,
},
@@ -448,7 +448,7 @@ Array [
"rowIndex": undefined,
"seriesNumberWidth": 0,
"value": "province/city",
- "width": 122,
+ "width": 123,
"x": 0,
"y": 0,
},
@@ -513,7 +513,7 @@ Array [
"rowIndex": undefined,
"seriesNumberWidth": 80,
"value": "province/city",
- "width": 122,
+ "width": 123,
"x": 80,
"y": 0,
},
@@ -708,7 +708,7 @@ Array [
"rowIndex": undefined,
"seriesNumberWidth": 0,
"value": "province/city",
- "width": 122,
+ "width": 123,
"x": 0,
"y": 0,
},
@@ -773,7 +773,7 @@ Array [
"rowIndex": undefined,
"seriesNumberWidth": 80,
"value": "province/city",
- "width": 122,
+ "width": 123,
"x": 80,
"y": 0,
},
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap
index f9b83c35d8..50d2c40be0 100644
--- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap
@@ -19,6 +19,7 @@ Object {
"cell": Object {
"backgroundColor": "#E0E9FD",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#CCDBFC",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -102,6 +103,7 @@ Object {
"cell": Object {
"backgroundColor": "#E0E9FD",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#CCDBFC",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -147,6 +149,7 @@ Object {
"cell": Object {
"backgroundColor": "#FFFFFF",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"crossBackgroundColor": "#F5F8FE",
"horizontalBorderColor": "#E0E9FD",
"horizontalBorderColorOpacity": 1,
@@ -273,6 +276,7 @@ Object {
"cell": Object {
"backgroundColor": "#FFFFFF",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"crossBackgroundColor": "#F5F8FE",
"horizontalBorderColor": "#E0E9FD",
"horizontalBorderColorOpacity": 1,
@@ -420,6 +424,7 @@ Object {
"cell": Object {
"backgroundColor": "#F5F8FE",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#E0E9FD",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -512,6 +517,7 @@ Object {
"trackColor": "rgba(0,0,0,0.01)",
},
"splitLine": Object {
+ "borderDash": Array [],
"horizontalBorderColor": "#326EF4",
"horizontalBorderColorOpacity": 0.2,
"horizontalBorderWidth": 2,
diff --git a/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts b/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts
index bf4fad922e..b634849f5a 100644
--- a/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts
@@ -1,7 +1,7 @@
/* eslint-disable jest/no-conditional-expect */
import * as mockDataConfig from 'tests/data/simple-data.json';
import { createMockCellInfo, getContainer, sleep } from 'tests/util/helpers';
-import { ScrollType } from '../../src/ui/scrollbar';
+import { ScrollBar, ScrollType } from '../../src/ui/scrollbar';
import type { CellScrollPosition } from './../../src/common/interface/scroll';
import { PivotSheet, SpreadSheet } from '@/sheet-type';
import type {
@@ -880,4 +880,52 @@ describe('Scroll Tests', () => {
expect(errorSpy).toBeCalledTimes(1);
});
+
+ // https://github.com/antvis/S2/issues/2376
+ test.each(['hScrollBar', 'hRowScrollBar'])(
+ 'should not reset interaction state after %s scrollbar thumb or track clicked',
+ (scrollbarName) => {
+ const containsMock = jest
+ .spyOn(HTMLElement.prototype, 'contains')
+ .mockImplementation(() => true);
+
+ const reset = jest.fn();
+
+ const scrollbar = s2.facet[scrollbarName] as ScrollBar;
+ const colCell = s2.getColumnLeafNodes()[0].belongsCell;
+
+ s2.on(S2Event.GLOBAL_RESET, reset);
+ s2.interaction.selectHeaderCell({
+ cell: colCell,
+ });
+
+ expect(s2.interaction.isSelectedState()).toBeTruthy();
+
+ const { maxX, maxY } = s2.facet?.panelBBox || {};
+ const { x, y } = canvas.getBoundingClientRect() || {};
+
+ // 滚动条
+ window.dispatchEvent(
+ new MouseEvent('click', {
+ clientX: x + scrollbar.position.x,
+ // 在滚动条内点击
+ clientY: y + scrollbar.position.y + scrollbar.theme.size - 2,
+ } as MouseEventInit),
+ );
+
+ // 滑动轨道
+ window.dispatchEvent(
+ new MouseEvent('click', {
+ // 右下角滑道点击
+ clientX: x + maxX - 2,
+ clientY: y + maxY + 2,
+ } as MouseEventInit),
+ );
+
+ expect(s2.interaction.isSelectedState()).toBeTruthy();
+ expect(reset).not.toHaveBeenCalled();
+
+ containsMock.mockReset();
+ },
+ );
});
diff --git a/packages/s2-core/__tests__/spreadsheet/spread-sheet-tree-mode-spec.ts b/packages/s2-core/__tests__/spreadsheet/spread-sheet-tree-mode-spec.ts
index 510c28565a..d7761e11b5 100644
--- a/packages/s2-core/__tests__/spreadsheet/spread-sheet-tree-mode-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/spread-sheet-tree-mode-spec.ts
@@ -26,7 +26,7 @@ describe('SpreadSheet Tree Mode Tests', () => {
s2.render();
const rowsHierarchyWidth = s2.facet.layoutResult.rowsHierarchy.width;
- expect(Math.round(rowsHierarchyWidth)).toEqual(123);
+ expect(Math.round(rowsHierarchyWidth)).toEqual(124);
// 行头维度均更改为较长的 name
const newDataCfg: S2DataConfig = {
@@ -49,5 +49,39 @@ describe('SpreadSheet Tree Mode Tests', () => {
rowsHierarchyWidth,
);
});
+
+ // https://github.com/antvis/S2/issues/2389
+ test('the corner should only have one line with action icon', () => {
+ // 行头维度更改为较长的 name
+ const newDataCfg: S2DataConfig = {
+ ...mockDataConfig,
+ meta: [
+ {
+ field: 'province',
+ name: '省1234567890份',
+ },
+ {
+ field: 'city',
+ name: '城1234567890市',
+ },
+ ],
+ };
+ // 添加icon
+ const newS2Options: S2Options = {
+ ...s2Options,
+ headerActionIcons: [
+ {
+ iconNames: ['SortDownSelected'],
+ belongsCell: 'cornerCell',
+ },
+ ],
+ };
+ const s2 = new PivotSheet(container, newDataCfg, newS2Options);
+ s2.render();
+
+ // 检查文本是否只有一行
+ const textLen = s2.facet.cornerHeader.cfg.children[0].textShapes.length;
+ expect(textLen).toEqual(1);
+ });
});
});
diff --git a/packages/s2-core/__tests__/unit/facet/layout/col-node-width-spec.ts b/packages/s2-core/__tests__/unit/facet/layout/col-node-width-spec.ts
index 49217dcd9f..f31e370a9b 100644
--- a/packages/s2-core/__tests__/unit/facet/layout/col-node-width-spec.ts
+++ b/packages/s2-core/__tests__/unit/facet/layout/col-node-width-spec.ts
@@ -53,7 +53,7 @@ describe('Col width Test', () => {
});
s2.render();
const { colLeafNodes } = s2.facet.layoutResult;
- expect(Math.round(colLeafNodes[0].width)).toBe(339);
+ expect(Math.round(colLeafNodes[0].width)).toBe(338);
});
test('get correct width in layoutWidthType adaptive tree mode when enable seriesnumber', () => {
@@ -63,7 +63,7 @@ describe('Col width Test', () => {
});
s2.render();
const { colLeafNodes } = s2.facet.layoutResult;
- expect(Math.round(colLeafNodes[0].width)).toBe(299);
+ expect(Math.round(colLeafNodes[0].width)).toBe(298);
});
test('get correct width in layoutWidthType compact mode', () => {
diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json
index cbc465052a..3e28ed259f 100644
--- a/packages/s2-core/package.json
+++ b/packages/s2-core/package.json
@@ -1,7 +1,7 @@
{
"private": false,
"name": "@antv/s2",
- "version": "1.51.1",
+ "version": "1.51.2",
"main": "lib/index.js",
"unpkg": "dist/index.min.js",
"module": "esm/index.js",
diff --git a/packages/s2-core/src/cell/col-cell.ts b/packages/s2-core/src/cell/col-cell.ts
index bf73bd4095..fcab2334e3 100644
--- a/packages/s2-core/src/cell/col-cell.ts
+++ b/packages/s2-core/src/cell/col-cell.ts
@@ -460,6 +460,7 @@ export class ColCell extends HeaderCell {
horizontalBorderColor,
horizontalBorderWidth,
horizontalBorderColorOpacity,
+ borderDash,
} = this.theme.splitLine;
const lineX = this.isLastColumn() ? x + width - horizontalBorderWidth : x;
@@ -475,6 +476,7 @@ export class ColCell extends HeaderCell {
stroke: horizontalBorderColor,
lineWidth: horizontalBorderWidth,
strokeOpacity: horizontalBorderColorOpacity,
+ lineDash: borderDash,
},
);
}
diff --git a/packages/s2-core/src/common/interface/theme.ts b/packages/s2-core/src/common/interface/theme.ts
index acf8a63a0a..1eb86691f3 100644
--- a/packages/s2-core/src/common/interface/theme.ts
+++ b/packages/s2-core/src/common/interface/theme.ts
@@ -97,7 +97,9 @@ export interface TextAlignCfg {
textBaseline?: TextBaseline;
}
-export interface TextTheme extends TextAlignCfg {
+export interface TextTheme
+ extends TextAlignCfg,
+ Pick
-
-
-
diff --git a/s2-site/docs/common/contact-us.zh.md b/s2-site/docs/common/contact-us.zh.md
index 59ae6f1dba..6281d0dc71 100644
--- a/s2-site/docs/common/contact-us.zh.md
+++ b/s2-site/docs/common/contact-us.zh.md
@@ -7,7 +7,4 @@ order: 5
-
-
-
diff --git a/s2-site/docs/common/development.zh.md b/s2-site/docs/common/development.zh.md
index 7e5bee0bc2..88b9a3135d 100644
--- a/s2-site/docs/common/development.zh.md
+++ b/s2-site/docs/common/development.zh.md
@@ -1,4 +1,12 @@
-跃跃欲试想贡献？[查看贡献指南](https://s2.antv.antgroup.com/manual/contribution)
+跃跃欲试想贡献？[查看贡献指南](https://s2.antv.antgroup.com/manual/contribution) , 欢迎 [Pull Request](https://github.com/antvis/S2/pulls)，或给我们 [报告 Bug](https://github.com/antvis/S2/issues/new?assignees=&labels=&projects=&template=bug-report.md&title=%F0%9F%90%9B).
+
+> 强烈建议花一点你的宝贵时间阅读：
+
+- [《提 Issue 前必读》](https://github.com/antvis/S2/issues/1904)
+- [《如何向开源项目提交无法解答的问题》](https://zhuanlan.zhihu.com/p/25795393)
+- [《如何有效地报告 Bug》](https://www.chiark.greenend.org.uk/~sgtatham/bugs-cn.html)
+- [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way)
+- [《如何向开源社区提问题》](https://github.com/seajs/seajs/issues/545)
```bash
git clone git@github.com:antvis/S2.git
diff --git a/s2-site/docs/common/packages.zh.md b/s2-site/docs/common/packages.zh.md
index 3b0767f32b..01f71f584a 100644
--- a/s2-site/docs/common/packages.zh.md
+++ b/s2-site/docs/common/packages.zh.md
@@ -3,8 +3,23 @@ title: Packages
order: 5
---
+- `@antv/s2`: 基于 `Canvas` 和 [AntV/G](https://g.antv.vision/zh/docs/guide/introduce) 开发，提供基本的表格展示/交互等能力。
+- `@antv/s2-react`: 基于 `React` 和 `@antv/s2` 封装，提供配套的分析组件，配置项和 `@antv/s2` 通用。
+- `@antv/s2-vue`: 基于 `Vue3` 和 `@antv/s2` 封装，配置项和 `@antv/s2` 通用，如果你想在 `Vue2` 中使用，请使用 `@antv/s2`。
+
+也就是说 `@antv/s2` 和**框架无关**，你也可以在 `Vue`, `Angular` 等框架中直接使用。
+
| 版本号 | 稳定版 | 测试版 | 预览版 | 先行版 | 包大小 | 下载量 |
| -------- | ------ | --------- | ---------- | ---------- | ---------- | ------ |
| [@antv/s2](https://github.com/antvis/S2/tree/master/packages/s2-core) |  |  |  |  |  |  |
| [@antv/s2-react](https://github.com/antvis/S2/tree/master/packages/s2-react) |  |  |  | |  |  |
| [@antv/s2-vue](https://github.com/antvis/S2/tree/master/packages/s2-vue) |  |  |  |  |  |  |
+
+:::info{title='如何获取新版本发布通知？'}
+
+- 订阅：[https://github.com/antvis/S2/releases.atom](https://github.com/antvis/S2/releases.atom) 来获得新版本发布的通知。
+- 加入钉钉交流群，新版本发布后，会通过🤖 群机器人推送。
+- `Watch` [S2 代码仓库](https://github.com/antvis/S2), 选择 `Custom - Releases` 来获取消息推送。
+
+
+:::
diff --git a/s2-site/docs/common/style.zh.md b/s2-site/docs/common/style.zh.md
index c0709c5bbf..26b81349fd 100644
--- a/s2-site/docs/common/style.zh.md
+++ b/s2-site/docs/common/style.zh.md
@@ -9,7 +9,7 @@ object **必选**,_default：null_ 功能描述：样式设置
| 参数 | 类型 | 必选 | 默认值 | 功能描述 |
| --- | --- | --- | --- | --- |
-| layoutWidthType | `adaptive` \| `colAdaptive` \| `compact` | | | 单元格宽度布局类型+ S2 + 多维交叉分析表格是多维交叉分析领域的表格解决方案，数据驱动视图，提供底层核心库、基础组件库、业务场景库，具备自由扩展的能力，让开发者既能开箱即用，也能基于自身场景自由发挥。 +
+ +