-
- 
-
## 👬 Contributors
diff --git a/README.md b/README.md
index 5b32f0d71a..1210bbc8bf 100644
--- a/README.md
+++ b/README.md
@@ -64,9 +64,9 @@ S2 是 AntV 在多维交叉分析表格领域的解决方案，完全基于数
## 📦 安装
```bash
-$ npm install @antv/s2
-# yarn add @antv/s2
-# pnpm install @antv/s2
+$ npm install @antv/s2 --save
+# yarn add @antv/s2 --save
+# pnpm install @antv/s2 --save
```
## 🔨 使用
@@ -223,9 +223,6 @@ pnpm site:start
-
-
-
## 👬 Contributors
diff --git a/package.json b/package.json
index 8fcdb05722..0b20ab3a44 100644
--- a/package.json
+++ b/package.json
@@ -97,6 +97,7 @@
"@rollup/plugin-typescript": "^11.1.5",
"@rushstack/eslint-patch": "^1.5.1",
"@semantic-release/changelog": "^6.0.3",
+ "@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@swc/core": "^1.3.95",
"@swc/jest": "^0.2.29",
@@ -164,7 +165,8 @@
"typescript": "^5.2.2",
"vite": "^4.5.0",
"vite-plugin-imp": "^2.4.0",
- "vue-jest": "^5.0.0-alpha.10"
+ "vue-jest": "^5.0.0-alpha.10",
+ "size-limit": "^11.0.0"
},
"license": "MIT",
"repository": {
diff --git a/packages/s2-core/CHANGELOG.md b/packages/s2-core/CHANGELOG.md
index ee669635bd..d2bec1e76c 100644
--- a/packages/s2-core/CHANGELOG.md
+++ b/packages/s2-core/CHANGELOG.md
@@ -1,22 +1,19 @@
# [@antv/s2-v2.0.0-next.10](https://github.com/antvis/S2/compare/@antv/s2-v2.0.0-next.9...@antv/s2-v2.0.0-next.10) (2023-12-12)
-
### Features
* 支持在单元格内渲染 G2 图表 ([#2437](https://github.com/antvis/S2/issues/2437)) ([497f941](https://github.com/antvis/S2/commit/497f9414b89fce01b60db9b6c2eb4292ffe69c1d))
# [@antv/s2-v2.0.0-next.9](https://github.com/antvis/S2/compare/@antv/s2-v2.0.0-next.8...@antv/s2-v2.0.0-next.9) (2023-11-22)
-
### Features
* headerActionIcons 支持细粒度配置 & 修复异步渲染导致无法获取实例的问题 ([#2301](https://github.com/antvis/S2/issues/2301)) ([b2d6f1f](https://github.com/antvis/S2/commit/b2d6f1fb04d3fa73129669fc7d2dec84943252db))
* **layout:** 单元格支持渲染多行文本 ([#2383](https://github.com/antvis/S2/issues/2383)) ([e3b919a](https://github.com/antvis/S2/commit/e3b919a4f37d600a0f516944edf4eed8b2c0174d))
* 支持 antd v5 ([#2413](https://github.com/antvis/S2/issues/2413)) ([299c7bf](https://github.com/antvis/S2/commit/299c7bfe2e86838153273c92dd6d2b72917cfdea))
-* 支持 React 18 (兼容 React 16/17) ([#2373](https://github.com/antvis/S2/issues/2373)) ([25ce9b0](https://github.com/antvis/S2/commit/25ce9b0ccc3e609d8add09b3209f6f981dc1dc4e))
+* 支持 React 18 （兼容 React 16/17) ([#2373](https://github.com/antvis/S2/issues/2373)) ([25ce9b0](https://github.com/antvis/S2/commit/25ce9b0ccc3e609d8add09b3209f6f981dc1dc4e))
* 支持自定义 G 5.0 插件和配置 ([#2423](https://github.com/antvis/S2/issues/2423)) ([cc6c47f](https://github.com/antvis/S2/commit/cc6c47fd0927125bbc378fe6914becfcbe1b0acd))
-
### BREAKING CHANGES
* 移除 devicePixelRatio 和 supportsCSSTransform
@@ -75,13 +72,13 @@
### Features
* 使用 requestIdleCallback 处理数据大量导出的情况 ([#2272](https://github.com/antvis/S2/issues/2272)) ([42a5551](https://github.com/antvis/S2/commit/42a55516dd369d9ab5579b52fbc9900b0ad81858))
-* 同步复制支持自定义transformer ([#2201](https://github.com/antvis/S2/issues/2201)) ([9003767](https://github.com/antvis/S2/commit/9003767d584248b9d122f299326fd14753961883))
+* 同步复制支持自定义 transformer ([#2201](https://github.com/antvis/S2/issues/2201)) ([9003767](https://github.com/antvis/S2/commit/9003767d584248b9d122f299326fd14753961883))
* 增加暗黑主题 ([#2130](https://github.com/antvis/S2/issues/2130)) ([51dbdcf](https://github.com/antvis/S2/commit/51dbdcf564b387a3fd1809a71016f3a91eebde38))
* 完善复制和导出在格式化后，总计、小计对应数值没有格式化的问题 ([#2237](https://github.com/antvis/S2/issues/2237)) ([abc0dbb](https://github.com/antvis/S2/commit/abc0dbb1544d9a4ef133e6a2c7d2d09ac8f35b48))
* 文本和图标的条件格式支持主题配置 ([#2267](https://github.com/antvis/S2/issues/2267)) ([c332c68](https://github.com/antvis/S2/commit/c332c687dfb7be1d07b79b44934f78c1947cc466))
* 条件格式 mapping 增加第三个参数获取单元格实例 ([#2242](https://github.com/antvis/S2/issues/2242)) ([aae427d](https://github.com/antvis/S2/commit/aae427dfe6a87cae577ce2449fd6058d358971f9))
* 行列头兼容 condition icon 和 action icons ([#2161](https://github.com/antvis/S2/issues/2161)) ([1df4286](https://github.com/antvis/S2/commit/1df42860f6a12d3cb182ba7633c4984a04e62890))
-* 适配g5.0异步渲染 ([#2251](https://github.com/antvis/S2/issues/2251)) ([069d03d](https://github.com/antvis/S2/commit/069d03d299429c2ffab3e20d56ecd6bb30119ffd))
+* 适配 g5.0 异步渲染 ([#2251](https://github.com/antvis/S2/issues/2251)) ([069d03d](https://github.com/antvis/S2/commit/069d03d299429c2ffab3e20d56ecd6bb30119ffd))
# [@antv/s2-v2.0.0-next.7](https://github.com/antvis/S2/compare/@antv/s2-v2.0.0-next.6...@antv/s2-v2.0.0-next.7) (2023-04-28)
@@ -95,25 +92,25 @@
* **tooltip:** 修复特定配置下点击 tooltip 内容后 tooltip 关闭 close [#2170](https://github.com/antvis/S2/issues/2170) ([#2172](https://github.com/antvis/S2/issues/2172)) ([6219e57](https://github.com/antvis/S2/commit/6219e579364cfb7ac3a8b3db4ae01c5672d7f2d4))
* 修复 cornerText 配置对树状模式的适配 ([#2167](https://github.com/antvis/S2/issues/2167)) ([e9efcea](https://github.com/antvis/S2/commit/e9efcea944f5d0793d4a1250362e6b6f6b492c52))
* 修复总计小计 linkField 样式问题 ([#2169](https://github.com/antvis/S2/issues/2169)) ([4450278](https://github.com/antvis/S2/commit/4450278d82888c117e5bd9d31874b88ecdb33d99))
-* 修改DataCell类 drawLinkFieldShape 方法名为 drawLinkFieldShapeOwn ([d5e14b2](https://github.com/antvis/S2/commit/d5e14b25abba5bfaf74dddb17d9f5b44c74bc29b))
+* 修改 DataCell 类 drawLinkFieldShape 方法名为 drawLinkFieldShapeOwn ([d5e14b2](https://github.com/antvis/S2/commit/d5e14b25abba5bfaf74dddb17d9f5b44c74bc29b))
* 多指标行头总计节点宽度计算错误 ([#2165](https://github.com/antvis/S2/issues/2165)) ([08ef330](https://github.com/antvis/S2/commit/08ef330a02a1fbf11f49090f4fd7f5d2b0cc1093))
-* 微应用环境识别mouseEvent失效 ([bddbe34](https://github.com/antvis/S2/commit/bddbe34104355ac0087bc9f72377889a8f444d7a)), closes [#2162](https://github.com/antvis/S2/issues/2162)
+* 微应用环境识别 mouseEvent 失效 ([bddbe34](https://github.com/antvis/S2/commit/bddbe34104355ac0087bc9f72377889a8f444d7a)), closes [#2162](https://github.com/antvis/S2/issues/2162)
* 统一风格、删除冗余代码 ([7b4ef0e](https://github.com/antvis/S2/commit/7b4ef0edf72e059b427c54e6ea881c4c8e347aed))
* 行头过宽且不冻结时滚动条渲染错误 ([#2173](https://github.com/antvis/S2/issues/2173)) ([ab79ea0](https://github.com/antvis/S2/commit/ab79ea0664046bc6479a717d7b3b0ee7efe05b31))
-* 避免s2实例被污染 ([8c44a85](https://github.com/antvis/S2/commit/8c44a85a678eadaab3fb2a66b5b02a123f74c9bb))
+* 避免 s2 实例被污染 ([8c44a85](https://github.com/antvis/S2/commit/8c44a85a678eadaab3fb2a66b5b02a123f74c9bb))
### Features
-* icon支持更新name与fill ([#2138](https://github.com/antvis/S2/issues/2138)) ([d000aea](https://github.com/antvis/S2/commit/d000aeac332676cfa15d9986ec7f4be948c565d0))
+* icon 支持更新 name 与 fill ([#2138](https://github.com/antvis/S2/issues/2138)) ([d000aea](https://github.com/antvis/S2/commit/d000aeac332676cfa15d9986ec7f4be948c565d0))
* **interaction:** 点击角头后支持选中所对应那一列的行头 close [#2073](https://github.com/antvis/S2/issues/2073) ([#2081](https://github.com/antvis/S2/issues/2081)) ([ad2b5d8](https://github.com/antvis/S2/commit/ad2b5d87edf4c529d7c9a5e1348e893e14547ef3))
* **interaction:** 行头支持滚动刷选 ([#2087](https://github.com/antvis/S2/issues/2087)) ([65c3f3b](https://github.com/antvis/S2/commit/65c3f3b6a37709c0fa684b0f5717d3b349251e48))
-* 修改文档、添加用例演示、修改方法名drawLinkFieldShapLogic -> drawLinkField ([7f2bd69](https://github.com/antvis/S2/commit/7f2bd690bd703b8e4d678c03b9fc79db30848ca3))
+* 修改文档、添加用例演示、修改方法名 drawLinkFieldShapLogic -> drawLinkField ([7f2bd69](https://github.com/antvis/S2/commit/7f2bd690bd703b8e4d678c03b9fc79db30848ca3))
* 在 shape 中添加文本的原始值 ([#2109](https://github.com/antvis/S2/issues/2109)) ([4d81e72](https://github.com/antvis/S2/commit/4d81e72440d797fd7a06179794c342f009fc39c3))
-* 增加dataCell 下划线测试用例及demo ([a5efe17](https://github.com/antvis/S2/commit/a5efe17bda06cc8eba633cbea9c56ceb8b8c703e))
-* 增加自定义merged-cell ([534cc15](https://github.com/antvis/S2/commit/534cc15da9f766f95be3c622e65e45d8796ff020))
-* 复制支持自定义transformer ([#2090](https://github.com/antvis/S2/issues/2090)) ([250eecd](https://github.com/antvis/S2/commit/250eecd32ed4f48b95ed7c4e480fa3c75d4bb5d7))
+* 增加 dataCell 下划线测试用例及 demo ([a5efe17](https://github.com/antvis/S2/commit/a5efe17bda06cc8eba633cbea9c56ceb8b8c703e))
+* 增加自定义 merged-cell ([534cc15](https://github.com/antvis/S2/commit/534cc15da9f766f95be3c622e65e45d8796ff020))
+* 复制支持自定义 transformer ([#2090](https://github.com/antvis/S2/issues/2090)) ([250eecd](https://github.com/antvis/S2/commit/250eecd32ed4f48b95ed7c4e480fa3c75d4bb5d7))
* 提取跳转链接下划线 公共逻辑 到 BaseCell 类 ([34dbbb3](https://github.com/antvis/S2/commit/34dbbb3bdf028cb96508dcead724d9ac9bcc1ab9))
-* 数据单元格DataCell类中增加链接跳转渲染 ([bb5a964](https://github.com/antvis/S2/commit/bb5a964787a80843515b4d552adb3fdb59393e3d))
+* 数据单元格 DataCell 类中增加链接跳转渲染 ([bb5a964](https://github.com/antvis/S2/commit/bb5a964787a80843515b4d552adb3fdb59393e3d))
# [@antv/s2-v2.0.0-next.6](https://github.com/antvis/S2/compare/@antv/s2-v2.0.0-next.5...@antv/s2-v2.0.0-next.6) (2023-04-23)
@@ -300,7 +297,6 @@
### Bug Fixes
-* 下钻后 meta.childField 不正确 ([#1788](https://github.com/antvis/S2/issues/1788)) ([1c61dd4](https://github.com/antvis/S2/commit/1c61dd4081c9d3fed6f276b0546865914040b07a))
* 重构绘制盒模型，修复边框偏移问题 ([#1854](https://github.com/antvis/S2/issues/1854)) ([f7e0858](https://github.com/antvis/S2/commit/f7e0858a937ea557532a7fff948e9af3b6a1fdff))
# [@antv/s2-v1.35.0](https://github.com/antvis/S2/compare/@antv/s2-v1.34.1...@antv/s2-v1.35.0) (2022-11-21)
@@ -315,11 +311,11 @@
# [@antv/s2-v1.35.0](https://github.com/antvis/S2/compare/@antv/s2-v1.34.1...@antv/s2-v1.35.0) (2022-11-21)
-### Features
+=======
-* 明细表支持多级表头 ([#1921](https://github.com/antvis/S2/issues/1921)) ([47cdbdc](https://github.com/antvis/S2/commit/47cdbdccafbd7f19a05550a483a42aac11a93778)), closes [#1687](https://github.com/antvis/S2/issues/1687) [#1801](https://github.com/antvis/S2/issues/1801)
+# [@antv/s2-v1.35.1](https://github.com/antvis/S2/compare/@antv/s2-v1.35.0...@antv/s2-v1.35.1) (2022-11-28)
-# [@antv/s2-v1.34.1](https://github.com/antvis/S2/compare/@antv/s2-v1.34.0...@antv/s2-v1.34.1) (2022-11-18)
+### Bug Fixes
### Bug Fixes
@@ -487,11 +483,6 @@
* 复制支持 html 格式 ([#1647](https://github.com/antvis/S2/issues/1647)) ([3ea6349](https://github.com/antvis/S2/commit/3ea634970a162d869cf12dad7aa754bebafd30f3))
* 支持 resize 最右侧 column ([#1611](https://github.com/antvis/S2/issues/1611)) ([f63bfa2](https://github.com/antvis/S2/commit/f63bfa2a0e95c8c42c064d0e2e56ce9550ac50c6))
-# [@antv/s2-v1.24.0](https://github.com/antvis/S2/compare/@antv/s2-v1.23.0...@antv/s2-v1.24.0) (2022-07-22)
-
-### Bug Fixes
-
-* **layout:** 修复 Firefox 浏览器部分 icon 渲染失败 close [#1571](https://github.com/antvis/S2/issues/1571) ([#1599](https://github.com/antvis/S2/issues/1599)) ([6b76c4e](https://github.com/antvis/S2/commit/6b76c4e2c80b88eeb63d7adfc6b48da7d0b3ea4c))
* **strategysheet:** 修复单元格宽度拖拽变小后子弹图宽度计算错误 ([#1584](https://github.com/antvis/S2/issues/1584)) ([99b8593](https://github.com/antvis/S2/commit/99b859392c7151d5700bf1c505a02f795b9a3f80))
* **strategysheet:** 修复子弹图进度小于 1% 时显示错误的问题 ([#1563](https://github.com/antvis/S2/issues/1563)) ([936ca6a](https://github.com/antvis/S2/commit/936ca6a3a7bf40ddc0ff1a0271c3a5ffb1091dcf))
* **strategysheet:** 修复子弹图颜色显示错误 & 百分比精度问题 ([#1588](https://github.com/antvis/S2/issues/1588)) ([c4bb48c](https://github.com/antvis/S2/commit/c4bb48cbe128b47e3574af903142934fd7452846))
diff --git a/packages/s2-core/README.md b/packages/s2-core/README.md
index 80a489c909..c04f9fec8c 100644
--- a/packages/s2-core/README.md
+++ b/packages/s2-core/README.md
@@ -143,7 +143,7 @@ const s2DataConfig = {
```ts
const s2Options = {
width: 600,
- height: 600,
+ height: 600
}
```
@@ -219,9 +219,6 @@ pnpm site:start
-
-
-
## 👬 Contributors
diff --git a/packages/s2-core/__tests__/bugs/__snapshots__/issue-2359-spec.ts.snap b/packages/s2-core/__tests__/bugs/__snapshots__/issue-2359-spec.ts.snap
new file mode 100644
index 0000000000..076a151e3f
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/__snapshots__/issue-2359-spec.ts.snap
@@ -0,0 +1,67 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Table Sheet Custom Multiple Values Tests should use current cell text theme 1`] = `
+Array [
+ Array [
+ Object {
+ "fill": "#000000",
+ "fontSize": 12,
+ },
+ ],
+ Array [
+ Object {
+ "fill": "red",
+ "fontSize": 20,
+ },
+ Object {
+ "fill": "red",
+ "fontSize": 20,
+ },
+ Object {
+ "fill": "red",
+ "fontSize": 20,
+ },
+ ],
+]
+`;
+
+exports[`Table Sheet Custom Multiple Values Tests should use current cell text theme 2`] = `
+Array [
+ Array [
+ Object {
+ "fill": "#000000",
+ "fontSize": 12,
+ },
+ ],
+ Array [
+ Object {
+ "fill": "#000000",
+ "fontSize": 12,
+ },
+ ],
+ Array [
+ Object {
+ "fill": "#000000",
+ "fontSize": 12,
+ },
+ ],
+ Array [
+ Object {
+ "fill": "green",
+ "fontSize": 30,
+ },
+ ],
+ Array [
+ Object {
+ "fill": "green",
+ "fontSize": 30,
+ },
+ ],
+ Array [
+ Object {
+ "fill": "green",
+ "fontSize": 30,
+ },
+ ],
+]
+`;
diff --git a/packages/s2-core/__tests__/bugs/__snapshots__/issue-565-spec.ts.snap b/packages/s2-core/__tests__/bugs/__snapshots__/issue-565-spec.ts.snap
new file mode 100644
index 0000000000..72fd2fd2d2
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/__snapshots__/issue-565-spec.ts.snap
@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Export data in pivot tree mode should export correct col header in pivot tree mode 1`] = `
+" col0 col0-0 col0-0
+ col1 col1-0 col1-1
+ col2 col2-0 col2-0
+row0 row1 row2 number number
+row0
+row0 row1-0
+row0 row1-0 row2-0 3
+row0 row1-1
+row0 row1-1 row2-0 2 4"
+`;
diff --git a/packages/s2-core/__tests__/bugs/issue-1191-spec.ts b/packages/s2-core/__tests__/bugs/issue-1191-spec.ts
index f533ac3630..696f9e0ca1 100644
--- a/packages/s2-core/__tests__/bugs/issue-1191-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-1191-spec.ts
@@ -49,7 +49,7 @@ const dataCfg: S2DataConfig = {
{
field: 'price',
name: '价格',
- formatter: (v) => `price:${v}`,
+ formatter: (v) => `price: ${v}`,
},
],
};
@@ -74,21 +74,21 @@ describe('Link Field Tests', () => {
test('province row cell should use link field style', () => {
// 浙江省对应 cell
- const province = s2.facet.rowHeader?.children[0];
+ const province = s2.facet
+ .getRowCells()
+ .find((cell) => cell.getMeta().value === '浙江');
- // @ts-ignore
- expect(province.textShape.attr('fill')).toEqual('red');
- // @ts-ignore
- expect(province.linkFieldShape).toBeDefined();
+ expect(province?.getTextShape().attr('fill')).toEqual('red');
+ expect(province?.getLinkFieldShape()).toBeDefined();
});
test('city row cell should not use link field style', () => {
// 义乌对应 cell
- const city = s2.facet.rowHeader?.children[1];
+ const city = s2.facet
+ .getRowCells()
+ .find((cell) => cell.getMeta().value === '义乌');
- // @ts-ignore
- expect(city.textShape.attr('fill')).not.toEqual('red');
- // @ts-ignore
- expect(city.linkFieldShape).not.toBeDefined();
+ expect(city?.getTextShape().attr('fill')).not.toEqual('red');
+ expect(city?.getLinkFieldShape()).not.toBeDefined();
});
});
diff --git a/packages/s2-core/__tests__/bugs/issue-1201-spec.ts b/packages/s2-core/__tests__/bugs/issue-1201-spec.ts
index f04d0d57d5..2af1b5b5bb 100644
--- a/packages/s2-core/__tests__/bugs/issue-1201-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-1201-spec.ts
@@ -4,11 +4,12 @@
* https://github.com/antvis/S2/issues/1201
* fillOpacity
*/
-import { getContainer } from '../util/helpers';
+import type { S2Options } from '../../src';
import * as mockDataConfig from '../data/data-issue-292.json';
+import { getContainer } from '../util/helpers';
import { PivotSheet } from '@/sheet-type';
-const s2Options = {
+const s2Options: S2Options = {
width: 800,
height: 600,
};
@@ -17,22 +18,20 @@ describe('background color opacity test', () => {
test('should set background color opacity correctly', async () => {
const s2 = new PivotSheet(getContainer(), mockDataConfig, s2Options);
- s2.setThemeCfg({
- theme: {
- cornerCell: {
- cell: {
- backgroundColorOpacity: 0.1,
- },
+ s2.setTheme({
+ cornerCell: {
+ cell: {
+ backgroundColorOpacity: 0.1,
},
- rowCell: {
- cell: {
- backgroundColorOpacity: 0.2,
- },
+ },
+ rowCell: {
+ cell: {
+ backgroundColorOpacity: 0.2,
},
- colCell: {
- cell: {
- backgroundColorOpacity: 0.3,
- },
+ },
+ colCell: {
+ cell: {
+ backgroundColorOpacity: 0.3,
},
},
});
@@ -40,21 +39,18 @@ describe('background color opacity test', () => {
await s2.render();
// corner cell
- const cornerCell = s2.facet.cornerHeader.children[0];
+ const cornerCell = s2.facet.getCornerCells()[0];
- // @ts-ignore
- expect(cornerCell.backgroundShape.attr('fillOpacity')).toEqual(0.1);
+ expect(cornerCell.getBackgroundShape().style.fillOpacity).toEqual(0.1);
// row cell
- const rowCell = s2.facet.rowHeader!.children[0];
+ const rowCell = s2.facet.getRowCells()[0];
- // @ts-ignore
- expect(rowCell.backgroundShape.attr('fillOpacity')).toEqual(0.2);
+ expect(rowCell.getBackgroundShape().style.fillOpacity).toEqual(0.2);
// col cell
- const colCell = s2.facet.columnHeader.children[0].children[0];
+ const colCell = s2.facet.getColCells()[0];
- // @ts-ignore
- expect(colCell.backgroundShape.attr('fillOpacity')).toEqual(0.3);
+ expect(colCell.getBackgroundShape().style.fillOpacity).toEqual(0.3);
});
});
diff --git a/packages/s2-core/__tests__/bugs/issue-1561-spec.ts b/packages/s2-core/__tests__/bugs/issue-1561-spec.ts
index dadd3db4a6..058eeb32c2 100644
--- a/packages/s2-core/__tests__/bugs/issue-1561-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-1561-spec.ts
@@ -23,22 +23,23 @@ describe('Grid Border Tests', () => {
const panelScrollGroup = s2.facet.panelGroup.children[0];
const gridGroup = (panelScrollGroup as any).gridGroup as Group;
- const originalLeftBorderBbox = (gridGroup.children[0] as Group).getBBox();
+ const originalLeftBorderBBox = (gridGroup.children[0] as Group).getBBox();
s2.facet.updateScrollOffset({ offsetX: { value: 100, animate: false } });
s2.facet.updateScrollOffset({ offsetX: { value: 200, animate: false } });
s2.facet.updateScrollOffset({ offsetX: { value: 300, animate: false } });
s2.facet.updateScrollOffset({ offsetX: { value: 0, animate: false } });
- const newLeftBorderBbox = (gridGroup.children[0] as Group).getBBox();
+
+ const newLeftBorderBBbox = (gridGroup.children[0] as Group).getBBox();
const widthRatio =
- newLeftBorderBbox.right -
- newLeftBorderBbox.left -
- (originalLeftBorderBbox.right - originalLeftBorderBbox.left);
+ newLeftBorderBBbox.right -
+ newLeftBorderBBbox.left -
+ (originalLeftBorderBBox.right - originalLeftBorderBBox.left);
const heightRatio =
- newLeftBorderBbox.bottom -
- newLeftBorderBbox.top -
- (originalLeftBorderBbox.bottom - originalLeftBorderBbox.top);
+ newLeftBorderBBbox.bottom -
+ newLeftBorderBBbox.top -
+ (originalLeftBorderBBox.bottom - originalLeftBorderBBox.top);
// g绘制时，会将坐标1变成0.5，来达到真正绘制1px的效果，因此宽高不一定完全相同，会有1px的差值
expect(widthRatio).toBeLessThanOrEqual(1);
diff --git a/packages/s2-core/__tests__/bugs/issue-1587-spec.ts b/packages/s2-core/__tests__/bugs/issue-1587-spec.ts
index bb5ff56da7..c39d5c3903 100644
--- a/packages/s2-core/__tests__/bugs/issue-1587-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-1587-spec.ts
@@ -11,9 +11,8 @@ import { PivotSheet } from '@/sheet-type';
const s2Options: S2Options = {
width: 800,
height: 600,
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-expect-error
pagination: {
+ current: 1,
pageSize: 2,
},
};
diff --git a/packages/s2-core/__tests__/bugs/issue-1624-spec.ts b/packages/s2-core/__tests__/bugs/issue-1624-spec.ts
new file mode 100644
index 0000000000..9ce404a029
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/issue-1624-spec.ts
@@ -0,0 +1,51 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+/**
+ * @description spec for issue #1624
+ * https://github.com/antvis/S2/issues/1624
+ */
+
+import * as mockDataConfig from '../data/simple-data.json';
+import { getContainer, sleep } from '../util/helpers';
+import { S2Event, type S2Options } from '@/index';
+import { PivotSheet } from '@/sheet-type';
+
+const s2Options: S2Options = {
+ width: 800,
+ height: 600,
+ hdAdapter: false,
+};
+
+describe('Data Cell Border Tests', () => {
+ const borderWidth = 4;
+
+ test('should draw correct data cell border when hover focus', async () => {
+ const s2 = new PivotSheet(getContainer(), mockDataConfig, s2Options);
+
+ s2.setTheme({
+ dataCell: {
+ cell: {
+ verticalBorderWidth: borderWidth,
+ horizontalBorderWidth: borderWidth,
+ },
+ },
+ });
+ await s2.render();
+
+ const dataCell = s2.facet.getDataCells()[0];
+
+ s2.emit(S2Event.DATA_CELL_HOVER, {
+ target: dataCell,
+ } as any);
+
+ await sleep(40);
+
+ const meta = dataCell.getBBoxByType();
+ const borderBBox = dataCell
+ .getStateShapes()
+ .get('interactiveBorderShape')!
+ .getBBox();
+
+ expect(meta.width).toBeGreaterThanOrEqual(borderBBox.width + borderWidth);
+ expect(meta.height).toBeGreaterThanOrEqual(borderBBox.height + borderWidth);
+ });
+});
diff --git a/packages/s2-core/__tests__/bugs/issue-1715-spec.ts b/packages/s2-core/__tests__/bugs/issue-1715-spec.ts
index 682d3f62d6..4eaf9d183b 100644
--- a/packages/s2-core/__tests__/bugs/issue-1715-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-1715-spec.ts
@@ -4,6 +4,7 @@
* https://github.com/antvis/S2/issues/1715
* https://github.com/antvis/S2/issues/2049
*/
+
import { getContainer } from '../util/helpers';
import * as mockDataConfig from '../data/mock-dataset.json';
import type { S2DataConfig, S2Options, SpreadSheet } from '../../src';
@@ -81,9 +82,10 @@ describe('Multi Values GrandTotal Height Test', () => {
const grandTotalsNode = s2.facet
.getColNodes()
- .find((node) => node.isGrandTotals)!;
+ .find((node) => node.isGrandTotals && node.isTotalRoot);
- expect(s2.facet.getLayoutResult().colsHierarchy.height).toBe(60);
- expect(grandTotalsNode.height).toEqual(30);
+ // 有多个 Value 时不允许隐藏度量列
+ expect(s2.facet.getLayoutResult().colsHierarchy.height).toBe(90);
+ expect(grandTotalsNode!.height).toEqual(60);
});
});
diff --git a/packages/s2-core/__tests__/bugs/issue-1781-spec.ts b/packages/s2-core/__tests__/bugs/issue-1781-spec.ts
index 30dee7a17b..c8a357c5b3 100644
--- a/packages/s2-core/__tests__/bugs/issue-1781-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-1781-spec.ts
@@ -4,12 +4,13 @@
* https://github.com/antvis/S2/issues/1781
*/
+import type { FederatedPointerEvent } from '@antv/g';
+import * as mockDataConfig from '../data/simple-table-data.json';
import {
createFederatedMouseEvent,
getContainer,
sleep,
} from '../util/helpers';
-import * as mockDataConfig from '../data/simple-table-data.json';
import {
OriginEventType,
S2Event,
@@ -46,27 +47,29 @@ describe('Hover Focus Tests', () => {
await sleep(3000);
// 浙江省份信息
- const provinceCell = s2.facet.panelScrollGroup.getChildByIndex(7);
+ const provinceCell = s2.facet.getDataCells()[7];
// 义乌城市信息
- const cityCell = s2.facet.panelScrollGroup.getChildByIndex(10);
+ const cityCell = s2.facet.getDataCells()[10];
const event = createFederatedMouseEvent(s2, OriginEventType.POINTER_MOVE);
event.target = provinceCell;
- // @ts-ignore
- s2.emit(S2Event.DATA_CELL_HOVER, event);
+ s2.emit(S2Event.DATA_CELL_HOVER, event as FederatedPointerEvent);
expect(
- // @ts-ignore
- provinceCell.stateShapes
+ provinceCell
+ .getStateShapes()
.get('interactiveBorderShape')
?.attr('visibility'),
).toEqual('visible');
+
expect(
- // @ts-ignore
- cityCell.stateShapes.get('interactiveBorderShape')?.attr('visibility'),
+ cityCell
+ .getStateShapes()
+ .get('interactiveBorderShape')
+ ?.attr('visibility'),
).toEqual('hidden');
});
});
diff --git a/packages/s2-core/__tests__/bugs/issue-2164-spec.ts b/packages/s2-core/__tests__/bugs/issue-2164-spec.ts
index 394da2dc35..a9dde4113f 100644
--- a/packages/s2-core/__tests__/bugs/issue-2164-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-2164-spec.ts
@@ -6,14 +6,14 @@
import { getContainer } from '../util/helpers';
import * as mockDataConfig from '../data/simple-data.json';
-import type { S2Options } from '@/index';
+import { LayoutWidthType, type S2Options } from '@/index';
import { PivotSheet } from '@/sheet-type';
const s2Options: S2Options = {
width: 400,
height: 400,
style: {
- layoutWidthType: 'compact',
+ layoutWidthType: LayoutWidthType.Compact,
},
totals: {
row: {
@@ -32,7 +32,8 @@ describe('Grand Total Row Node Tests', () => {
...mockDataConfig,
fields: {
...mockDataConfig.fields,
- valueInCols: false, // 指标放行头
+ // 指标放行头
+ valueInCols: false,
},
},
s2Options,
diff --git a/packages/s2-core/__tests__/bugs/issue-2195-spec.ts b/packages/s2-core/__tests__/bugs/issue-2195-spec.ts
new file mode 100644
index 0000000000..ed8c1e1d7f
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/issue-2195-spec.ts
@@ -0,0 +1,74 @@
+/**
+ * 字段代码中有方括号，无法拖拽调整该字段所在列的宽度
+ * 描述应当调整为：字段代码中有方括号，无法使用 `xxxByField` 配置调整该字段的布局
+ * @description spec for issue #2195
+ * https://github.com/antvis/S2/issues/2195
+ */
+
+import { getContainer } from '../util/helpers';
+import type { S2DataConfig, S2Options } from '@/index';
+import { PivotSheet } from '@/sheet-type';
+
+const modifiedMockDataConfig: S2DataConfig = {
+ fields: {
+ rows: ['province', '[city]'],
+ columns: ['type'],
+ values: ['price', 'cost'],
+ valueInCols: true,
+ },
+ data: [
+ {
+ province: '浙江',
+ '[city]': '义乌',
+ type: '笔',
+ price: 1,
+ cost: 2,
+ },
+ {
+ province: '浙江',
+ '[city]': '义乌',
+ type: '笔',
+ price: 1,
+ cost: 2,
+ },
+ {
+ province: '浙江',
+ '[city]': '杭州',
+ type: '笔',
+ price: 1,
+ cost: 2,
+ },
+ ],
+};
+
+const s2Options: S2Options = {
+ width: 400,
+ height: 400,
+ style: {
+ rowCell: {
+ widthByField: {
+ province: 300,
+ '[city]': 123,
+ },
+ },
+ },
+};
+
+describe('Field surrounded by square brackets Tests', () => {
+ test('should render correctly when use field surrounded by square brackets', async () => {
+ const s2 = new PivotSheet(
+ getContainer(),
+ modifiedMockDataConfig,
+ s2Options,
+ );
+
+ await s2.render();
+
+ s2.facet
+ .getLayoutResult()
+ .rowNodes.filter((node) => node.field === '[city]')
+ .forEach((node) => {
+ expect(node.width).toEqual(123);
+ });
+ });
+});
diff --git a/packages/s2-core/__tests__/bugs/issue-2199-spec.ts b/packages/s2-core/__tests__/bugs/issue-2199-spec.ts
new file mode 100644
index 0000000000..fa82bb1813
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/issue-2199-spec.ts
@@ -0,0 +1,41 @@
+/**
+ * @description spec for issue #2199
+ * https://github.com/antvis/S2/issues/2199
+ * 明细表: 当有冻结列 + 列分组的情况下, 会出现列头文本不居中现象
+ */
+import { getContainer } from 'tests/util/helpers';
+import dataCfg from '../data/data-issue-2199.json';
+import { TableSheet } from '@/sheet-type';
+import type { S2Options } from '@/common/interface';
+
+const s2Options: S2Options = {
+ width: 300,
+ height: 480,
+ showSeriesNumber: true,
+ frozen: {
+ colCount: 1,
+ },
+};
+
+describe('ColCell Text Center Tests', () => {
+ test('should draw text centered in cell', async () => {
+ const s2 = new TableSheet(getContainer(), dataCfg, s2Options);
+
+ await s2.render();
+
+ s2.facet.updateScrollOffset({
+ offsetX: {
+ value: 500,
+ animate: false,
+ },
+ });
+
+ const node = s2.facet.getColNodes(0).slice(-1)?.[0];
+ const cell = node?.belongsCell;
+ const { width: nodeWidth, x: nodeX } = node;
+ const { width: textWidth, x: textXActual } = cell!.getBBoxByType();
+ const textXCalc = nodeX + (nodeWidth - textWidth) / 2;
+
+ expect(textXCalc).toBeCloseTo(textXActual);
+ });
+});
diff --git a/packages/s2-core/__tests__/bugs/issue-2322-spec.ts b/packages/s2-core/__tests__/bugs/issue-2322-spec.ts
new file mode 100644
index 0000000000..3b5a8874dd
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/issue-2322-spec.ts
@@ -0,0 +1,50 @@
+/**
+ * @description spec for issue #2322
+ * https://github.com/antvis/S2/issues/2322
+ * 明细表: 多列筛选后清空其中一列筛选，导致其他筛选也清空
+ */
+import { getContainer, sleep } from 'tests/util/helpers';
+import dataCfg from '../data/data-issue-2322.json';
+import { S2Event } from '@/common';
+import type { S2Options } from '@/common/interface';
+import { TableSheet } from '@/sheet-type';
+
+const s2Options: S2Options = {
+ width: 800,
+ height: 480,
+ showSeriesNumber: true,
+ frozen: {
+ colCount: 1,
+ },
+};
+
+describe('Table Sheet Filter Test', () => {
+ test('should filter correctly when part of the filter is cleaned', async () => {
+ const s2 = new TableSheet(getContainer(), dataCfg, s2Options);
+
+ await s2.render();
+
+ // 为两个不同的列设定过滤
+ s2.emit(S2Event.RANGE_FILTER, {
+ filterKey: 'province',
+ filteredValues: ['吉林'],
+ });
+ s2.emit(S2Event.RANGE_FILTER, {
+ filterKey: 'city',
+ filteredValues: ['杭州'],
+ });
+
+ // 删除一列过滤
+ s2.emit(S2Event.RANGE_FILTER, {
+ filterKey: 'province',
+ filteredValues: [],
+ });
+
+ await sleep(200);
+
+ // 应过滤掉 city = 杭州 的值，共4行
+ expect(s2.dataSet.getDisplayDataSet()).toHaveLength(
+ s2.dataSet.originData.length - 4,
+ );
+ });
+});
diff --git a/packages/s2-core/__tests__/bugs/issue-2340-spec.ts b/packages/s2-core/__tests__/bugs/issue-2340-spec.ts
new file mode 100644
index 0000000000..33f194d379
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/issue-2340-spec.ts
@@ -0,0 +1,80 @@
+/**
+ * @description spec for issue #2340
+ * https://github.com/antvis/S2/issues/2340
+ */
+import {
+ CellType,
+ InteractionStateName,
+ getCellMeta,
+ type S2CellType,
+ type S2Options,
+} from '../../src';
+import { createPivotSheet, sleep } from '../util/helpers';
+
+const s2Options: S2Options = {
+ width: 800,
+ height: 600,
+ style: {
+ dataCell: {
+ width: 200,
+ height: 200,
+ },
+ },
+};
+
+describe('Header Brush Selection Tests', () => {
+ test.each([CellType.COL_CELL, CellType.ROW_CELL])(
+ 'should not trigger data cell selected when header selected and scroll out of viewport',
+ async (cellType) => {
+ const s2 = createPivotSheet(s2Options, { useSimpleData: false });
+
+ await s2.render();
+
+ const isRow = cellType === CellType.ROW_CELL;
+ const targetCells = isRow
+ ? s2.facet.getRowCells()
+ : s2.facet.getColCells();
+
+ const cells = [
+ targetCells.find((cell) => {
+ const meta = cell.getMeta();
+
+ return meta.isLeaf;
+ }),
+ ] as S2CellType[];
+
+ s2.interaction.changeState({
+ cells: cells.map(getCellMeta),
+ stateName: InteractionStateName.BRUSH_SELECTED,
+ });
+
+ await sleep(500);
+
+ const offsetKey = isRow ? 'offsetY' : 'offsetX';
+
+ // 将圈选的单元格滑出可视范围
+ s2.facet.updateScrollOffset({
+ [offsetKey]: { value: 300 },
+ });
+
+ await sleep(500);
+
+ // 还原
+ s2.facet.updateScrollOffset({
+ [offsetKey]: { value: 0 },
+ });
+
+ expect(s2.interaction.getActiveCells()).toHaveLength(1);
+ expect(s2.interaction.getCurrentStateName()).toEqual(
+ InteractionStateName.BRUSH_SELECTED,
+ );
+
+ // 交互过的不应该有 dataCell (未触发过列头多选)
+ s2.interaction.getInteractedCells().forEach((cell) => {
+ expect(cell.cellType).toEqual(
+ isRow ? CellType.ROW_CELL : CellType.COL_CELL,
+ );
+ });
+ },
+ );
+});
diff --git a/packages/s2-core/__tests__/bugs/issue-2359-spec.ts b/packages/s2-core/__tests__/bugs/issue-2359-spec.ts
new file mode 100644
index 0000000000..2d4ad61d5e
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/issue-2359-spec.ts
@@ -0,0 +1,66 @@
+/**
+ * @description spec for issue #2359
+ * https://github.com/antvis/S2/issues/2359
+ * 明细表: 自定义列头误用 dataCell 样式
+ */
+import { pick } from 'lodash';
+import { createTableSheet } from 'tests/util/helpers';
+import { TableColCell, drawObjectText } from '../../src';
+import type { S2CellType, S2Options } from '@/common/interface';
+
+class TestColCell extends TableColCell {
+ drawTextShape() {
+ drawObjectText(this, {
+ values: [['A', 'B', 'C']],
+ });
+ }
+}
+
+const s2Options: S2Options = {
+ width: 300,
+ height: 480,
+ showSeriesNumber: true,
+ colCell: (...args) => new TestColCell(...args),
+};
+
+describe('Table Sheet Custom Multiple Values Tests', () => {
+ test('should use current cell text theme', async () => {
+ const s2 = createTableSheet(s2Options);
+
+ s2.setTheme({
+ colCell: {
+ measureText: {
+ fontSize: 12,
+ },
+ bolderText: {
+ fontSize: 14,
+ },
+ text: {
+ fontSize: 20,
+ fill: 'red',
+ },
+ },
+ dataCell: {
+ text: {
+ fontSize: 30,
+ fill: 'green',
+ },
+ },
+ });
+ await s2.render();
+
+ const mapTheme = (cell: S2CellType) => {
+ return cell
+ .getTextShapes()
+ .map((shape) => pick(shape.attributes, ['fill', 'fontSize']));
+ };
+
+ const colCellTexts = s2.facet.getColCells().map(mapTheme);
+
+ const dataCellTexts = s2.facet.getDataCells().map(mapTheme);
+
+ expect(colCellTexts).toMatchSnapshot();
+
+ expect(dataCellTexts).toMatchSnapshot();
+ });
+});
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..592524fa35
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/issue-2385-spec.ts
@@ -0,0 +1,62 @@
+/**
+ * @description spec for issue #2385
+ * https://github.com/antvis/S2/issues/2385
+ */
+import { LayoutWidthType, type S2Options } from '../../src';
+import * as mockDataConfig from '../data/data-issue-2385.json';
+import { getContainer } from '../util/helpers';
+import { PivotSheet, TableSheet } from '@/sheet-type';
+
+const s2Options: S2Options = {
+ width: 800,
+ height: 600,
+ style: {
+ dataCell: {
+ width: 200,
+ },
+ layoutWidthType: LayoutWidthType.Compact,
+ },
+};
+
+describe('Compare Layout Tests', () => {
+ test('should get max col width for pivot sheet', async () => {
+ const s2 = new PivotSheet(getContainer(), mockDataConfig, s2Options);
+
+ s2.setTheme({
+ dataCell: {
+ text: {
+ fontSize: 20,
+ },
+ },
+ });
+ await s2.render();
+
+ const colLeafNodes = s2.facet.getColLeafNodes();
+
+ expect(Math.floor(colLeafNodes[0].width)).toBeCloseTo(189);
+ expect(Math.floor(colLeafNodes[1].width)).toEqual(90);
+ });
+
+ test('should get max col width for table sheet', async () => {
+ const s2 = new TableSheet(getContainer(), mockDataConfig, s2Options);
+
+ s2.setDataCfg({
+ fields: {
+ columns: ['price'],
+ },
+ });
+ s2.setTheme({
+ dataCell: {
+ text: {
+ fontSize: 20,
+ },
+ },
+ });
+
+ await s2.render();
+
+ const colLeafNodes = s2.facet.getColLeafNodes();
+
+ expect(Math.floor(colLeafNodes[0].width)).toBeCloseTo(182);
+ });
+});
diff --git a/packages/s2-core/__tests__/bugs/issue-2501-spec.ts b/packages/s2-core/__tests__/bugs/issue-2501-spec.ts
new file mode 100644
index 0000000000..143c76f1ad
--- /dev/null
+++ b/packages/s2-core/__tests__/bugs/issue-2501-spec.ts
@@ -0,0 +1,63 @@
+/**
+ * @description spec for issue #2501
+ * https://github.com/antvis/S2/issues/2501
+ */
+
+import type { TableFacet } from '../../src/facet';
+import * as mockDataConfig from '../data/simple-table-data.json';
+import { getContainer } from '../util/helpers';
+import type { SpreadSheet, S2DataConfig, S2Options } from '@/index';
+import { TableSheet } from '@/sheet-type';
+
+const s2DataConfig: S2DataConfig = {
+ ...mockDataConfig,
+};
+
+const s2Options: S2Options = {
+ width: 800,
+ height: 400,
+ style: {
+ rowCell: {
+ heightByField: {
+ '0': 100,
+ '1': 150,
+ },
+ },
+ },
+};
+
+describe('Table Sheet Row Offsets Tests', () => {
+ let s2: SpreadSheet;
+
+ beforeEach(() => {
+ s2 = new TableSheet(getContainer(), s2DataConfig, s2Options);
+
+ s2.render();
+ });
+
+ test('should get correctly row offset data', () => {
+ expect((s2.facet as TableFacet).rowOffsets).toMatchInlineSnapshot(`
+ Array [
+ 0,
+ 100,
+ 250,
+ 280,
+ ]
+ `);
+ });
+
+ test('should get correctly data cell offset for heightByField', () => {
+ const { getCellOffsetY, getTotalHeight } = s2.facet.getViewCellHeights();
+
+ expect(getCellOffsetY(0)).toEqual(0);
+ expect(getCellOffsetY(1)).toEqual(100);
+ expect(getCellOffsetY(2)).toEqual(250);
+ expect(getTotalHeight()).toEqual(280);
+ });
+
+ test('should get correctly row layout for heightByField', () => {
+ const { getTotalLength } = s2.facet.getViewCellHeights();
+
+ expect(getTotalLength()).toEqual(3);
+ });
+});
diff --git a/packages/s2-core/__tests__/bugs/issue-446-spec.ts b/packages/s2-core/__tests__/bugs/issue-446-spec.ts
index 385d726105..5d8f283250 100644
--- a/packages/s2-core/__tests__/bugs/issue-446-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-446-spec.ts
@@ -7,7 +7,7 @@
import { getContainer } from '../util/helpers';
import * as mockDataConfig from '../data/data-issue-446.json';
import { TableSheet } from '@/sheet-type';
-import { copyData } from '@/utils';
+import { asyncGetAllPlainData } from '@/utils';
const s2Options = {
width: 800,
@@ -20,7 +20,7 @@ describe('export', () => {
const s2 = new TableSheet(getContainer(), mockDataConfig, s2Options);
await s2.render();
- const data = copyData({
+ const data = await asyncGetAllPlainData({
sheetInstance: s2,
split: '\t',
formatOptions: true,
@@ -43,7 +43,7 @@ describe('export', () => {
});
await s2.render();
- const data = copyData({
+ const data = await asyncGetAllPlainData({
sheetInstance: s2,
split: '\t',
});
diff --git a/packages/s2-core/__tests__/bugs/issue-565-spec.ts b/packages/s2-core/__tests__/bugs/issue-565-spec.ts
index d86f5100eb..2705af69a9 100644
--- a/packages/s2-core/__tests__/bugs/issue-565-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-565-spec.ts
@@ -6,13 +6,14 @@
*/
import * as mockDataConfig from 'tests/data/data-issue-565.json';
import { getContainer } from 'tests/util/helpers';
+import type { S2Options } from '../../src';
import { PivotSheet } from '@/sheet-type';
-import { copyData } from '@/utils';
+import { asyncGetAllPlainData } from '@/utils';
-const s2Options = {
+const s2Options: S2Options = {
width: 800,
height: 600,
- hierarchyType: 'tree' as const,
+ hierarchyType: 'tree',
};
describe('Export data in pivot tree mode', () => {
@@ -20,7 +21,8 @@ describe('Export data in pivot tree mode', () => {
const s2 = new PivotSheet(getContainer(), mockDataConfig, s2Options);
await s2.render();
- const data = copyData({
+
+ const data = await asyncGetAllPlainData({
sheetInstance: s2,
split: '\t',
});
@@ -32,16 +34,6 @@ describe('Export data in pivot tree mode', () => {
expect(rows[1].split('\t')[0]).toEqual('');
expect(rows[7].split('\t')[0]).toEqual('row0');
expect(rows[8].split('\t')[0]).toEqual('row0');
- expect(data).toMatchInlineSnapshot(`
- " col0 col0-0 col0-0
- col1 col1-0 col1-1
- col2 col2-0 col2-0
- row0 row1 row2 number number
- row0
- row0 row1-0
- row0 row1-0 row2-0 3
- row0 row1-1
- row0 row1-1 row2-0 2 4"
- `);
+ expect(data).toMatchSnapshot();
});
});
diff --git a/packages/s2-core/__tests__/bugs/issue-725-spec.ts b/packages/s2-core/__tests__/bugs/issue-725-spec.ts
index 6d222d4230..ad503c135b 100644
--- a/packages/s2-core/__tests__/bugs/issue-725-spec.ts
+++ b/packages/s2-core/__tests__/bugs/issue-725-spec.ts
@@ -3,15 +3,13 @@
* https://github.com/antvis/S2/issues/725
* Wrong multi measure render
* Wrong group sort
- *
*/
import * as mockDataConfig from 'tests/data/data-issue-725.json';
import { assembleDataCfg } from '../util';
import type { S2DataConfig } from '@/common/interface';
-import { PivotSheet } from '@/sheet-type';
import { PivotDataSet } from '@/data-set';
-import { getDimensionsWithoutPathPre } from '@/utils/dataset/pivot-data-set';
+import { PivotSheet } from '@/sheet-type';
jest.mock('@/sheet-type');
@@ -39,18 +37,17 @@ describe('Group Sort When Have Same Child Measure', () => {
});
test('should get correct group sort', () => {
- expect(
- getDimensionsWithoutPathPre(dataSet.getDimensionValues('type')),
- ).toEqual(['办公用品', '家具产品', '家具产品', '办公用品']);
- expect(
- getDimensionsWithoutPathPre(
- dataSet.getDimensionValues('type', { city: '白山' }),
- ),
- ).toEqual(['办公用品', '家具产品']);
- expect(
- getDimensionsWithoutPathPre(
- dataSet.getDimensionValues('type', { city: '抚顺' }),
- ),
- ).toEqual(['家具产品', '办公用品']);
+ expect(dataSet.getDimensionValues('type')).toEqual([
+ '办公用品',
+ '家具产品',
+ ]);
+ expect(dataSet.getDimensionValues('type', { city: '白山' })).toEqual([
+ '办公用品',
+ '家具产品',
+ ]);
+ expect(dataSet.getDimensionValues('type', { city: '抚顺' })).toEqual([
+ '家具产品',
+ '办公用品',
+ ]);
});
});
diff --git a/packages/s2-core/__tests__/data/data-custom-trees.ts b/packages/s2-core/__tests__/data/data-custom-trees.ts
new file mode 100644
index 0000000000..7e5a8832a2
--- /dev/null
+++ b/packages/s2-core/__tests__/data/data-custom-trees.ts
@@ -0,0 +1,22 @@
+export const dataCustomTrees = [
+ {
+ type: '家具',
+ sub_type: '桌子',
+ 'measure-a': 1,
+ 'measure-b': 2,
+ 'measure-c': 3,
+ 'measure-d': 4,
+ 'measure-e': 5,
+ 'measure-f': 6,
+ },
+ {
+ type: '家具',
+ sub_type: '椅子',
+ 'measure-a': 11,
+ 'measure-b': 22,
+ 'measure-c': 33,
+ 'measure-d': 44,
+ 'measure-e': 55,
+ 'measure-f': 66,
+ },
+];
diff --git a/packages/s2-core/__tests__/data/data-issue-2199.json b/packages/s2-core/__tests__/data/data-issue-2199.json
new file mode 100644
index 0000000000..bb93e0401f
--- /dev/null
+++ b/packages/s2-core/__tests__/data/data-issue-2199.json
@@ -0,0 +1,126 @@
+{
+ "fields": {
+ "columns": [
+ {
+ "field": "area",
+ "title": "位置",
+ "children": [
+ { "field": "province", "title": "省份" },
+ { "field": "city", "title": "城市" }
+ ]
+ },
+ {
+ "field": "type",
+ "title": "商品类别"
+ },
+ {
+ "field": "money",
+ "title": "金额",
+ "children": [
+ {
+ "field": "price",
+ "title": "价格"
+ }
+ ]
+ }
+ ]
+ },
+ "data": [
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "笔",
+ "price": 1
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "纸张",
+ "price": 2
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "笔",
+ "price": 17
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "纸张",
+ "price": 6
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "笔",
+ "price": 8
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "笔",
+ "price": 12
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "纸张",
+ "price": 3
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "纸张",
+ "price": 25
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "笔",
+ "price": 20
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "纸张",
+ "price": 10
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "笔",
+ "price": 15
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "纸张",
+ "price": 2
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "笔",
+ "price": 15
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "笔",
+ "price": 30
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "纸张",
+ "price": 40
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "纸张",
+ "price": 50
+ }
+ ]
+}
diff --git a/packages/s2-core/__tests__/data/data-issue-2322.json b/packages/s2-core/__tests__/data/data-issue-2322.json
new file mode 100644
index 0000000000..9dde6f3fc4
--- /dev/null
+++ b/packages/s2-core/__tests__/data/data-issue-2322.json
@@ -0,0 +1,132 @@
+{
+ "fields": {
+ "columns": [
+ {
+ "field": "area",
+ "title": "区域",
+ "children": [
+ {
+ "field": "province",
+ "title": "省份"
+ },
+ {
+ "field": "city",
+ "title": "城市"
+ }
+ ]
+ },
+ {
+ "field": "type",
+ "title": "商品类别"
+ },
+ {
+ "field": "money",
+ "title": "金额",
+ "children": [
+ {
+ "field": "price",
+ "title": "价格"
+ }
+ ]
+ }
+ ]
+ },
+ "data": [
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "笔",
+ "price": 1
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "纸张",
+ "price": 2
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "笔",
+ "price": 17
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "纸张",
+ "price": 6
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "笔",
+ "price": 8
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "笔",
+ "price": 12
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "纸张",
+ "price": 3
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "纸张",
+ "price": 25
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "笔",
+ "price": 20
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "纸张",
+ "price": 10
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "笔",
+ "price": 15
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "纸张",
+ "price": 2
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "笔",
+ "price": 15
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "笔",
+ "price": 30
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "纸张",
+ "price": 40
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "纸张",
+ "price": 50
+ }
+ ]
+}
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..d6f20caac5
--- /dev/null
+++ b/packages/s2-core/__tests__/data/data-issue-2385.json
@@ -0,0 +1,138 @@
+{
+ "data": [
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "笔",
+ "price": "11111111111111111",
+ "cost": "33.333"
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "type": "纸张",
+ "price": "2",
+ "cost": "1.5"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "笔",
+ "price": "2",
+ "cost": "1.5"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "type": "纸张",
+ "price": "666.333",
+ "cost": "0.2"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "笔",
+ "price": "3",
+ "cost": "2"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "type": "纸张",
+ "price": "2",
+ "cost": "1"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "笔",
+ "price": "4",
+ "cost": "3"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "type": "纸张",
+ "price": "1",
+ "cost": "33.333"
+ },
+ {
+ "price": "15.5",
+ "cost": "10.2"
+ },
+ {
+ "province": "浙江",
+ "price": "5.5",
+ "cost": "3.7"
+ },
+ {
+ "province": "浙江",
+ "city": "杭州",
+ "price": "3",
+ "cost": "2"
+ },
+ {
+ "province": "浙江",
+ "city": "舟山",
+ "price": "2.5",
+ "cost": "1.7"
+ },
+ {
+ "province": "吉林",
+ "price": "10",
+ "cost": "6.5"
+ },
+ {
+ "province": "吉林",
+ "city": "长春",
+ "price": "5",
+ "cost": "3"
+ },
+ {
+ "province": "吉林",
+ "city": "白山",
+ "price": "5",
+ "cost": "3.5"
+ },
+ {
+ "type": "笔",
+ "price": "10",
+ "cost": "7"
+ },
+ {
+ "type": "笔",
+ "province": "浙江",
+ "price": "3",
+ "cost": "2"
+ },
+ {
+ "type": "笔",
+ "province": "吉林",
+ "price": "7",
+ "cost": "5"
+ },
+ {
+ "type": "纸张",
+ "price": "5.5",
+ "cost": "3.2"
+ },
+ {
+ "type": "纸张",
+ "province": "浙江",
+ "price": "2.5",
+ "cost": "1.7"
+ },
+ {
+ "type": "纸张",
+ "province": "吉林",
+ "price": "3",
+ "cost": "1.5"
+ }
+ ],
+ "fields": {
+ "rows": ["province", "city"],
+ "columns": ["type"],
+ "values": ["price"],
+ "valueInCols": true
+ }
+}
diff --git a/packages/s2-core/__tests__/data/data-issue-292.json b/packages/s2-core/__tests__/data/data-issue-292.json
index 8a387e8391..98ccfbf083 100644
--- a/packages/s2-core/__tests__/data/data-issue-292.json
+++ b/packages/s2-core/__tests__/data/data-issue-292.json
@@ -10,12 +10,7 @@
"province": "浙江",
"city": "义乌",
"type": "笔",
- "cost": "2"
- },
- {
- "province": "浙江",
- "city": "义乌",
- "type": "笔",
+ "cost": "2",
"price": "8"
},
{
diff --git a/packages/s2-core/__tests__/data/data-issue-725.json b/packages/s2-core/__tests__/data/data-issue-725.json
index ad4d2a36dc..5510e53fd0 100644
--- a/packages/s2-core/__tests__/data/data-issue-725.json
+++ b/packages/s2-core/__tests__/data/data-issue-725.json
@@ -19,11 +19,6 @@
}
],
"data": [
- {
- "city": "白山",
- "type": "办公用品",
- "price": ""
- },
{
"city": "白山",
"type": "办公用品",
diff --git a/packages/s2-core/__tests__/data/sort-advanced.ts b/packages/s2-core/__tests__/data/sort-advanced.ts
index bd067d3b47..e6068afe62 100644
--- a/packages/s2-core/__tests__/data/sort-advanced.ts
+++ b/packages/s2-core/__tests__/data/sort-advanced.ts
@@ -183,4 +183,5 @@ export const sortData = {
price: '3',
},
],
+ totalData: [],
};
diff --git a/packages/s2-core/__tests__/data/total-group-data.ts b/packages/s2-core/__tests__/data/total-group-data.ts
new file mode 100644
index 0000000000..ec1c1a7e3c
--- /dev/null
+++ b/packages/s2-core/__tests__/data/total-group-data.ts
@@ -0,0 +1,201 @@
+import { Aggregation, type S2DataConfig, type S2Options } from '@/common';
+
+export const s2Options: S2Options = {
+ width: 800,
+ height: 600,
+ // 配置行小计总计显示,且按维度分组（列小计总计同理）
+ totals: {
+ row: {
+ showGrandTotals: true,
+ showSubTotals: true,
+ reverseGrandTotalsLayout: true,
+ reverseSubTotalsLayout: true,
+ subTotalsDimensions: ['province'],
+ calcGrandTotals: {
+ aggregation: Aggregation.SUM,
+ },
+ calcSubTotals: {
+ aggregation: Aggregation.SUM,
+ },
+ grandTotalsGroupDimensions: ['type'],
+ subTotalsGroupDimensions: ['type'],
+ },
+ col: {
+ showGrandTotals: true,
+ showSubTotals: true,
+ reverseGrandTotalsLayout: true,
+ reverseSubTotalsLayout: true,
+ calcGrandTotals: {
+ aggregation: Aggregation.SUM,
+ },
+ calcSubTotals: {
+ aggregation: Aggregation.SUM,
+ },
+ grandTotalsGroupDimensions: ['sub_type'],
+ },
+ },
+};
+
+export const dataCfg: S2DataConfig = {
+ fields: {
+ rows: ['province', 'city', 'type'],
+ columns: ['sub_type'],
+ values: ['price', 'cost'],
+ },
+ meta: [
+ {
+ field: 'province',
+ name: '省份',
+ },
+ {
+ field: 'city',
+ name: '城市',
+ },
+ {
+ field: 'type',
+ name: '商品类别',
+ },
+ {
+ field: 'sub_type',
+ name: '商品子类别',
+ },
+ {
+ field: 'price',
+ name: '价格',
+ },
+ {
+ field: 'cost',
+ name: '成本',
+ },
+ ],
+ data: [
+ {
+ price: 100,
+ cost: 100,
+ province: '浙江省',
+ city: '杭州市',
+ type: '家具',
+ sub_type: '桌子',
+ },
+ {
+ price: 100,
+ cost: 100,
+ province: '浙江省',
+ city: '杭州市',
+ type: '家具',
+ sub_type: '沙发',
+ },
+ {
+ price: 100,
+ cost: 100,
+ province: '浙江省',
+ city: '杭州市',
+ type: '办公用品',
+ sub_type: '笔',
+ },
+
+ {
+ price: 200,
+ cost: 200,
+ province: '浙江省',
+ city: '舟山市',
+ type: '家具',
+ sub_type: '桌子',
+ },
+
+ {
+ price: 200,
+ cost: 200,
+ province: '浙江省',
+ city: '舟山市',
+ type: '家具',
+ sub_type: '沙发',
+ },
+
+ {
+ price: 200,
+ cost: 200,
+ province: '浙江省',
+ city: '舟山市',
+ type: '办公用品',
+ sub_type: '笔',
+ },
+
+ {
+ price: 200,
+ cost: 200,
+ province: '浙江省',
+ city: '舟山市',
+ type: '办公用品',
+ sub_type: '纸张',
+ },
+ {
+ price: 300,
+ cost: 300,
+ province: '四川省',
+ city: '成都市',
+ type: '家具',
+ sub_type: '桌子',
+ },
+ {
+ price: 400,
+ cost: 400,
+ province: '四川省',
+ city: '绵阳市',
+ type: '家具',
+ sub_type: '桌子',
+ },
+
+ {
+ price: 300,
+ cost: 300,
+ province: '四川省',
+ city: '成都市',
+ type: '家具',
+ sub_type: '沙发',
+ },
+ {
+ price: 400,
+ cost: 400,
+ province: '四川省',
+ city: '绵阳市',
+ type: '家具',
+ sub_type: '沙发',
+ },
+
+ {
+ price: 300,
+ cost: 300,
+ province: '四川省',
+ city: '成都市',
+ type: '办公用品',
+ sub_type: '笔',
+ },
+ {
+ price: 400,
+ cost: 400,
+ province: '四川省',
+ city: '绵阳市',
+ type: '办公用品',
+ sub_type: '笔',
+ },
+
+ {
+ price: 300,
+ cost: 300,
+ province: '四川省',
+ city: '成都市',
+ type: '办公用品',
+ sub_type: '纸张',
+ },
+ {
+ price: 400,
+ cost: 400,
+ province: '四川省',
+ city: '绵阳市',
+ type: '办公用品',
+ sub_type: '纸张',
+ },
+ ],
+ totalData: [],
+};
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 e906a49ea1..8bb717bbfc 100644
--- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/corner-spec.ts.snap
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/corner-spec.ts.snap
@@ -11,7 +11,7 @@ Array [
"field": "province",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -19,6 +19,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -28,7 +29,7 @@ Array [
"seriesNumberWidth": undefined,
"spreadsheet": Anything,
"value": "province",
- "width": 99,
+ "width": 99.33,
"x": 0,
"y": 0,
},
@@ -41,7 +42,7 @@ Array [
"field": "city",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -49,6 +50,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -58,8 +60,8 @@ Array [
"seriesNumberWidth": undefined,
"spreadsheet": Anything,
"value": "city",
- "width": 99,
- "x": 99,
+ "width": 99.33,
+ "x": 99.33,
"y": 0,
},
]
@@ -84,6 +86,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -106,7 +109,7 @@ Array [
"field": "province",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -114,6 +117,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -136,7 +140,7 @@ Array [
"field": "city",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -144,6 +148,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -171,7 +176,7 @@ Array [
"field": "",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province/city/数值",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -179,6 +184,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -188,7 +194,7 @@ Array [
"seriesNumberWidth": 0,
"spreadsheet": Anything,
"value": "province/city/数值",
- "width": 145,
+ "width": 145.36,
"x": 0,
"y": 0,
},
@@ -214,6 +220,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -236,7 +243,7 @@ Array [
"field": "",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province/city/数值",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -244,6 +251,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -253,7 +261,7 @@ Array [
"seriesNumberWidth": 80,
"spreadsheet": Anything,
"value": "province/city/数值",
- "width": 145,
+ "width": 145.36,
"x": 80,
"y": 0,
},
@@ -271,7 +279,7 @@ Array [
"field": "province",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -279,6 +287,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -301,7 +310,7 @@ Array [
"field": "city",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -309,6 +318,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -344,6 +354,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -366,7 +377,7 @@ Array [
"field": "province",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -374,6 +385,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -396,7 +408,7 @@ Array [
"field": "city",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -404,6 +416,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -431,7 +444,7 @@ Array [
"field": "",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province/city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -439,6 +452,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -474,6 +488,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -496,7 +511,7 @@ Array [
"field": "",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province/city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -504,6 +519,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -531,7 +547,7 @@ Array [
"field": "province",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -539,6 +555,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -548,7 +565,7 @@ Array [
"seriesNumberWidth": undefined,
"spreadsheet": Anything,
"value": "province",
- "width": 99,
+ "width": 99.33,
"x": 0,
"y": 0,
},
@@ -561,7 +578,7 @@ Array [
"field": "city",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -569,6 +586,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -578,8 +596,8 @@ Array [
"seriesNumberWidth": undefined,
"spreadsheet": Anything,
"value": "city",
- "width": 99,
- "x": 99,
+ "width": 99.33,
+ "x": 99.33,
"y": 0,
},
]
@@ -604,6 +622,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -626,7 +645,7 @@ Array [
"field": "province",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -634,6 +653,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -656,7 +676,7 @@ Array [
"field": "city",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -664,6 +684,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -691,7 +712,7 @@ Array [
"field": "",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province/city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -699,6 +720,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -734,6 +756,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
@@ -756,7 +779,7 @@ Array [
"field": "",
"height": 30,
"hierarchy": undefined,
- "id": "",
+ "id": "province/city",
"inCollapseNode": undefined,
"isCollapsed": undefined,
"isGrandTotals": undefined,
@@ -764,6 +787,7 @@ Array [
"isPivotMode": true,
"isSubTotals": undefined,
"isTotalMeasure": undefined,
+ "isTotalRoot": undefined,
"isTotals": undefined,
"level": undefined,
"padding": 0,
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-cell-style-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-cell-style-spec.ts.snap
index 2baf34699e..14478ee83c 100644
--- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-cell-style-spec.ts.snap
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-cell-style-spec.ts.snap
@@ -45,17 +45,17 @@ Array [
Object {
"height": 30,
"id": "root[&]笔",
- "width": 300,
+ "width": 299,
},
Object {
"height": 30,
"id": "root[&]笔[&]price",
- "width": 150,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]笔[&]cost",
- "width": 150,
+ "width": 149.5,
},
]
`;
@@ -65,17 +65,17 @@ Array [
Object {
"height": 60,
"id": "root[&]浙江",
- "width": 149,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]浙江[&]义乌",
- "width": 149,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]浙江[&]杭州",
- "width": 149,
+ "width": 149.5,
},
]
`;
@@ -140,7 +140,7 @@ Array [
Object {
"height": 66,
"id": "root[&]浙江",
- "width": 149,
+ "width": 149.5,
},
Object {
"height": 33,
@@ -160,17 +160,17 @@ Array [
Object {
"height": 330,
"id": "root[&]浙江",
- "width": 149,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]浙江[&]义乌",
- "width": 149,
+ "width": 149.5,
},
Object {
"height": 300,
"id": "root[&]浙江[&]杭州",
- "width": 149,
+ "width": 149.5,
},
]
`;
@@ -180,17 +180,17 @@ Array [
Object {
"height": 60,
"id": "root[&]浙江",
- "width": 149,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]浙江[&]义乌",
- "width": 149,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]浙江[&]杭州",
- "width": 149,
+ "width": 149.5,
},
]
`;
@@ -200,17 +200,17 @@ Array [
Object {
"height": 30,
"id": "root[&]笔",
- "width": 300,
+ "width": 299,
},
Object {
"height": 30,
"id": "root[&]笔[&]price",
- "width": 150,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]笔[&]cost",
- "width": 150,
+ "width": 149.5,
},
]
`;
@@ -220,22 +220,22 @@ Array [
Object {
"height": 30,
"id": "root[&]浙江[&]义乌-root[&]笔[&]price",
- "width": 150,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]浙江[&]杭州-root[&]笔[&]price",
- "width": 150,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]浙江[&]义乌-root[&]笔[&]cost",
- "width": 150,
+ "width": 149.5,
},
Object {
"height": 30,
"id": "root[&]浙江[&]杭州-root[&]笔[&]cost",
- "width": 150,
+ "width": 149.5,
},
]
`;
@@ -247,12 +247,12 @@ Array [
Object {
"height": 30,
"id": "root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
]
`;
@@ -262,132 +262,132 @@ Array [
Object {
"height": 30,
"id": "0-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "1-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "2-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "3-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "4-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "5-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "6-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "7-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "8-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "9-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "10-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "11-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "12-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "0-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "1-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "2-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "3-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "4-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "5-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "6-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "7-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "8-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "9-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "10-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "11-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "12-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
]
`;
@@ -427,7 +427,7 @@ Array [
Object {
"height": 60,
"id": "root[&]类型",
- "width": 119,
+ "width": 119.8,
},
Object {
"height": 30,
@@ -482,72 +482,72 @@ Array [
Object {
"height": 60,
"id": "0-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "1-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "2-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "3-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "4-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "5-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "6-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "0-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "1-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "2-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "3-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "4-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "5-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 60,
"id": "6-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
]
`;
@@ -557,102 +557,102 @@ Array [
Object {
"height": 40,
"id": "0-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "1-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 100,
"id": "2-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "3-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "4-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "5-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "6-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "7-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "8-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "9-root[&]类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 40,
"id": "0-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "1-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 100,
"id": "2-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "3-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "4-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "5-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "6-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "7-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "8-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
Object {
"height": 30,
"id": "9-root[&]子类别",
- "width": 299,
+ "width": 299.5,
},
]
`;
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-grid-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-grid-spec.ts.snap
index 4e93984e3d..63872b5a1c 100644
--- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-grid-spec.ts.snap
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-grid-spec.ts.snap
@@ -253,7 +253,7 @@ Array [
"field": "a-1",
"height": 30,
"value": "自定义节点 a-1",
- "width": 300,
+ "width": 299.01,
"x": 0,
"y": 0,
},
@@ -262,7 +262,7 @@ Array [
"field": "a-1-1",
"height": 30,
"value": "自定义节点 a-1-1",
- "width": 200,
+ "width": 199.34,
"x": 0,
"y": 30,
},
@@ -271,7 +271,7 @@ Array [
"field": "measure-1",
"height": 30,
"value": "指标1",
- "width": 100,
+ "width": 99.67,
"x": 0,
"y": 60,
},
@@ -280,8 +280,8 @@ Array [
"field": "measure-2",
"height": 30,
"value": "指标2",
- "width": 100,
- "x": 100,
+ "width": 99.67,
+ "x": 99.67,
"y": 60,
},
Object {
@@ -289,8 +289,8 @@ Array [
"field": "a-1-2",
"height": 60,
"value": "自定义节点 a-1-2",
- "width": 100,
- "x": 200,
+ "width": 99.67,
+ "x": 199.34,
"y": 30,
},
Object {
@@ -298,8 +298,8 @@ Array [
"field": "a-2",
"height": 90,
"value": "自定义节点 a-2",
- "width": 100,
- "x": 300,
+ "width": 99.67,
+ "x": 299.01,
"y": 0,
},
]
@@ -309,19 +309,19 @@ exports[`SpreadSheet Custom Grid Tests Custom Row Grid Tests should calc correct
Array [
Object {
"field": "measure-1",
- "width": 119,
+ "width": 119.6,
},
Object {
"field": "measure-2",
- "width": 119,
+ "width": 119.6,
},
Object {
"field": "a-1-2",
- "width": 159,
+ "width": 159.6,
},
Object {
"field": "a-2",
- "width": 278,
+ "width": 279.2,
},
]
`;
@@ -330,11 +330,11 @@ exports[`SpreadSheet Custom Grid Tests Custom Row Grid Tests should calc correct
Array [
Object {
"field": "sub_type",
- "width": 160,
+ "width": 159.4,
},
Object {
"field": "sub_type",
- "width": 160,
+ "width": 159.4,
},
]
`;
@@ -435,37 +435,37 @@ Array [
"description": "a-1 描述",
"height": 90,
"value": "自定义节点 a-1",
- "width": 119,
+ "width": 119.6,
},
Object {
"description": "a-1-1 描述",
"height": 60,
"value": "自定义节点 a-1-1",
- "width": 119,
+ "width": 119.6,
},
Object {
"description": "指标1描述",
"height": 30,
"value": "指标1",
- "width": 119,
+ "width": 119.6,
},
Object {
"description": "指标2描述",
"height": 30,
"value": "指标2",
- "width": 119,
+ "width": 119.6,
},
Object {
"description": "a-1-2 描述",
"height": 30,
"value": "自定义节点 a-1-2",
- "width": 238,
+ "width": 239.2,
},
Object {
"description": "a-2 描述",
"height": 30,
"value": "自定义节点 a-2",
- "width": 357,
+ "width": 358.79999999999995,
},
]
`;
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-table-col-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-table-col-spec.ts.snap
index e607dd4387..e7310e8255 100644
--- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-table-col-spec.ts.snap
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/custom-table-col-spec.ts.snap
@@ -169,43 +169,43 @@ Array [
"description": undefined,
"height": 30,
"value": "地区",
- "width": 238,
+ "width": 239.6,
},
Object {
"description": undefined,
"height": 30,
"value": "省份",
- "width": 119,
+ "width": 119.8,
},
Object {
"description": undefined,
"height": 30,
"value": "城市",
- "width": 119,
+ "width": 119.8,
},
Object {
"description": undefined,
"height": 60,
"value": "类型",
- "width": 119,
+ "width": 119.8,
},
Object {
"description": undefined,
"height": 30,
"value": "金额",
- "width": 238,
+ "width": 239.6,
},
Object {
"description": "价格描述",
"height": 30,
"value": "价格",
- "width": 119,
+ "width": 119.8,
},
Object {
"description": undefined,
"height": 30,
"value": "数量",
- "width": 119,
+ "width": 119.8,
},
]
`;
@@ -216,37 +216,37 @@ Array [
"description": "a-1 描述",
"height": 30,
"value": "自定义节点 a-1",
- "width": 447,
+ "width": 449.25,
},
Object {
"description": "a-1-1 描述",
"height": 30,
"value": "自定义节点 a-1-1",
- "width": 298,
+ "width": 299.5,
},
Object {
"description": "指标1描述",
"height": 30,
"value": "指标1",
- "width": 149,
+ "width": 149.75,
},
Object {
"description": "指标2描述",
"height": 30,
"value": "指标2",
- "width": 149,
+ "width": 149.75,
},
Object {
"description": "a-1-2 描述",
"height": 60,
"value": "自定义节点 a-1-2",
- "width": 149,
+ "width": 149.75,
},
Object {
"description": "a-2 描述",
"height": 90,
"value": "自定义节点 a-2",
- "width": 149,
+ "width": 149.75,
},
]
`;
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/hidden-columns-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/hidden-columns-spec.ts.snap
new file mode 100644
index 0000000000..90c2f63ff0
--- /dev/null
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/hidden-columns-spec.ts.snap
@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SpreadSheet Hidden Columns Tests PivotSheet Multiple Values Tests should render correct row corner after hide measure node 1`] = `
+Array [
+ Object {
+ "height": 30,
+ "width": 119.6,
+ "x": 0,
+ "y": 60,
+ },
+ Object {
+ "height": 30,
+ "width": 119.6,
+ "x": 119.6,
+ "y": 60,
+ },
+ Object {
+ "height": 30,
+ "width": 239.2,
+ "x": 0,
+ "y": 0,
+ },
+ Object {
+ "height": 30,
+ "width": 239.2,
+ "x": 0,
+ "y": 30,
+ },
+]
+`;
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap
index 5b04f4dac4..f9206280f8 100644
--- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/multi-line-text-spec.ts.snap
@@ -2428,12 +2428,12 @@ Array [
"width": 96,
},
Object {
- "actualText": "城我是省略号",
+ "actualText": "城市城@@@",
"actualTextHeight": 16,
- "actualTextWidth": 73,
+ "actualTextWidth": 72,
"height": 30,
"multiLineActualTexts": Array [
- "城我是省略号",
+ "城市城@@@",
],
"originalText": "城市城市城市城市城市城市城市城市城市城市城市城市",
"width": 96,
@@ -2977,7 +2977,7 @@ Array [
"省份",
],
"originalText": "省份",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "城市城市城市城市城市城市城市城市城市城市...",
@@ -2990,7 +2990,7 @@ Array [
"城市城市城市...",
],
"originalText": "城市城市城市城市城市城市城市城市城市城市城市城市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "类别类别类别类别类别类别类别类别类别类别",
@@ -3003,7 +3003,7 @@ Array [
"类别类别类别",
],
"originalText": "类别类别类别类别类别类别类别类别类别类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "子类别",
@@ -3014,7 +3014,7 @@ Array [
"子类别",
],
"originalText": "子类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "数量数量数量数量数量数量数量数量数量数量...",
@@ -3027,7 +3027,7 @@ Array [
"数量数量数量...",
],
"originalText": "数量数量数量数量数量数量数量数量数量数量数量",
- "width": 103,
+ "width": 103.8,
},
]
`;
@@ -3177,7 +3177,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江...",
@@ -3190,7 +3190,7 @@ Array [
"省浙江省浙江...",
],
"originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3201,7 +3201,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3212,7 +3212,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3223,7 +3223,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3234,7 +3234,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3245,7 +3245,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3256,7 +3256,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3267,7 +3267,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3278,7 +3278,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3289,7 +3289,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -3300,7 +3300,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -3311,7 +3311,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州...",
@@ -3324,7 +3324,7 @@ Array [
"市杭州市杭州...",
],
"originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -3335,7 +3335,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -3346,7 +3346,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -3357,7 +3357,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市",
@@ -3368,7 +3368,7 @@ Array [
"杭州市",
],
"originalText": "杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -3379,7 +3379,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -3390,7 +3390,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -3401,7 +3401,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市",
@@ -3412,7 +3412,7 @@ Array [
"杭州市",
],
"originalText": "杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -3423,7 +3423,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -3434,7 +3434,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -3445,7 +3445,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具家具家具家具家具家具家具家具家具家具...",
@@ -3458,7 +3458,7 @@ Array [
"家具家具家具...",
],
"originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -3469,7 +3469,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -3480,7 +3480,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -3491,7 +3491,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -3502,7 +3502,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -3513,7 +3513,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -3524,7 +3524,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -3535,7 +3535,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -3546,7 +3546,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -3557,7 +3557,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -3568,7 +3568,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -3579,7 +3579,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子...",
@@ -3592,7 +3592,7 @@ Array [
"桌子桌子桌子...",
],
"originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -3603,7 +3603,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -3614,7 +3614,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -3625,7 +3625,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -3636,7 +3636,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -3647,7 +3647,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -3658,7 +3658,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -3669,7 +3669,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -3680,7 +3680,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -3691,7 +3691,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -3702,7 +3702,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "236723672361111",
@@ -3710,11 +3710,11 @@ Array [
"actualTextWidth": 100,
"height": 30,
"multiLineActualTexts": Array [
- "236723672361",
- "111",
+ "2367236723611",
+ "11",
],
"originalText": "236723672361111",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "7789778977897789778977897789",
@@ -3722,12 +3722,12 @@ Array [
"actualTextWidth": 189,
"height": 30,
"multiLineActualTexts": Array [
- "778977897789",
- "778977897789",
- "7789",
+ "7789778977897",
+ "7897789778977",
+ "89",
],
"originalText": "7789778977897789778977897789",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "236723672361111",
@@ -3735,11 +3735,11 @@ Array [
"actualTextWidth": 100,
"height": 30,
"multiLineActualTexts": Array [
- "236723672361",
- "111",
+ "2367236723611",
+ "11",
],
"originalText": "236723672361111",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "3877",
@@ -3750,7 +3750,7 @@ Array [
"3877",
],
"originalText": "3877",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "4342",
@@ -3761,7 +3761,7 @@ Array [
"4342",
],
"originalText": "4342",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "5343",
@@ -3772,7 +3772,7 @@ Array [
"5343",
],
"originalText": "5343",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "632",
@@ -3783,7 +3783,7 @@ Array [
"632",
],
"originalText": "632",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "7234",
@@ -3794,7 +3794,7 @@ Array [
"7234",
],
"originalText": "7234",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "834",
@@ -3805,7 +3805,7 @@ Array [
"834",
],
"originalText": "834",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "945",
@@ -3816,7 +3816,7 @@ Array [
"945",
],
"originalText": "945",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1304",
@@ -3827,7 +3827,7 @@ Array [
"1304",
],
"originalText": "1304",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1145",
@@ -3838,7 +3838,7 @@ Array [
"1145",
],
"originalText": "1145",
- "width": 103,
+ "width": 103.8,
},
]
`;
@@ -4018,7 +4018,7 @@ Array [
"省份",
],
"originalText": "省份",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "城市城市城市城市城市城市城...",
@@ -4030,7 +4030,7 @@ Array [
"市城市城市城...",
],
"originalText": "城市城市城市城市城市城市城市城市城市城市城市城市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "类别类别类别类别类别类别类...",
@@ -4042,7 +4042,7 @@ Array [
"别类别类别类...",
],
"originalText": "类别类别类别类别类别类别类别类别类别类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "子类别",
@@ -4053,7 +4053,7 @@ Array [
"子类别",
],
"originalText": "子类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "数量数量数量数量数量数量数...",
@@ -4065,7 +4065,7 @@ Array [
"量数量数量数...",
],
"originalText": "数量数量数量数量数量数量数量数量数量数量数量",
- "width": 103,
+ "width": 103.8,
},
]
`;
@@ -4215,7 +4215,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省浙江省浙江省浙江省浙...",
@@ -4227,7 +4227,7 @@ Array [
"江省浙江省浙...",
],
"originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4238,7 +4238,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4249,7 +4249,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4260,7 +4260,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4271,7 +4271,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4282,7 +4282,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4293,7 +4293,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4304,7 +4304,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4315,7 +4315,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4326,7 +4326,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -4337,7 +4337,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -4348,7 +4348,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市杭州市杭州市杭州市杭...",
@@ -4360,7 +4360,7 @@ Array [
"州市杭州市杭...",
],
"originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -4371,7 +4371,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -4382,7 +4382,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -4393,7 +4393,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市",
@@ -4404,7 +4404,7 @@ Array [
"杭州市",
],
"originalText": "杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -4415,7 +4415,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -4426,7 +4426,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -4437,7 +4437,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市",
@@ -4448,7 +4448,7 @@ Array [
"杭州市",
],
"originalText": "杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -4459,7 +4459,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -4470,7 +4470,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -4481,7 +4481,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具家具家具家具家具家具家...",
@@ -4493,7 +4493,7 @@ Array [
"具家具家具家...",
],
"originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -4504,7 +4504,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -4515,7 +4515,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -4526,7 +4526,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -4537,7 +4537,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -4548,7 +4548,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -4559,7 +4559,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -4570,7 +4570,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -4581,7 +4581,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -4592,7 +4592,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -4603,7 +4603,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -4614,7 +4614,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子桌子桌子桌子桌子桌子桌...",
@@ -4626,7 +4626,7 @@ Array [
"子桌子桌子桌...",
],
"originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -4637,7 +4637,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -4648,7 +4648,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -4659,7 +4659,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -4670,7 +4670,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -4681,7 +4681,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -4692,7 +4692,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -4703,7 +4703,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -4714,7 +4714,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -4725,7 +4725,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -4736,7 +4736,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "236723672361111",
@@ -4744,23 +4744,23 @@ Array [
"actualTextWidth": 100,
"height": 30,
"multiLineActualTexts": Array [
- "236723672361",
- "111",
+ "2367236723611",
+ "11",
],
"originalText": "236723672361111",
- "width": 103,
+ "width": 103.8,
},
Object {
- "actualText": "77897789778977897789778...",
+ "actualText": "778977897789778977897789...",
"actualTextHeight": 30,
- "actualTextWidth": 165,
+ "actualTextWidth": 172,
"height": 30,
"multiLineActualTexts": Array [
- "778977897789",
- "77897789778...",
+ "7789778977897",
+ "78977897789...",
],
"originalText": "7789778977897789778977897789",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "236723672361111",
@@ -4768,11 +4768,11 @@ Array [
"actualTextWidth": 100,
"height": 30,
"multiLineActualTexts": Array [
- "236723672361",
- "111",
+ "2367236723611",
+ "11",
],
"originalText": "236723672361111",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "3877",
@@ -4783,7 +4783,7 @@ Array [
"3877",
],
"originalText": "3877",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "4342",
@@ -4794,7 +4794,7 @@ Array [
"4342",
],
"originalText": "4342",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "5343",
@@ -4805,7 +4805,7 @@ Array [
"5343",
],
"originalText": "5343",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "632",
@@ -4816,7 +4816,7 @@ Array [
"632",
],
"originalText": "632",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "7234",
@@ -4827,7 +4827,7 @@ Array [
"7234",
],
"originalText": "7234",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "834",
@@ -4838,7 +4838,7 @@ Array [
"834",
],
"originalText": "834",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "945",
@@ -4849,7 +4849,7 @@ Array [
"945",
],
"originalText": "945",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1304",
@@ -4860,7 +4860,7 @@ Array [
"1304",
],
"originalText": "1304",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1145",
@@ -4871,7 +4871,7 @@ Array [
"1145",
],
"originalText": "1145",
- "width": 103,
+ "width": 103.8,
},
]
`;
@@ -5062,7 +5062,7 @@ Array [
"省份",
],
"originalText": "省份",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "城市城市城市...",
@@ -5073,7 +5073,7 @@ Array [
"城市城市城市...",
],
"originalText": "城市城市城市城市城市城市城市城市城市城市城市城市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "类别类别类别...",
@@ -5084,7 +5084,7 @@ Array [
"类别类别类别...",
],
"originalText": "类别类别类别类别类别类别类别类别类别类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "子类别",
@@ -5095,7 +5095,7 @@ Array [
"子类别",
],
"originalText": "子类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "数量数量数量...",
@@ -5106,7 +5106,7 @@ Array [
"数量数量数量...",
],
"originalText": "数量数量数量数量数量数量数量数量数量数量数量",
- "width": 103,
+ "width": 103.8,
},
]
`;
@@ -5267,7 +5267,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省浙江省...",
@@ -5278,7 +5278,7 @@ Array [
"浙江省浙江省...",
],
"originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5289,7 +5289,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5300,7 +5300,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5311,7 +5311,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5322,7 +5322,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5333,7 +5333,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5344,7 +5344,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5355,7 +5355,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5366,7 +5366,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5377,7 +5377,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5388,7 +5388,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -5399,7 +5399,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -5410,7 +5410,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市杭州市...",
@@ -5421,7 +5421,7 @@ Array [
"杭州市杭州市...",
],
"originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -5432,7 +5432,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -5443,7 +5443,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -5454,7 +5454,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市",
@@ -5465,7 +5465,7 @@ Array [
"杭州市",
],
"originalText": "杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -5476,7 +5476,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -5487,7 +5487,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -5498,7 +5498,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市",
@@ -5509,7 +5509,7 @@ Array [
"杭州市",
],
"originalText": "杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -5520,7 +5520,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -5531,7 +5531,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -5542,7 +5542,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -5553,7 +5553,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具家具家具...",
@@ -5564,7 +5564,7 @@ Array [
"家具家具家具...",
],
"originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -5575,7 +5575,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -5586,7 +5586,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -5597,7 +5597,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -5608,7 +5608,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -5619,7 +5619,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -5630,7 +5630,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -5641,7 +5641,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -5652,7 +5652,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -5663,7 +5663,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -5674,7 +5674,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -5685,7 +5685,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -5696,7 +5696,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子桌子桌子...",
@@ -5707,7 +5707,7 @@ Array [
"桌子桌子桌子...",
],
"originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -5718,7 +5718,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -5729,7 +5729,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -5740,7 +5740,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -5751,7 +5751,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -5762,7 +5762,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -5773,7 +5773,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -5784,7 +5784,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -5795,7 +5795,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -5806,7 +5806,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -5817,7 +5817,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -5828,7 +5828,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "23672367236...",
@@ -5839,7 +5839,7 @@ Array [
"23672367236...",
],
"originalText": "236723672361111",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "77897789778...",
@@ -5850,7 +5850,7 @@ Array [
"77897789778...",
],
"originalText": "7789778977897789778977897789",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "23672367236...",
@@ -5861,7 +5861,7 @@ Array [
"23672367236...",
],
"originalText": "236723672361111",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "3877",
@@ -5872,7 +5872,7 @@ Array [
"3877",
],
"originalText": "3877",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "4342",
@@ -5883,7 +5883,7 @@ Array [
"4342",
],
"originalText": "4342",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "5343",
@@ -5894,7 +5894,7 @@ Array [
"5343",
],
"originalText": "5343",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "632",
@@ -5905,7 +5905,7 @@ Array [
"632",
],
"originalText": "632",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "7234",
@@ -5916,7 +5916,7 @@ Array [
"7234",
],
"originalText": "7234",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "834",
@@ -5927,7 +5927,7 @@ Array [
"834",
],
"originalText": "834",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "945",
@@ -5938,7 +5938,7 @@ Array [
"945",
],
"originalText": "945",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1304",
@@ -5949,7 +5949,7 @@ Array [
"1304",
],
"originalText": "1304",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1145",
@@ -5960,7 +5960,7 @@ Array [
"1145",
],
"originalText": "1145",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1432",
@@ -5971,7 +5971,7 @@ Array [
"1432",
],
"originalText": "1432",
- "width": 103,
+ "width": 103.8,
},
]
`;
@@ -6217,7 +6217,7 @@ Array [
"省份",
],
"originalText": "省份",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "城市城市城市城市城市城市城...",
@@ -6229,7 +6229,7 @@ Array [
"市城市城市城...",
],
"originalText": "城市城市城市城市城市城市城市城市城市城市城市城市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "类别类别类别类别类别类别类...",
@@ -6241,7 +6241,7 @@ Array [
"别类别类别类...",
],
"originalText": "类别类别类别类别类别类别类别类别类别类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "子类别",
@@ -6252,7 +6252,7 @@ Array [
"子类别",
],
"originalText": "子类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "数量数量数量数量数量数量数...",
@@ -6264,7 +6264,7 @@ Array [
"量数量数量数...",
],
"originalText": "数量数量数量数量数量数量数量数量数量数量数量",
- "width": 103,
+ "width": 103.8,
},
]
`;
@@ -6480,7 +6480,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省浙江省浙江省浙江省浙...",
@@ -6492,7 +6492,7 @@ Array [
"江省浙江省浙...",
],
"originalText": "浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6503,7 +6503,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6514,7 +6514,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6525,7 +6525,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6536,7 +6536,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6547,7 +6547,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6558,7 +6558,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6569,7 +6569,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6580,7 +6580,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6591,7 +6591,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6602,7 +6602,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6613,7 +6613,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6624,7 +6624,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6635,7 +6635,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6646,7 +6646,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "浙江省",
@@ -6657,7 +6657,7 @@ Array [
"浙江省",
],
"originalText": "浙江省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "四川省",
@@ -6668,7 +6668,7 @@ Array [
"四川省",
],
"originalText": "四川省",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -6679,7 +6679,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市杭州市杭州市杭州市杭...",
@@ -6691,7 +6691,7 @@ Array [
"州市杭州市杭...",
],
"originalText": "杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -6702,7 +6702,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -6713,7 +6713,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -6724,7 +6724,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市",
@@ -6735,7 +6735,7 @@ Array [
"杭州市",
],
"originalText": "杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -6746,7 +6746,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -6757,7 +6757,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -6768,7 +6768,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市",
@@ -6779,7 +6779,7 @@ Array [
"杭州市",
],
"originalText": "杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -6790,7 +6790,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -6801,7 +6801,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -6812,7 +6812,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "杭州市",
@@ -6823,7 +6823,7 @@ Array [
"杭州市",
],
"originalText": "杭州市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "绍兴市",
@@ -6834,7 +6834,7 @@ Array [
"绍兴市",
],
"originalText": "绍兴市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "宁波市",
@@ -6845,7 +6845,7 @@ Array [
"宁波市",
],
"originalText": "宁波市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "舟山市",
@@ -6856,7 +6856,7 @@ Array [
"舟山市",
],
"originalText": "舟山市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "成都市",
@@ -6867,7 +6867,7 @@ Array [
"成都市",
],
"originalText": "成都市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -6878,7 +6878,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具家具家具家具家具家具家...",
@@ -6890,7 +6890,7 @@ Array [
"具家具家具家...",
],
"originalText": "家具家具家具家具家具家具家具家具家具家具家具家具家具家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -6901,7 +6901,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -6912,7 +6912,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -6923,7 +6923,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -6934,7 +6934,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -6945,7 +6945,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -6956,7 +6956,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -6967,7 +6967,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -6978,7 +6978,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -6989,7 +6989,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -7000,7 +7000,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -7011,7 +7011,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -7022,7 +7022,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -7033,7 +7033,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -7044,7 +7044,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "办公用品",
@@ -7055,7 +7055,7 @@ Array [
"办公用品",
],
"originalText": "办公用品",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "家具",
@@ -7066,7 +7066,7 @@ Array [
"家具",
],
"originalText": "家具",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -7077,7 +7077,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子桌子桌子桌子桌子桌子桌...",
@@ -7089,7 +7089,7 @@ Array [
"子桌子桌子桌...",
],
"originalText": "桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -7100,7 +7100,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -7111,7 +7111,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -7122,7 +7122,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -7133,7 +7133,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -7144,7 +7144,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -7155,7 +7155,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "沙发",
@@ -7166,7 +7166,7 @@ Array [
"沙发",
],
"originalText": "沙发",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -7177,7 +7177,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -7188,7 +7188,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -7199,7 +7199,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "笔",
@@ -7210,7 +7210,7 @@ Array [
"笔",
],
"originalText": "笔",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "纸张",
@@ -7221,7 +7221,7 @@ Array [
"纸张",
],
"originalText": "纸张",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "纸张",
@@ -7232,7 +7232,7 @@ Array [
"纸张",
],
"originalText": "纸张",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "纸张",
@@ -7243,7 +7243,7 @@ Array [
"纸张",
],
"originalText": "纸张",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "纸张",
@@ -7254,7 +7254,7 @@ Array [
"纸张",
],
"originalText": "纸张",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "桌子",
@@ -7265,7 +7265,7 @@ Array [
"桌子",
],
"originalText": "桌子",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "236723672361111",
@@ -7273,23 +7273,23 @@ Array [
"actualTextWidth": 100,
"height": 20,
"multiLineActualTexts": Array [
- "236723672361",
- "111",
+ "2367236723611",
+ "11",
],
"originalText": "236723672361111",
- "width": 103,
+ "width": 103.8,
},
Object {
- "actualText": "77897789778977897789778...",
+ "actualText": "778977897789778977897789...",
"actualTextHeight": 30,
- "actualTextWidth": 165,
+ "actualTextWidth": 172,
"height": 20,
"multiLineActualTexts": Array [
- "778977897789",
- "77897789778...",
+ "7789778977897",
+ "78977897789...",
],
"originalText": "7789778977897789778977897789",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "236723672361111",
@@ -7297,11 +7297,11 @@ Array [
"actualTextWidth": 100,
"height": 20,
"multiLineActualTexts": Array [
- "236723672361",
- "111",
+ "2367236723611",
+ "11",
],
"originalText": "236723672361111",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "3877",
@@ -7312,7 +7312,7 @@ Array [
"3877",
],
"originalText": "3877",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "4342",
@@ -7323,7 +7323,7 @@ Array [
"4342",
],
"originalText": "4342",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "5343",
@@ -7334,7 +7334,7 @@ Array [
"5343",
],
"originalText": "5343",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "632",
@@ -7345,7 +7345,7 @@ Array [
"632",
],
"originalText": "632",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "7234",
@@ -7356,7 +7356,7 @@ Array [
"7234",
],
"originalText": "7234",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "834",
@@ -7367,7 +7367,7 @@ Array [
"834",
],
"originalText": "834",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "945",
@@ -7378,7 +7378,7 @@ Array [
"945",
],
"originalText": "945",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1304",
@@ -7389,7 +7389,7 @@ Array [
"1304",
],
"originalText": "1304",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1145",
@@ -7400,7 +7400,7 @@ Array [
"1145",
],
"originalText": "1145",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1432",
@@ -7411,7 +7411,7 @@ Array [
"1432",
],
"originalText": "1432",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1343",
@@ -7422,7 +7422,7 @@ Array [
"1343",
],
"originalText": "1343",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1354",
@@ -7433,7 +7433,7 @@ Array [
"1354",
],
"originalText": "1354",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1523",
@@ -7444,7 +7444,7 @@ Array [
"1523",
],
"originalText": "1523",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1634",
@@ -7455,7 +7455,7 @@ Array [
"1634",
],
"originalText": "1634",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "1723",
@@ -7466,7 +7466,7 @@ Array [
"1723",
],
"originalText": "1723",
- "width": 103,
+ "width": 103.8,
},
]
`;
@@ -7493,7 +7493,7 @@ Array [
"省份",
],
"originalText": "省份",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "城市城市城市城市城市城市城...",
@@ -7505,7 +7505,7 @@ Array [
"市城市城市城...",
],
"originalText": "城市城市城市城市城市城市城市城市城市城市城市城市",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "类别类别类别类别类别类别类...",
@@ -7517,7 +7517,7 @@ Array [
"别类别类别类...",
],
"originalText": "类别类别类别类别类别类别类别类别类别类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "子类别",
@@ -7528,7 +7528,7 @@ Array [
"子类别",
],
"originalText": "子类别",
- "width": 103,
+ "width": 103.8,
},
Object {
"actualText": "数量数量数量数量数量数量数...",
@@ -7540,7 +7540,7 @@ Array [
"量数量数量数...",
],
"originalText": "数量数量数量数量数量数量数量数量数量数量数量",
- "width": 103,
+ "width": 103.8,
},
]
`;
diff --git a/packages/s2-core/__tests__/spreadsheet/__snapshots__/spread-sheet-resize-spec.ts.snap b/packages/s2-core/__tests__/spreadsheet/__snapshots__/spread-sheet-resize-spec.ts.snap
new file mode 100644
index 0000000000..fc3bf7f405
--- /dev/null
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/spread-sheet-resize-spec.ts.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SpreadSheet Resize Active Tests should render correctly layout when tree row width is invalid number 1`] = `
+Array [
+ Object {
+ "height": 30,
+ "id": "root[&]浙江",
+ "width": 120,
+ },
+ Object {
+ "height": 30,
+ "id": "root[&]浙江[&]义乌",
+ "width": 120,
+ },
+ Object {
+ "height": 30,
+ "id": "root[&]浙江[&]杭州",
+ "width": 120,
+ },
+]
+`;
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 309bd54147..81c158e752 100644
--- a/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap
+++ b/packages/s2-core/__tests__/spreadsheet/__snapshots__/theme-spec.ts.snap
@@ -22,6 +22,7 @@ Object {
"cell": Object {
"backgroundColor": "#3471F9",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#5286FA",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -106,7 +107,7 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "left",
+ "textAlign": "right",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
@@ -114,6 +115,7 @@ Object {
"cell": Object {
"backgroundColor": "#3471F9",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#5286FA",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -142,7 +144,7 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "right",
+ "textAlign": "left",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
@@ -448,6 +450,7 @@ Object {
"cell": Object {
"backgroundColor": "#F5F8FF",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#E1EAFE",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -549,6 +552,7 @@ Object {
"trackColor": "rgba(0,0,0,0.01)",
},
"splitLine": Object {
+ "borderDash": Array [],
"horizontalBorderColor": "#3471F9",
"horizontalBorderColorOpacity": 0.2,
"horizontalBorderWidth": 2,
@@ -587,6 +591,7 @@ Object {
"cell": Object {
"backgroundColor": "#133aad",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#0647b1",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -671,7 +676,7 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "left",
+ "textAlign": "right",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
@@ -679,6 +684,7 @@ Object {
"cell": Object {
"backgroundColor": "#133aad",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#0647b1",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -707,7 +713,7 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "right",
+ "textAlign": "left",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
@@ -1013,6 +1019,7 @@ Object {
"cell": Object {
"backgroundColor": "#151a27",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#1e2436",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -1114,6 +1121,7 @@ Object {
"trackColor": "rgba(0,0,0,0.01)",
},
"splitLine": Object {
+ "borderDash": Array [],
"horizontalBorderColor": "#7899ff",
"horizontalBorderColorOpacity": 0.2,
"horizontalBorderWidth": 2,
@@ -1152,6 +1160,7 @@ Object {
"cell": Object {
"backgroundColor": "#E0E9FD",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#CCDBFC",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -1236,7 +1245,7 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "left",
+ "textAlign": "right",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
@@ -1244,6 +1253,7 @@ Object {
"cell": Object {
"backgroundColor": "#E0E9FD",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#CCDBFC",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -1272,7 +1282,7 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "right",
+ "textAlign": "left",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
@@ -1578,6 +1588,7 @@ Object {
"cell": Object {
"backgroundColor": "#F5F8FE",
"backgroundColorOpacity": 1,
+ "borderDash": Array [],
"horizontalBorderColor": "#E0E9FD",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
@@ -1679,6 +1690,7 @@ Object {
"trackColor": "rgba(0,0,0,0.01)",
},
"splitLine": Object {
+ "borderDash": Array [],
"horizontalBorderColor": "#326EF4",
"horizontalBorderColorOpacity": 0.2,
"horizontalBorderWidth": 2,
@@ -1695,7 +1707,7 @@ Object {
}
`;
-exports[`SpreadSheet Theme Tests Theme Default Value Tests should get default theme 2`] = `
+exports[`SpreadSheet Theme Tests Theme Default Value Tests should get gray theme 1`] = `
Object {
"background": Object {
"color": "#FFFFFF",
@@ -1715,9 +1727,10 @@ Object {
"wordWrap": true,
},
"cell": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundColorOpacity": 1,
- "horizontalBorderColor": "#CCDBFC",
+ "borderDash": Array [],
+ "horizontalBorderColor": "#E7E9ED",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"interactionState": Object {
@@ -1726,7 +1739,7 @@ Object {
"backgroundOpacity": 1,
},
"hover": Object {
- "backgroundColor": "#CCDBFC",
+ "backgroundColor": "#E7E9ED",
"backgroundOpacity": 0.6,
},
"prepareSelect": Object {
@@ -1739,7 +1752,7 @@ Object {
"backgroundOpacity": 1,
},
"selected": Object {
- "backgroundColor": "#CCDBFC",
+ "backgroundColor": "#E7E9ED",
"backgroundOpacity": 0.6,
},
"unselected": Object {
@@ -1754,7 +1767,7 @@ Object {
"right": 8,
"top": 4,
},
- "verticalBorderColor": "#CCDBFC",
+ "verticalBorderColor": "#E7E9ED",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -1801,15 +1814,16 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "left",
+ "textAlign": "right",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
},
"cell": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundColorOpacity": 1,
- "horizontalBorderColor": "#CCDBFC",
+ "borderDash": Array [],
+ "horizontalBorderColor": "#E7E9ED",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"padding": Object {
@@ -1818,7 +1832,7 @@ Object {
"right": 8,
"top": 4,
},
- "verticalBorderColor": "#CCDBFC",
+ "verticalBorderColor": "#E7E9ED",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -1837,7 +1851,7 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "right",
+ "textAlign": "left",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
@@ -1849,7 +1863,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": 700,
- "linkTextFill": "#326EF4",
+ "linkTextFill": "#565C64",
"maxLines": 1,
"opacity": 1,
"textAlign": "right",
@@ -1860,8 +1874,8 @@ Object {
"cell": Object {
"backgroundColor": "#FFFFFF",
"backgroundColorOpacity": 1,
- "crossBackgroundColor": "#F5F8FE",
- "horizontalBorderColor": "#E0E9FD",
+ "crossBackgroundColor": "#FAFBFB",
+ "horizontalBorderColor": "#F0F2F4",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"interactionState": Object {
@@ -1870,11 +1884,11 @@ Object {
"backgroundOpacity": 1,
},
"hover": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundOpacity": 0.6,
},
"hoverFocus": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundOpacity": 0.6,
"borderColor": "#000000",
"borderOpacity": 1,
@@ -1890,7 +1904,7 @@ Object {
"backgroundOpacity": 1,
},
"selected": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundOpacity": 0.6,
},
"unselected": Object {
@@ -1905,7 +1919,7 @@ Object {
"right": 8,
"top": 8,
},
- "verticalBorderColor": "#E0E9FD",
+ "verticalBorderColor": "#F0F2F4",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -1919,7 +1933,7 @@ Object {
},
"miniChart": Object {
"bar": Object {
- "fill": "#326EF4",
+ "fill": "#565C64",
"intervalPadding": 4,
"opacity": 1,
},
@@ -1943,17 +1957,17 @@ Object {
},
},
"interval": Object {
- "fill": "#326EF4",
+ "fill": "#9DA7B6",
"height": 12,
},
"line": Object {
"linkLine": Object {
- "fill": "#326EF4",
+ "fill": "#565C64",
"opacity": 0.6,
"size": 1.5,
},
"point": Object {
- "fill": "#326EF4",
+ "fill": "#565C64",
"opacity": 1,
"size": 2.2,
},
@@ -1964,7 +1978,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#326EF4",
+ "linkTextFill": "#565C64",
"maxLines": 1,
"opacity": 1,
"textAlign": "right",
@@ -1979,7 +1993,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": 700,
- "linkTextFill": "#326EF4",
+ "linkTextFill": "#565C64",
"maxLines": 1,
"opacity": 1,
"textAlign": "right",
@@ -1990,8 +2004,8 @@ Object {
"cell": Object {
"backgroundColor": "#FFFFFF",
"backgroundColorOpacity": 1,
- "crossBackgroundColor": "#F5F8FE",
- "horizontalBorderColor": "#E0E9FD",
+ "crossBackgroundColor": "#FAFBFB",
+ "horizontalBorderColor": "#F0F2F4",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"interactionState": Object {
@@ -2000,11 +2014,11 @@ Object {
"backgroundOpacity": 1,
},
"hover": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundOpacity": 0.6,
},
"hoverFocus": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundOpacity": 0.6,
"borderColor": "#000000",
"borderOpacity": 1,
@@ -2020,7 +2034,7 @@ Object {
"backgroundOpacity": 1,
},
"selected": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundOpacity": 0.6,
},
"unselected": Object {
@@ -2035,7 +2049,7 @@ Object {
"right": 8,
"top": 8,
},
- "verticalBorderColor": "#E0E9FD",
+ "verticalBorderColor": "#F0F2F4",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -2049,7 +2063,7 @@ Object {
},
"miniChart": Object {
"bar": Object {
- "fill": "#326EF4",
+ "fill": "#565C64",
"intervalPadding": 4,
"opacity": 1,
},
@@ -2073,17 +2087,17 @@ Object {
},
},
"interval": Object {
- "fill": "#326EF4",
+ "fill": "#9DA7B6",
"height": 12,
},
"line": Object {
"linkLine": Object {
- "fill": "#326EF4",
+ "fill": "#565C64",
"opacity": 0.6,
"size": 1.5,
},
"point": Object {
- "fill": "#326EF4",
+ "fill": "#565C64",
"opacity": 1,
"size": 2.2,
},
@@ -2094,7 +2108,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#326EF4",
+ "linkTextFill": "#565C64",
"maxLines": 1,
"opacity": 1,
"textAlign": "right",
@@ -2104,13 +2118,13 @@ Object {
},
},
"prepareSelectMask": Object {
- "backgroundColor": "#234DAB",
+ "backgroundColor": "#6E757F",
"backgroundOpacity": 0.3,
},
"resizeArea": Object {
- "background": "#326EF4",
+ "background": "#9DA7B6",
"backgroundOpacity": 0,
- "guideLineColor": "#326EF4",
+ "guideLineColor": "#9DA7B6",
"guideLineDash": Array [
3,
3,
@@ -2118,7 +2132,7 @@ Object {
"guideLineDisableColor": "rgba(0,0,0,0.25)",
"interactionState": Object {
"hover": Object {
- "backgroundColor": "#326EF4",
+ "backgroundColor": "#9DA7B6",
"backgroundOpacity": 1,
},
},
@@ -2132,7 +2146,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": 700,
- "linkTextFill": "#326EF4",
+ "linkTextFill": "#565C64",
"maxLines": 1,
"opacity": 1,
"textAlign": "left",
@@ -2141,9 +2155,10 @@ Object {
"wordWrap": true,
},
"cell": Object {
- "backgroundColor": "#F5F8FE",
+ "backgroundColor": "#FAFBFB",
"backgroundColorOpacity": 1,
- "horizontalBorderColor": "#E0E9FD",
+ "borderDash": Array [],
+ "horizontalBorderColor": "#F0F2F4",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"interactionState": Object {
@@ -2152,7 +2167,7 @@ Object {
"backgroundOpacity": 1,
},
"hover": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundOpacity": 0.6,
},
"prepareSelect": Object {
@@ -2165,7 +2180,7 @@ Object {
"backgroundOpacity": 1,
},
"selected": Object {
- "backgroundColor": "#E0E9FD",
+ "backgroundColor": "#F0F2F4",
"backgroundOpacity": 0.6,
},
"unselected": Object {
@@ -2180,7 +2195,7 @@ Object {
"right": 8,
"top": 4,
},
- "verticalBorderColor": "#E0E9FD",
+ "verticalBorderColor": "#F0F2F4",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -2197,7 +2212,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#326EF4",
+ "linkTextFill": "#565C64",
"maxLines": 1,
"opacity": 1,
"textAlign": "left",
@@ -2211,7 +2226,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#326EF4",
+ "linkTextFill": "#565C64",
"maxLines": 1,
"opacity": 1,
"textAlign": "center",
@@ -2224,7 +2239,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#326EF4",
+ "linkTextFill": "#565C64",
"maxLines": 1,
"opacity": 1,
"textAlign": "left",
@@ -2244,7 +2259,8 @@ Object {
"trackColor": "rgba(0,0,0,0.01)",
},
"splitLine": Object {
- "horizontalBorderColor": "#326EF4",
+ "borderDash": Array [],
+ "horizontalBorderColor": "#BAC1CC",
"horizontalBorderColorOpacity": 0.2,
"horizontalBorderWidth": 2,
"shadowColors": Object {
@@ -2253,14 +2269,14 @@ Object {
},
"shadowWidth": 8,
"showShadow": true,
- "verticalBorderColor": "#326EF4",
+ "verticalBorderColor": "#BAC1CC",
"verticalBorderColorOpacity": 0.25,
"verticalBorderWidth": 2,
},
}
`;
-exports[`SpreadSheet Theme Tests Theme Default Value Tests should get gray theme 1`] = `
+exports[`SpreadSheet Theme Tests Theme Default Value Tests should get pivot sheet default theme 1`] = `
Object {
"background": Object {
"color": "#FFFFFF",
@@ -2280,9 +2296,10 @@ Object {
"wordWrap": true,
},
"cell": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundColorOpacity": 1,
- "horizontalBorderColor": "#E7E9ED",
+ "borderDash": Array [],
+ "horizontalBorderColor": "#CCDBFC",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"interactionState": Object {
@@ -2291,7 +2308,7 @@ Object {
"backgroundOpacity": 1,
},
"hover": Object {
- "backgroundColor": "#E7E9ED",
+ "backgroundColor": "#CCDBFC",
"backgroundOpacity": 0.6,
},
"prepareSelect": Object {
@@ -2304,7 +2321,7 @@ Object {
"backgroundOpacity": 1,
},
"selected": Object {
- "backgroundColor": "#E7E9ED",
+ "backgroundColor": "#CCDBFC",
"backgroundOpacity": 0.6,
},
"unselected": Object {
@@ -2319,7 +2336,7 @@ Object {
"right": 8,
"top": 4,
},
- "verticalBorderColor": "#E7E9ED",
+ "verticalBorderColor": "#CCDBFC",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -2366,15 +2383,16 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "left",
+ "textAlign": "right",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
},
"cell": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundColorOpacity": 1,
- "horizontalBorderColor": "#E7E9ED",
+ "borderDash": Array [],
+ "horizontalBorderColor": "#CCDBFC",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"padding": Object {
@@ -2383,7 +2401,7 @@ Object {
"right": 8,
"top": 4,
},
- "verticalBorderColor": "#E7E9ED",
+ "verticalBorderColor": "#CCDBFC",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -2402,7 +2420,7 @@ Object {
"fontWeight": 700,
"maxLines": 1,
"opacity": 1,
- "textAlign": "right",
+ "textAlign": "left",
"textBaseline": "middle",
"textOverflow": "ellipsis",
"wordWrap": true,
@@ -2414,7 +2432,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": 700,
- "linkTextFill": "#565C64",
+ "linkTextFill": "#326EF4",
"maxLines": 1,
"opacity": 1,
"textAlign": "right",
@@ -2425,8 +2443,8 @@ Object {
"cell": Object {
"backgroundColor": "#FFFFFF",
"backgroundColorOpacity": 1,
- "crossBackgroundColor": "#FAFBFB",
- "horizontalBorderColor": "#F0F2F4",
+ "crossBackgroundColor": "#F5F8FE",
+ "horizontalBorderColor": "#E0E9FD",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"interactionState": Object {
@@ -2435,11 +2453,11 @@ Object {
"backgroundOpacity": 1,
},
"hover": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundOpacity": 0.6,
},
"hoverFocus": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundOpacity": 0.6,
"borderColor": "#000000",
"borderOpacity": 1,
@@ -2455,7 +2473,7 @@ Object {
"backgroundOpacity": 1,
},
"selected": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundOpacity": 0.6,
},
"unselected": Object {
@@ -2470,7 +2488,7 @@ Object {
"right": 8,
"top": 8,
},
- "verticalBorderColor": "#F0F2F4",
+ "verticalBorderColor": "#E0E9FD",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -2484,7 +2502,7 @@ Object {
},
"miniChart": Object {
"bar": Object {
- "fill": "#565C64",
+ "fill": "#326EF4",
"intervalPadding": 4,
"opacity": 1,
},
@@ -2508,17 +2526,17 @@ Object {
},
},
"interval": Object {
- "fill": "#9DA7B6",
+ "fill": "#326EF4",
"height": 12,
},
"line": Object {
"linkLine": Object {
- "fill": "#565C64",
+ "fill": "#326EF4",
"opacity": 0.6,
"size": 1.5,
},
"point": Object {
- "fill": "#565C64",
+ "fill": "#326EF4",
"opacity": 1,
"size": 2.2,
},
@@ -2529,7 +2547,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#565C64",
+ "linkTextFill": "#326EF4",
"maxLines": 1,
"opacity": 1,
"textAlign": "right",
@@ -2544,7 +2562,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": 700,
- "linkTextFill": "#565C64",
+ "linkTextFill": "#326EF4",
"maxLines": 1,
"opacity": 1,
"textAlign": "right",
@@ -2555,8 +2573,8 @@ Object {
"cell": Object {
"backgroundColor": "#FFFFFF",
"backgroundColorOpacity": 1,
- "crossBackgroundColor": "#FAFBFB",
- "horizontalBorderColor": "#F0F2F4",
+ "crossBackgroundColor": "#F5F8FE",
+ "horizontalBorderColor": "#E0E9FD",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"interactionState": Object {
@@ -2565,11 +2583,11 @@ Object {
"backgroundOpacity": 1,
},
"hover": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundOpacity": 0.6,
},
"hoverFocus": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundOpacity": 0.6,
"borderColor": "#000000",
"borderOpacity": 1,
@@ -2585,7 +2603,7 @@ Object {
"backgroundOpacity": 1,
},
"selected": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundOpacity": 0.6,
},
"unselected": Object {
@@ -2600,7 +2618,7 @@ Object {
"right": 8,
"top": 8,
},
- "verticalBorderColor": "#F0F2F4",
+ "verticalBorderColor": "#E0E9FD",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -2614,7 +2632,7 @@ Object {
},
"miniChart": Object {
"bar": Object {
- "fill": "#565C64",
+ "fill": "#326EF4",
"intervalPadding": 4,
"opacity": 1,
},
@@ -2638,17 +2656,17 @@ Object {
},
},
"interval": Object {
- "fill": "#9DA7B6",
+ "fill": "#326EF4",
"height": 12,
},
"line": Object {
"linkLine": Object {
- "fill": "#565C64",
+ "fill": "#326EF4",
"opacity": 0.6,
"size": 1.5,
},
"point": Object {
- "fill": "#565C64",
+ "fill": "#326EF4",
"opacity": 1,
"size": 2.2,
},
@@ -2659,7 +2677,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#565C64",
+ "linkTextFill": "#326EF4",
"maxLines": 1,
"opacity": 1,
"textAlign": "right",
@@ -2669,13 +2687,13 @@ Object {
},
},
"prepareSelectMask": Object {
- "backgroundColor": "#6E757F",
+ "backgroundColor": "#234DAB",
"backgroundOpacity": 0.3,
},
"resizeArea": Object {
- "background": "#9DA7B6",
+ "background": "#326EF4",
"backgroundOpacity": 0,
- "guideLineColor": "#9DA7B6",
+ "guideLineColor": "#326EF4",
"guideLineDash": Array [
3,
3,
@@ -2683,7 +2701,7 @@ Object {
"guideLineDisableColor": "rgba(0,0,0,0.25)",
"interactionState": Object {
"hover": Object {
- "backgroundColor": "#9DA7B6",
+ "backgroundColor": "#326EF4",
"backgroundOpacity": 1,
},
},
@@ -2697,7 +2715,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": 700,
- "linkTextFill": "#565C64",
+ "linkTextFill": "#326EF4",
"maxLines": 1,
"opacity": 1,
"textAlign": "left",
@@ -2706,9 +2724,10 @@ Object {
"wordWrap": true,
},
"cell": Object {
- "backgroundColor": "#FAFBFB",
+ "backgroundColor": "#F5F8FE",
"backgroundColorOpacity": 1,
- "horizontalBorderColor": "#F0F2F4",
+ "borderDash": Array [],
+ "horizontalBorderColor": "#E0E9FD",
"horizontalBorderColorOpacity": 1,
"horizontalBorderWidth": 1,
"interactionState": Object {
@@ -2717,7 +2736,7 @@ Object {
"backgroundOpacity": 1,
},
"hover": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundOpacity": 0.6,
},
"prepareSelect": Object {
@@ -2730,7 +2749,7 @@ Object {
"backgroundOpacity": 1,
},
"selected": Object {
- "backgroundColor": "#F0F2F4",
+ "backgroundColor": "#E0E9FD",
"backgroundOpacity": 0.6,
},
"unselected": Object {
@@ -2745,7 +2764,7 @@ Object {
"right": 8,
"top": 4,
},
- "verticalBorderColor": "#F0F2F4",
+ "verticalBorderColor": "#E0E9FD",
"verticalBorderColorOpacity": 1,
"verticalBorderWidth": 1,
},
@@ -2762,7 +2781,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#565C64",
+ "linkTextFill": "#326EF4",
"maxLines": 1,
"opacity": 1,
"textAlign": "left",
@@ -2776,7 +2795,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#565C64",
+ "linkTextFill": "#326EF4",
"maxLines": 1,
"opacity": 1,
"textAlign": "center",
@@ -2789,7 +2808,7 @@ Object {
"fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
"fontSize": 12,
"fontWeight": "normal",
- "linkTextFill": "#565C64",
+ "linkTextFill": "#326EF4",
"maxLines": 1,
"opacity": 1,
"textAlign": "left",
@@ -2809,7 +2828,8 @@ Object {
"trackColor": "rgba(0,0,0,0.01)",
},
"splitLine": Object {
- "horizontalBorderColor": "#BAC1CC",
+ "borderDash": Array [],
+ "horizontalBorderColor": "#326EF4",
"horizontalBorderColorOpacity": 0.2,
"horizontalBorderWidth": 2,
"shadowColors": Object {
@@ -2818,7 +2838,576 @@ Object {
},
"shadowWidth": 8,
"showShadow": true,
- "verticalBorderColor": "#BAC1CC",
+ "verticalBorderColor": "#326EF4",
+ "verticalBorderColorOpacity": 0.25,
+ "verticalBorderWidth": 2,
+ },
+}
+`;
+
+exports[`SpreadSheet Theme Tests Theme Default Value Tests should get table sheet theme 1`] = `
+Object {
+ "background": Object {
+ "color": "#FFFFFF",
+ "opacity": 1,
+ },
+ "colCell": Object {
+ "bolderText": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": 700,
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "center",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ "cell": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundColorOpacity": 1,
+ "borderDash": Array [],
+ "horizontalBorderColor": "#CCDBFC",
+ "horizontalBorderColorOpacity": 1,
+ "horizontalBorderWidth": 1,
+ "interactionState": Object {
+ "highlight": Object {
+ "backgroundColor": "#87B5FF",
+ "backgroundOpacity": 1,
+ },
+ "hover": Object {
+ "backgroundColor": "#CCDBFC",
+ "backgroundOpacity": 0.6,
+ },
+ "prepareSelect": Object {
+ "borderColor": "#000000",
+ "borderOpacity": 1,
+ "borderWidth": 1,
+ },
+ "searchResult": Object {
+ "backgroundColor": "#F0F7FF",
+ "backgroundOpacity": 1,
+ },
+ "selected": Object {
+ "backgroundColor": "#CCDBFC",
+ "backgroundOpacity": 0.6,
+ },
+ "unselected": Object {
+ "backgroundOpacity": 0.3,
+ "opacity": 0.3,
+ "textOpacity": 0.3,
+ },
+ },
+ "padding": Object {
+ "bottom": 4,
+ "left": 8,
+ "right": 8,
+ "top": 4,
+ },
+ "verticalBorderColor": "#CCDBFC",
+ "verticalBorderColorOpacity": 1,
+ "verticalBorderWidth": 1,
+ },
+ "icon": Object {
+ "fill": "#000000",
+ "margin": Object {
+ "bottom": 6,
+ "left": 4,
+ "right": 4,
+ "top": 6,
+ },
+ "size": 10,
+ },
+ "measureText": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": "normal",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "right",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ "text": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": "normal",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "center",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ },
+ "cornerCell": Object {
+ "bolderText": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": 700,
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "center",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ "cell": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundColorOpacity": 1,
+ "borderDash": Array [],
+ "horizontalBorderColor": "#CCDBFC",
+ "horizontalBorderColorOpacity": 1,
+ "horizontalBorderWidth": 1,
+ "padding": Object {
+ "bottom": 4,
+ "left": 8,
+ "right": 8,
+ "top": 4,
+ },
+ "verticalBorderColor": "#CCDBFC",
+ "verticalBorderColorOpacity": 1,
+ "verticalBorderWidth": 1,
+ },
+ "icon": Object {
+ "fill": "#000000",
+ "margin": Object {
+ "left": 4,
+ "right": 4,
+ },
+ "size": 10,
+ },
+ "text": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": 700,
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "center",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ },
+ "dataCell": Object {
+ "bolderText": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": 700,
+ "linkTextFill": "#326EF4",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "right",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ "cell": Object {
+ "backgroundColor": "#FFFFFF",
+ "backgroundColorOpacity": 1,
+ "crossBackgroundColor": "#F5F8FE",
+ "horizontalBorderColor": "#E0E9FD",
+ "horizontalBorderColorOpacity": 1,
+ "horizontalBorderWidth": 1,
+ "interactionState": Object {
+ "highlight": Object {
+ "backgroundColor": "#87B5FF",
+ "backgroundOpacity": 1,
+ },
+ "hover": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundOpacity": 0.6,
+ },
+ "hoverFocus": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundOpacity": 0.6,
+ "borderColor": "#000000",
+ "borderOpacity": 1,
+ "borderWidth": 1,
+ },
+ "prepareSelect": Object {
+ "borderColor": "#000000",
+ "borderOpacity": 1,
+ "borderWidth": 1,
+ },
+ "searchResult": Object {
+ "backgroundColor": "#F0F7FF",
+ "backgroundOpacity": 1,
+ },
+ "selected": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundOpacity": 0.6,
+ },
+ "unselected": Object {
+ "backgroundOpacity": 0.3,
+ "opacity": 0.3,
+ "textOpacity": 0.3,
+ },
+ },
+ "padding": Object {
+ "bottom": 8,
+ "left": 8,
+ "right": 8,
+ "top": 8,
+ },
+ "verticalBorderColor": "#E0E9FD",
+ "verticalBorderColorOpacity": 1,
+ "verticalBorderWidth": 1,
+ },
+ "icon": Object {
+ "fill": "#000000",
+ "margin": Object {
+ "left": 4,
+ "right": 4,
+ },
+ "size": 10,
+ },
+ "miniChart": Object {
+ "bar": Object {
+ "fill": "#326EF4",
+ "intervalPadding": 4,
+ "opacity": 1,
+ },
+ "bullet": Object {
+ "backgroundColor": "#E9E9E9",
+ "comparativeMeasure": Object {
+ "fill": "#000000",
+ "height": 12,
+ "opacity": 0.25,
+ "width": 1,
+ },
+ "progressBar": Object {
+ "height": 10,
+ "innerHeight": 6,
+ "widthPercent": 0.6,
+ },
+ "rangeColors": Object {
+ "bad": "#FF4D4F",
+ "good": "#29A294",
+ "satisfactory": "#FAAD14",
+ },
+ },
+ "interval": Object {
+ "fill": "#326EF4",
+ "height": 12,
+ },
+ "line": Object {
+ "linkLine": Object {
+ "fill": "#326EF4",
+ "opacity": 0.6,
+ "size": 1.5,
+ },
+ "point": Object {
+ "fill": "#326EF4",
+ "opacity": 1,
+ "size": 2.2,
+ },
+ },
+ },
+ "text": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": "normal",
+ "linkTextFill": "#326EF4",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "right",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ },
+ "mergedCell": Object {
+ "bolderText": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": 700,
+ "linkTextFill": "#326EF4",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "right",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ "cell": Object {
+ "backgroundColor": "#FFFFFF",
+ "backgroundColorOpacity": 1,
+ "crossBackgroundColor": "#F5F8FE",
+ "horizontalBorderColor": "#E0E9FD",
+ "horizontalBorderColorOpacity": 1,
+ "horizontalBorderWidth": 1,
+ "interactionState": Object {
+ "highlight": Object {
+ "backgroundColor": "#87B5FF",
+ "backgroundOpacity": 1,
+ },
+ "hover": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundOpacity": 0.6,
+ },
+ "hoverFocus": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundOpacity": 0.6,
+ "borderColor": "#000000",
+ "borderOpacity": 1,
+ "borderWidth": 1,
+ },
+ "prepareSelect": Object {
+ "borderColor": "#000000",
+ "borderOpacity": 1,
+ "borderWidth": 1,
+ },
+ "searchResult": Object {
+ "backgroundColor": "#F0F7FF",
+ "backgroundOpacity": 1,
+ },
+ "selected": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundOpacity": 0.6,
+ },
+ "unselected": Object {
+ "backgroundOpacity": 0.3,
+ "opacity": 0.3,
+ "textOpacity": 0.3,
+ },
+ },
+ "padding": Object {
+ "bottom": 8,
+ "left": 8,
+ "right": 8,
+ "top": 8,
+ },
+ "verticalBorderColor": "#E0E9FD",
+ "verticalBorderColorOpacity": 1,
+ "verticalBorderWidth": 1,
+ },
+ "icon": Object {
+ "fill": "#000000",
+ "margin": Object {
+ "left": 4,
+ "right": 4,
+ },
+ "size": 10,
+ },
+ "miniChart": Object {
+ "bar": Object {
+ "fill": "#326EF4",
+ "intervalPadding": 4,
+ "opacity": 1,
+ },
+ "bullet": Object {
+ "backgroundColor": "#E9E9E9",
+ "comparativeMeasure": Object {
+ "fill": "#000000",
+ "height": 12,
+ "opacity": 0.25,
+ "width": 1,
+ },
+ "progressBar": Object {
+ "height": 10,
+ "innerHeight": 6,
+ "widthPercent": 0.6,
+ },
+ "rangeColors": Object {
+ "bad": "#FF4D4F",
+ "good": "#29A294",
+ "satisfactory": "#FAAD14",
+ },
+ },
+ "interval": Object {
+ "fill": "#326EF4",
+ "height": 12,
+ },
+ "line": Object {
+ "linkLine": Object {
+ "fill": "#326EF4",
+ "opacity": 0.6,
+ "size": 1.5,
+ },
+ "point": Object {
+ "fill": "#326EF4",
+ "opacity": 1,
+ "size": 2.2,
+ },
+ },
+ },
+ "text": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": "normal",
+ "linkTextFill": "#326EF4",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "right",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ },
+ "prepareSelectMask": Object {
+ "backgroundColor": "#234DAB",
+ "backgroundOpacity": 0.3,
+ },
+ "resizeArea": Object {
+ "background": "#326EF4",
+ "backgroundOpacity": 0,
+ "guideLineColor": "#326EF4",
+ "guideLineDash": Array [
+ 3,
+ 3,
+ ],
+ "guideLineDisableColor": "rgba(0,0,0,0.25)",
+ "interactionState": Object {
+ "hover": Object {
+ "backgroundColor": "#326EF4",
+ "backgroundOpacity": 1,
+ },
+ },
+ "minCellHeight": 40,
+ "minCellWidth": 42,
+ "size": 3,
+ },
+ "rowCell": Object {
+ "bolderText": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": 700,
+ "linkTextFill": "#326EF4",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "center",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ "cell": Object {
+ "backgroundColor": "#F5F8FE",
+ "backgroundColorOpacity": 1,
+ "borderDash": Array [],
+ "horizontalBorderColor": "#E0E9FD",
+ "horizontalBorderColorOpacity": 1,
+ "horizontalBorderWidth": 1,
+ "interactionState": Object {
+ "highlight": Object {
+ "backgroundColor": "#87B5FF",
+ "backgroundOpacity": 1,
+ },
+ "hover": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundOpacity": 0.6,
+ },
+ "prepareSelect": Object {
+ "borderColor": "#000000",
+ "borderOpacity": 1,
+ "borderWidth": 1,
+ },
+ "searchResult": Object {
+ "backgroundColor": "#F0F7FF",
+ "backgroundOpacity": 1,
+ },
+ "selected": Object {
+ "backgroundColor": "#E0E9FD",
+ "backgroundOpacity": 0.6,
+ },
+ "unselected": Object {
+ "backgroundOpacity": 0.3,
+ "opacity": 0.3,
+ "textOpacity": 0.3,
+ },
+ },
+ "padding": Object {
+ "bottom": 4,
+ "left": 8,
+ "right": 8,
+ "top": 4,
+ },
+ "verticalBorderColor": "#E0E9FD",
+ "verticalBorderColorOpacity": 1,
+ "verticalBorderWidth": 1,
+ },
+ "icon": Object {
+ "fill": "#000000",
+ "margin": Object {
+ "left": 4,
+ "right": 4,
+ },
+ "size": 10,
+ },
+ "measureText": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": "normal",
+ "linkTextFill": "#326EF4",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "center",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ "seriesNumberWidth": 80,
+ "seriesText": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": "normal",
+ "linkTextFill": "#326EF4",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "center",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ "text": Object {
+ "fill": "#000000",
+ "fontFamily": "Roboto, PingFangSC, Microsoft YaHei, Arial, sans-serif",
+ "fontSize": 12,
+ "fontWeight": "normal",
+ "linkTextFill": "#326EF4",
+ "maxLines": 1,
+ "opacity": 1,
+ "textAlign": "center",
+ "textBaseline": "middle",
+ "textOverflow": "ellipsis",
+ "wordWrap": true,
+ },
+ },
+ "scrollBar": Object {
+ "hoverSize": 8,
+ "lineCap": "round",
+ "size": 6,
+ "thumbColor": "rgba(0,0,0,0.15)",
+ "thumbHorizontalMinSize": 32,
+ "thumbHoverColor": "rgba(0,0,0,0.25)",
+ "thumbVerticalMinSize": 32,
+ "trackColor": "rgba(0,0,0,0.01)",
+ },
+ "splitLine": Object {
+ "borderDash": Array [],
+ "horizontalBorderColor": "#326EF4",
+ "horizontalBorderColorOpacity": 0.2,
+ "horizontalBorderWidth": 2,
+ "shadowColors": Object {
+ "left": "rgba(0,0,0,0.1)",
+ "right": "rgba(0,0,0,0)",
+ },
+ "shadowWidth": 8,
+ "showShadow": true,
+ "verticalBorderColor": "#326EF4",
"verticalBorderColorOpacity": 0.25,
"verticalBorderWidth": 2,
},
diff --git a/packages/s2-core/__tests__/spreadsheet/corner-spec.ts b/packages/s2-core/__tests__/spreadsheet/corner-spec.ts
index 0336cbc086..4acec56dde 100644
--- a/packages/s2-core/__tests__/spreadsheet/corner-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/corner-spec.ts
@@ -49,6 +49,7 @@ describe('PivotSheet Corner Tests', () => {
fields: {
...simpleDataConfig.fields,
columns: [],
+ values: ['price'],
},
});
s2.setOptions({
@@ -96,6 +97,15 @@ describe('PivotSheet Corner Tests', () => {
},
},
});
+
+ s2.setDataCfg({
+ ...simpleDataConfig,
+ fields: {
+ ...simpleDataConfig.fields,
+ values: ['price'],
+ },
+ });
+
await s2.render();
const cornerNodes = s2.facet.getCornerNodes();
@@ -315,11 +325,9 @@ describe('PivotSheet Corner Tests', () => {
expect(cornerNode.value).toEqual(cornerText);
- const cell = s2.facet.cornerHeader.children[0];
+ const cornerCell = s2.facet.getCornerCells()[0];
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
- expect(cell.actualText).toEqual(cornerText);
+ expect(cornerCell.getActualText()).toEqual(cornerText);
});
test('should get custom corner extra text when hierarchy type is tree', async () => {
@@ -343,10 +351,8 @@ describe('PivotSheet Corner Tests', () => {
expect(cornerNode.value).toEqual(cornerExtraFieldText);
- const cell = s2.facet.cornerHeader.children[2];
+ const cornerCell = s2.facet.getCornerCells()[2];
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
- expect(cell.actualText).toEqual(cornerExtraFieldText);
+ expect(cornerCell.getActualText()).toEqual(cornerExtraFieldText);
});
});
diff --git a/packages/s2-core/__tests__/spreadsheet/custom-cell-style-spec.ts b/packages/s2-core/__tests__/spreadsheet/custom-cell-style-spec.ts
index e8a04a4caf..fad262d910 100644
--- a/packages/s2-core/__tests__/spreadsheet/custom-cell-style-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/custom-cell-style-spec.ts
@@ -4,12 +4,13 @@ import {
getContainer,
} from 'tests/util/helpers';
import * as dataConfig from 'tests/data/mock-dataset.json';
+import * as simpleDataConfig from 'tests/data/simple-data.json';
import { customColSimpleColumns } from '../data/custom-table-col-fields';
import { EXTRA_FIELD, type S2DataConfig } from '@/common';
import type { ViewMeta } from '@/common/interface/basic';
import type { Node } from '@/facet/layout/node';
import type { S2Options } from '@/common/interface';
-import { TableSheet, type SpreadSheet } from '@/sheet-type';
+import { TableSheet, type SpreadSheet, PivotSheet } from '@/sheet-type';
describe('SpreadSheet Custom Cell Style Tests', () => {
let s2: SpreadSheet;
@@ -37,7 +38,7 @@ describe('SpreadSheet Custom Cell Style Tests', () => {
});
afterEach(() => {
- s2.destroy();
+ // s2.destroy();
});
test('should render default cell style', () => {
@@ -386,17 +387,27 @@ describe('SpreadSheet Custom Cell Style Tests', () => {
});
test('should get custom col cell style if measure column hidden', async () => {
- const sheet = createPivotSheet({
- ...s2Options,
- style: {
- colCell: {
- hideValue: true,
- widthByField: {
- 'root[&]笔': 100,
+ const sheet = new PivotSheet(
+ getContainer(),
+ {
+ ...simpleDataConfig,
+ fields: {
+ ...simpleDataConfig.fields,
+ values: ['price'],
+ },
+ },
+ {
+ ...s2Options,
+ style: {
+ colCell: {
+ hideValue: true,
+ widthByField: {
+ 'root[&]笔': 100,
+ },
},
},
},
- });
+ );
await sheet.render();
diff --git a/packages/s2-core/__tests__/spreadsheet/custom-grid-spec.ts b/packages/s2-core/__tests__/spreadsheet/custom-grid-spec.ts
index 5c4a40292f..05c7d307a8 100644
--- a/packages/s2-core/__tests__/spreadsheet/custom-grid-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/custom-grid-spec.ts
@@ -3,7 +3,6 @@ import { CustomGridData } from 'tests/data/data-custom-grid';
import { getContainer } from 'tests/util/helpers';
import { pick } from 'lodash';
import { waitForRender } from 'tests/util';
-import type { HeaderCell } from '../../src/cell/header-cell';
import { KEY_GROUP_COL_RESIZE_AREA } from '../../src/common/constant';
import { CustomGridPivotDataSet } from '../../src/data-set/custom-grid-pivot-data-set';
import {
@@ -186,9 +185,7 @@ describe('SpreadSheet Custom Grid Tests', () => {
);
test('should render custom format corner text', () => {
- const cornerCellLabels = (
- s2.facet.cornerHeader.children as HeaderCell[]
- ).map((cell: HeaderCell) => {
+ const cornerCellLabels = s2.facet.getCornerCells().map((cell) => {
const value = cell.getActualText();
const meta = cell.getMeta();
@@ -363,9 +360,7 @@ describe('SpreadSheet Custom Grid Tests', () => {
);
test('should render custom format corner text', () => {
- const cornerCellLabels = (
- s2.facet.cornerHeader.children as HeaderCell[]
- ).map((cell: HeaderCell) => {
+ const cornerCellLabels = s2.facet.getCornerCells().map((cell) => {
const value = cell.getActualText();
const meta = cell.getMeta();
diff --git a/packages/s2-core/__tests__/spreadsheet/custom-tree-spec.ts b/packages/s2-core/__tests__/spreadsheet/custom-tree-spec.ts
index 8c5ecdd755..854a168503 100644
--- a/packages/s2-core/__tests__/spreadsheet/custom-tree-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/custom-tree-spec.ts
@@ -27,11 +27,9 @@ const s2Options: S2Options = {
describe('SpreadSheet Custom Tree Tests', () => {
let s2: SpreadSheet;
- const getCornerCellLabels = () =>
- (s2.facet as any)
- .getCornerHeader()
- .getChildren()
- .map((cell: HeaderCell) => cell.getActualText());
+ const getCornerCellLabels = () => {
+ return s2.facet.getCornerCells().map((cell) => cell.getActualText());
+ };
const mapRowNodes = (spreadsheet: SpreadSheet) =>
spreadsheet.facet.getRowLeafNodes().map((node) => {
@@ -202,10 +200,7 @@ describe('SpreadSheet Custom Tree Tests', () => {
await s2.render();
- const cornerCellLabels = (s2.facet as any)
- .getCornerHeader()
- .getChildren()
- .map((cell: HeaderCell) => cell.getActualText());
+ const cornerCellLabels = getCornerCellLabels();
expect(cornerCellLabels).toEqual(['测试', '类型']);
});
diff --git a/packages/s2-core/__tests__/spreadsheet/empty-dataset-spec.ts b/packages/s2-core/__tests__/spreadsheet/empty-dataset-spec.ts
new file mode 100644
index 0000000000..9f70f1426c
--- /dev/null
+++ b/packages/s2-core/__tests__/spreadsheet/empty-dataset-spec.ts
@@ -0,0 +1,69 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+import { getContainer } from 'tests/util/helpers';
+import type { S2DataConfig } from '../../src';
+import { PivotSheet, TableSheet } from '@/sheet-type';
+import type { S2Options } from '@/common/interface/s2Options';
+
+const s2Options: S2Options = {
+ width: 400,
+ height: 400,
+ hierarchyType: 'grid',
+};
+
+describe('Empty Dataset Structure Tests', () => {
+ test('should generate placeholder for pivot mode with single dimension', async () => {
+ const container = getContainer();
+
+ const s2DataCfg: S2DataConfig = {
+ fields: {
+ rows: ['province', 'city'],
+ columns: ['type'],
+ values: ['price'],
+ valueInCols: true,
+ },
+ data: [],
+ };
+ const s2 = new PivotSheet(container, s2DataCfg, s2Options);
+
+ await s2.render();
+
+ // @ts-ignore
+ expect(s2.facet.panelScrollGroupIndexes).toEqual([0, 0, 0, 0]);
+ });
+
+ test('should generate placeholder for pivot mode with two dimensions', async () => {
+ const container = getContainer();
+
+ const s2DataCfg: S2DataConfig = {
+ fields: {
+ rows: ['province', 'city'],
+ columns: ['type'],
+ values: ['price', 'cost'],
+ valueInCols: true,
+ },
+ data: [],
+ };
+
+ const s2 = new PivotSheet(container, s2DataCfg, s2Options);
+
+ await s2.render();
+ // @ts-ignore
+ expect(s2.facet.panelScrollGroupIndexes).toEqual([0, 1, 0, 0]);
+ });
+
+ test(`shouldn't generate placeholder for table mode`, async () => {
+ const container = getContainer();
+
+ const s2DataCfg: S2DataConfig = {
+ fields: {
+ columns: ['province', 'city', 'type', 'price', 'cost'],
+ },
+ data: [],
+ };
+ const s2 = new TableSheet(container, s2DataCfg, s2Options);
+
+ await s2.render();
+ // @ts-ignore
+ expect(s2.facet.panelScrollGroupIndexes).toEqual([]);
+ });
+});
diff --git a/packages/s2-core/__tests__/spreadsheet/empty-string-values-spec.ts b/packages/s2-core/__tests__/spreadsheet/empty-string-values-spec.ts
new file mode 100644
index 0000000000..ea9933c33e
--- /dev/null
+++ b/packages/s2-core/__tests__/spreadsheet/empty-string-values-spec.ts
@@ -0,0 +1,124 @@
+import { getContainer } from 'tests/util/helpers';
+import { LayoutWidthType, type S2DataConfig, type S2Options } from '@/common';
+import { PivotSheet, SpreadSheet } from '@/sheet-type';
+
+const s2Options: S2Options = {
+ debug: true,
+ width: 600,
+ height: 400,
+ hierarchyType: 'grid',
+ style: {
+ layoutWidthType: LayoutWidthType.Adaptive,
+ dataCell: {
+ height: 30,
+ },
+ },
+};
+
+const testDataCfg: S2DataConfig = {
+ meta: [
+ {
+ field: 'first',
+ name: '一级维度',
+ },
+ {
+ field: 'second',
+ name: '二级维度',
+ },
+ {
+ field: 'number',
+ name: '数值',
+ },
+ ],
+ fields: {
+ rows: ['first', 'second'],
+ columns: [],
+ values: ['number'],
+ valueInCols: true,
+ },
+ data: [
+ {
+ first: '',
+ second: '维值1',
+ number: 100,
+ },
+ {
+ first: '',
+ second: '维值2',
+ number: 200,
+ },
+ {
+ first: null,
+ second: '维值3',
+ number: 300,
+ },
+ {
+ first: null,
+ second: '维值4',
+ number: 400,
+ },
+ {
+ first: '非空维度',
+ second: '维值5',
+ number: 500,
+ },
+ {
+ first: '非空维度',
+ second: '维值6',
+ number: 600,
+ },
+ ],
+};
+
+describe('Empty String Values Tests', () => {
+ let s2: SpreadSheet;
+
+ beforeEach(() => {
+ s2 = new PivotSheet(getContainer(), testDataCfg, s2Options);
+ s2.render();
+ });
+
+ test('should get correctly first dimension values', () => {
+ const values = s2.dataSet.getDimensionValues('first');
+
+ expect(values).toEqual(['', 'null', '非空维度']);
+ });
+
+ test('should get correctly second dimension values', () => {
+ const values = s2.dataSet.getDimensionValues('second');
+
+ expect(values).toEqual([
+ '维值1',
+ '维值2',
+ '维值3',
+ '维值4',
+ '维值5',
+ '维值6',
+ ]);
+ });
+
+ test('should get correctly second dimension values by specific query', () => {
+ let values = s2.dataSet.getDimensionValues('second', { first: '' });
+
+ expect(values).toEqual(['维值1', '维值2']);
+
+ values = s2.dataSet.getDimensionValues('second', { first: 'null' });
+ expect(values).toEqual(['维值3', '维值4']);
+
+ values = s2.dataSet.getDimensionValues('second', { first: '非空维度' });
+ expect(values).toEqual(['维值5', '维值6']);
+ });
+
+ test('should get correctly layout result', () => {
+ const nodes = s2.facet.getLayoutResult().rowLeafNodes;
+
+ expect(nodes.map((node) => node.id)).toEqual([
+ 'root[&][&]维值1',
+ 'root[&][&]维值2',
+ 'root[&]null[&]维值3',
+ 'root[&]null[&]维值4',
+ 'root[&]非空维度[&]维值5',
+ 'root[&]非空维度[&]维值6',
+ ]);
+ });
+});
diff --git a/packages/s2-core/__tests__/spreadsheet/header-action-icons-spec.ts b/packages/s2-core/__tests__/spreadsheet/header-action-icons-spec.ts
index 993e89ef0d..4a9390d360 100644
--- a/packages/s2-core/__tests__/spreadsheet/header-action-icons-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/header-action-icons-spec.ts
@@ -183,21 +183,21 @@ describe('HeaderActionIcons Tests', () => {
],
Array [
Object {
- "x": 158,
+ "x": 158.5,
"y": 9.5,
},
Object {
- "x": 200,
+ "x": 200.5,
"y": 9.5,
},
],
Array [
Object {
- "x": 158,
+ "x": 158.5,
"y": 39.5,
},
Object {
- "x": 200,
+ "x": 200.5,
"y": 39.5,
},
],
@@ -281,13 +281,13 @@ describe('HeaderActionIcons Tests', () => {
},
Object {
"cfg": Object {
- "x": 186,
+ "x": 186.5,
"y": 9.5,
},
},
Object {
"cfg": Object {
- "x": 186,
+ "x": 186.5,
"y": 39.5,
},
},
diff --git a/packages/s2-core/__tests__/spreadsheet/hidden-columns-spec.ts b/packages/s2-core/__tests__/spreadsheet/hidden-columns-spec.ts
index ac6c7760e1..19cc8de525 100644
--- a/packages/s2-core/__tests__/spreadsheet/hidden-columns-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/hidden-columns-spec.ts
@@ -3,11 +3,11 @@ import * as mockDataConfig from 'tests/data/mock-dataset.json';
import * as mockPivotDataConfig from 'tests/data/simple-data.json';
import * as mockTableDataConfig from 'tests/data/simple-table-data.json';
import { waitForRender } from 'tests/util';
-import { getContainer } from 'tests/util/helpers';
+import { createPivotSheet, getContainer } from 'tests/util/helpers';
import { customColGridSimpleFields } from '../data/custom-grid-simple-fields';
import { customColMultipleColumns } from '../data/custom-table-col-fields';
import { PivotSheet, TableSheet } from '@/sheet-type';
-import type { HiddenColumnsInfo, S2Options } from '@/common';
+import type { HiddenColumnsInfo, S2DataConfig, S2Options } from '@/common';
const s2Options: S2Options = {
width: 400,
@@ -213,7 +213,7 @@ describe('SpreadSheet Hidden Columns Tests', () => {
let pivotSheet: PivotSheet;
- const pivotDataCfg = {
+ const pivotDataCfg: S2DataConfig = {
...mockPivotDataConfig,
fields: {
rows: ['province'],
@@ -229,7 +229,7 @@ describe('SpreadSheet Hidden Columns Tests', () => {
});
afterEach(() => {
- pivotSheet.destroy();
+ // pivotSheet.destroy();
});
test('should get init column node', () => {
@@ -297,7 +297,7 @@ describe('SpreadSheet Hidden Columns Tests', () => {
);
});
- test('should not rerender after hidden empty column fields if disable force render', () => {
+ test('should not rerender after hidden empty column fields if disable force render', async () => {
const defaultHiddenColumnsDetail = [
null,
] as unknown as HiddenColumnsInfo[];
@@ -308,7 +308,7 @@ describe('SpreadSheet Hidden Columns Tests', () => {
.spyOn(pivotSheet, 'render')
.mockImplementationOnce(async () => {});
- pivotSheet.interaction.hideColumns([], false);
+ await pivotSheet.interaction.hideColumns([], false);
const hiddenColumnsDetail = pivotSheet.store.get('hiddenColumnsDetail');
@@ -316,7 +316,7 @@ describe('SpreadSheet Hidden Columns Tests', () => {
expect(hiddenColumnsDetail).toEqual(defaultHiddenColumnsDetail);
});
- test('should rerender after hidden empty column fields if enable force render', () => {
+ test('should rerender after hidden empty column fields if enable force render', async () => {
const defaultHiddenColumnsDetail = [
null,
] as unknown as HiddenColumnsInfo[];
@@ -327,7 +327,7 @@ describe('SpreadSheet Hidden Columns Tests', () => {
.spyOn(pivotSheet, 'render')
.mockImplementationOnce(async () => {});
- pivotSheet.interaction.hideColumns([], true);
+ await pivotSheet.interaction.hideColumns([], true);
const hiddenColumnsDetail = pivotSheet.store.get('hiddenColumnsDetail');
@@ -402,13 +402,8 @@ describe('SpreadSheet Hidden Columns Tests', () => {
.getColNodes()
.find((node) => node.isGrandTotals)!;
- const rootNode = pivotSheet.facet
- .getColNodes()
- .find((node) => node.id === 'root[&]笔')!;
-
- const parentNode = pivotSheet.facet
- .getColNodes()
- .find((node) => node.id === 'root[&]笔[&]义乌')!;
+ const rootNode = pivotSheet.facet.getColNodeById('root[&]笔')!;
+ const parentNode = pivotSheet.facet.getColNodeById('root[&]笔[&]义乌')!;
const hiddenColumnsInfo = pivotSheet.store.get('hiddenColumnsDetail')[0];
@@ -420,6 +415,67 @@ describe('SpreadSheet Hidden Columns Tests', () => {
expect(parentNode.hiddenChildNodeInfo).toEqual(hiddenColumnsInfo);
});
+ // https://github.com/antvis/S2/issues/2355
+ test('should render correctly x and width after hide columns when there is only one value for the higher-level dimension.', async () => {
+ const nodeId = 'root[&]笔[&]义乌[&]price';
+
+ pivotSheet.setOptions({
+ style: {
+ colCell: {
+ width: 100,
+ },
+ },
+ });
+ const data = pivotSheet.dataCfg.data.map((i) => ({ ...i, cost: 0 }));
+
+ pivotSheet.setDataCfg({
+ data,
+ fields: {
+ values: ['cost', 'price'],
+ },
+ });
+ await pivotSheet.render();
+
+ await pivotSheet.interaction.hideColumns([nodeId]);
+
+ const rootNode = pivotSheet.facet.getColNodeById('root[&]笔');
+
+ expect(rootNode!.width).toEqual(300);
+ expect(rootNode!.x).toEqual(0);
+ });
+
+ // https://github.com/antvis/S2/issues/2194
+ test('should render correctly when always hidden last column', async () => {
+ const sheet = createPivotSheet(
+ {
+ interaction: {
+ hiddenColumnFields: [],
+ },
+ },
+ { useSimpleData: false },
+ );
+
+ await sheet.render();
+
+ // 模拟一列一列的手动隐藏最后一列
+ const colIds = [
+ 'root[&]办公用品[&]纸张[&]数量',
+ 'root[&]办公用品[&]笔[&]数量',
+ 'root[&]家具[&]沙发[&]数量',
+ ];
+
+ await Promise.all(
+ colIds.map(async (field) => {
+ await sheet.interaction.hideColumns([field]);
+ }),
+ );
+
+ const leafNodes = sheet.facet.getColLeafNodes();
+
+ expect(leafNodes).toHaveLength(1);
+ expect(leafNodes[0].id).toEqual('root[&]家具[&]桌子[&]数量');
+ });
+
test('should hide columns for multiple columns', async () => {
const hiddenColumns = [
'root[&]自定义节点 a-1[&]自定义节点 a-1-1[&]指标1',
@@ -512,9 +568,7 @@ describe('SpreadSheet Hidden Columns Tests', () => {
await sheet.interaction.hideColumns([id]);
});
- const totalsSiblingNode = sheet.facet
- .getColNodes()
- .find((node) => node.id === 'root[&]家具')!;
+ const totalsSiblingNode = sheet.facet.getColNodeById('root[&]家具')!;
expect(totalsSiblingNode.x).toEqual(x);
expect(totalsSiblingNode.width).toEqual(width);
@@ -526,8 +580,8 @@ describe('SpreadSheet Hidden Columns Tests', () => {
test('should hide measure node', async () => {
const nodeIds = [
- 'root[&]家具[&]桌子[&]number',
- 'root[&]办公用品[&]笔[&]number',
+ 'root[&]家具[&]桌子[&]数量',
+ 'root[&]办公用品[&]笔[&]数量',
];
await waitForRender(sheet, async () => {
@@ -545,8 +599,8 @@ describe('SpreadSheet Hidden Columns Tests', () => {
const nodeIds = [
'root[&]总计',
'root[&]家具[&]小计',
- 'root[&]家具[&]桌子[&]number',
- 'root[&]办公用品[&]笔[&]number',
+ 'root[&]家具[&]桌子[&]数量',
+ 'root[&]办公用品[&]笔[&]数量',
];
await waitForRender(sheet, async () => {
@@ -564,39 +618,12 @@ describe('SpreadSheet Hidden Columns Tests', () => {
expect(colsHierarchy.sampleNodeForLastLevel?.height).toStrictEqual(30);
expect(colsHierarchy.sampleNodeForLastLevel?.y).toStrictEqual(60);
expect(colsHierarchy.height).toStrictEqual(90);
- expect(colCornerNodesMeta).toMatchInlineSnapshot(`
- Array [
- Object {
- "height": 30,
- "width": 119,
- "x": 0,
- "y": 60,
- },
- Object {
- "height": 30,
- "width": 119,
- "x": 119,
- "y": 60,
- },
- Object {
- "height": 30,
- "width": 238,
- "x": 0,
- "y": 0,
- },
- Object {
- "height": 30,
- "width": 238,
- "x": 0,
- "y": 30,
- },
- ]
- `);
+ expect(colCornerNodesMeta).toMatchSnapshot();
});
// https://github.com/antvis/S2/issues/1721
- test('should hide grand totals node1', async () => {
- const nodeId = 'root[&]总计[&]sub_type';
+ test('should hide grand totals node', async () => {
+ const nodeId = 'root[&]总计[&]子类别';
sheet.setDataCfg({
...mockDataConfig,
@@ -607,16 +634,37 @@ describe('SpreadSheet Hidden Columns Tests', () => {
valueInCols: true,
},
});
+
await sheet.render();
- await waitForRender(sheet, async () => {
- await sheet.interaction.hideColumns([nodeId]);
- });
+ await sheet.interaction.hideColumns([nodeId]);
const leafNodes = sheet.facet.getColLeafNodes();
expect(leafNodes.some((node) => node.id === nodeId)).toBeFalsy();
expect(leafNodes).toHaveLength(5);
});
+
+ test.each(['grid', 'tree'] as S2Options['hierarchyType'][])(
+ 'hiding the column totals should not hide the row totals for %s mode',
+ async (hierarchyType) => {
+ sheet.setOptions({ hierarchyType });
+ await sheet.render();
+
+ const nodeId = 'root[&]总计';
+ const preRowNodes = sheet.facet.getRowNodes();
+ const preColumnNodes = sheet.facet.getColNodes();
+
+ await waitForRender(sheet, async () => {
+ await sheet.interaction.hideColumns([nodeId]);
+ });
+
+ expect(sheet.facet.getRowNodes()[0].id).toBe(nodeId);
+ expect(sheet.facet.getRowNodes().length).toBe(preRowNodes.length);
+ expect(sheet.facet.getColNodes().length).toBe(
+ preColumnNodes.length - 1,
+ );
+ },
+ );
});
});
});
diff --git a/packages/s2-core/__tests__/spreadsheet/interaction-brush-selection-scroll-spec.ts b/packages/s2-core/__tests__/spreadsheet/interaction-brush-selection-scroll-spec.ts
index a1a8739ac9..a579f830b5 100644
--- a/packages/s2-core/__tests__/spreadsheet/interaction-brush-selection-scroll-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/interaction-brush-selection-scroll-spec.ts
@@ -15,6 +15,7 @@ import {
TableSheet,
SpreadSheet,
type S2CellType,
+ LayoutWidthType,
} from '@/index';
const data = getMockData(
@@ -55,7 +56,7 @@ const options: S2Options = {
showSeriesNumber: true,
placeholder: '',
style: {
- layoutWidthType: 'compact',
+ layoutWidthType: LayoutWidthType.Compact,
dataCell: {
height: 32,
},
diff --git a/packages/s2-core/__tests__/spreadsheet/miss-dimension-values-spec.ts b/packages/s2-core/__tests__/spreadsheet/miss-dimension-values-spec.ts
new file mode 100644
index 0000000000..7fd84b7ba9
--- /dev/null
+++ b/packages/s2-core/__tests__/spreadsheet/miss-dimension-values-spec.ts
@@ -0,0 +1,269 @@
+import { getContainer } from 'tests/util/helpers';
+import {
+ EMPTY_FIELD_VALUE,
+ LayoutWidthType,
+ ORIGIN_FIELD,
+ type S2DataConfig,
+ type S2Options,
+} from '@/common';
+import { PivotSheet, SpreadSheet } from '@/sheet-type';
+
+const s2Options: S2Options = {
+ debug: true,
+ width: 600,
+ height: 400,
+ hierarchyType: 'grid',
+ totals: {
+ row: {
+ showGrandTotals: false,
+ showSubTotals: {
+ always: false,
+ },
+ reverseGrandTotalsLayout: false,
+ reverseSubTotalsLayout: false,
+ subTotalsDimensions: ['first', 'second'],
+ },
+ col: {
+ showGrandTotals: false,
+ showSubTotals: false,
+ reverseGrandTotalsLayout: false,
+ reverseSubTotalsLayout: false,
+ subTotalsDimensions: [],
+ },
+ },
+ style: {
+ layoutWidthType: LayoutWidthType.Adaptive,
+ dataCell: {
+ height: 30,
+ },
+ },
+ showDefaultHeaderActionIcon: false,
+};
+
+const testDataCfg: S2DataConfig = {
+ meta: [
+ {
+ field: 'first',
+ name: '一级维度',
+ },
+ {
+ field: 'second',
+ name: '二级维度',
+ },
+ {
+ field: 'third',
+ name: '三级维度',
+ },
+ {
+ field: 'number',
+ name: '数值',
+ },
+ ],
+ fields: {
+ rows: ['first', 'second', 'third'],
+ columns: [],
+ values: ['number'],
+ valueInCols: true,
+ },
+ data: [
+ {
+ first: '总计',
+ number: 1732771,
+ },
+ {
+ first: '维值-1',
+ second: '维值-2',
+ third: '维度-3',
+ number: 172245,
+ },
+ {
+ first: '维值-1',
+ second: '维值-2',
+ third: '维度-3',
+ number: 12222,
+ },
+ {
+ first: '维值-1',
+ second: '维值-3',
+ third: '维值-3',
+ number: 11111,
+ },
+ {
+ first: '维值-1',
+ second: '维值-3',
+ third: '维度-3',
+ number: 11111,
+ },
+ {
+ first: '维值-1',
+ number: 456,
+ },
+ {
+ first: '测试-1',
+ second: '测试-2',
+ third: '维度-3',
+ number: 12,
+ },
+ {
+ first: '测试-1',
+ second: '测试-2',
+ third: '维度-3',
+ number: 4444567,
+ },
+ {
+ first: '测试-1',
+ second: '测试-3',
+ number: 111233,
+ },
+ {
+ first: '测试-1',
+ second: '测试-3',
+ number: 785222,
+ },
+ {
+ first: '测试-1',
+ second: '测试-4',
+ third: '维度-3',
+ number: 6455644,
+ },
+ {
+ first: '测试-1',
+ second: '测试-4',
+ number: 289898,
+ },
+ {
+ first: '测试-1',
+ second: '测试-5',
+ number: 2222,
+ },
+ {
+ first: '测试-1',
+ second: '测试-5',
+ third: '维度-3',
+ number: 1111,
+ },
+ {
+ first: '测试-1',
+ number: 125555,
+ },
+ {
+ first: '测试-6',
+ second: '测试-x',
+ number: 409090,
+ },
+ {
+ first: '测试-6',
+ second: '测试-x',
+ number: 111111,
+ },
+ {
+ first: '测试-6',
+ second: '测试-7',
+ number: 5555,
+ },
+ {
+ first: '测试-6',
+ second: '测试-7',
+ number: 67878,
+ },
+ {
+ first: '测试-6',
+ second: '测试-8',
+ number: 53445.464,
+ },
+ {
+ first: '测试-6',
+ second: '测试-8',
+ number: 456.464,
+ },
+ {
+ first: '测试-6',
+ number: 123.416,
+ },
+ ],
+};
+
+describe('Miss Dimension Values Tests', () => {
+ let s2: SpreadSheet;
+
+ beforeEach(async () => {
+ s2 = new PivotSheet(getContainer(), testDataCfg, s2Options);
+ await s2.render();
+ });
+
+ test('should get correctly empty dimension values', () => {
+ const emptyDimensionValueNode = s2.facet.getRowNodes()[0].children[0];
+
+ expect(emptyDimensionValueNode.value).toEqual(EMPTY_FIELD_VALUE);
+ expect(emptyDimensionValueNode.id).toEqual(
+ `root[&]总计[&]${EMPTY_FIELD_VALUE}`,
+ );
+ expect(emptyDimensionValueNode.belongsCell!.getActualText()).toEqual('-');
+ });
+
+ test('should get correctly empty dimension values and use custom placeholder text', async () => {
+ const placeholder = '*';
+
+ s2.setOptions({
+ placeholder,
+ });
+
+ await s2.render(false);
+
+ const emptyDimensionValueNode = s2.facet.getRowNodes()[0].children[0];
+
+ expect(emptyDimensionValueNode.belongsCell!.getActualText()).toEqual(
+ placeholder,
+ );
+ });
+
+ test('should generate correct query for empty node', () => {
+ const emptyDimensionValueNode1 = s2.facet.getRowNodes()[0];
+
+ expect(emptyDimensionValueNode1.query).toEqual({
+ first: '总计',
+ });
+
+ const emptyDimensionValueNode2 = s2.facet.getRowNodes()[1];
+
+ expect(emptyDimensionValueNode2.query).toEqual({
+ first: '总计',
+ });
+ });
+
+ test('should get correctly dimension data and ignore empty dimension value', () => {
+ const emptyDimensionValueNode = s2.facet.getRowNodes()[0].children[0];
+
+ const data = s2.dataSet.getCellMultiData({
+ query: emptyDimensionValueNode.query!,
+ });
+ const dimensionValues = s2.dataSet.getDimensionValues(
+ emptyDimensionValueNode.field,
+ );
+ const emptyDimensionDataCell = s2.facet.getDataCells()[0];
+
+ expect(emptyDimensionValueNode.query).toEqual(
+ emptyDimensionValueNode.parent!.query,
+ );
+ expect(emptyDimensionDataCell.getMeta().fieldValue).toEqual(1732771);
+ expect(data[0][ORIGIN_FIELD]).toMatchInlineSnapshot(`
+ Object {
+ "first": "总计",
+ "number": 1732771,
+ }
+ `);
+ expect(dimensionValues).toMatchInlineSnapshot(`
+ Array [
+ "维值-2",
+ "维值-3",
+ "测试-2",
+ "测试-3",
+ "测试-4",
+ "测试-5",
+ "测试-x",
+ "测试-7",
+ "测试-8",
+ ]
+ `);
+ });
+});
diff --git a/packages/s2-core/__tests__/spreadsheet/row-link-spec.ts b/packages/s2-core/__tests__/spreadsheet/row-link-spec.ts
index 41d7d61a62..18dd45ec8e 100644
--- a/packages/s2-core/__tests__/spreadsheet/row-link-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/row-link-spec.ts
@@ -1,7 +1,7 @@
import { getContainer } from 'tests/util/helpers';
import { noop } from 'lodash';
import { PivotSheet } from '@/sheet-type';
-import { S2Event, type S2Options } from '@/common';
+import { S2Event, type S2DataConfig, type S2Options } from '@/common';
const s2Options: S2Options = {
width: 400,
@@ -19,7 +19,7 @@ const s2Options: S2Options = {
},
};
-const s2DataCfg = {
+const s2DataCfg: S2DataConfig = {
fields: {
rows: ['province', 'city'],
columns: ['type'],
@@ -32,14 +32,7 @@ const s2DataCfg = {
city: '义乌1',
type: '笔',
price: 1,
- cost: 9,
- },
- {
- province: '浙江',
- city: '义乌1',
- type: '笔',
- price: 10,
- cost: 99,
+ cost: 2,
},
{
province: '浙江',
@@ -76,7 +69,7 @@ describe('Row Text Link Tests', () => {
let s2: PivotSheet;
const linkFieldJump = jest.fn();
- beforeAll(async () => {
+ beforeEach(async () => {
container = getContainer();
s2 = new PivotSheet(container, s2DataCfg, s2Options);
await s2.render();
@@ -122,15 +115,15 @@ describe('Row Text Link Tests', () => {
},
} as any);
- expect(linkFieldJump).toHaveBeenCalledWith({
+ expect(linkFieldJump).toHaveBeenLastCalledWith({
field: 'city',
cellData: rowNode,
record: {
province: '浙江',
city: '义乌1',
type: '笔',
- price: 10,
- cost: 99,
+ price: 1,
+ cost: 2,
rowIndex: 1,
},
});
diff --git a/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts b/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts
index 34a09bb472..33439bc201 100644
--- a/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts
@@ -1,7 +1,8 @@
/* 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 { get } from 'lodash';
+import { ScrollBar, ScrollType } from '../../src/ui/scrollbar';
import type { CellScrollPosition } from './../../src/common/interface/scroll';
import { PivotSheet, SpreadSheet } from '@/sheet-type';
import type {
@@ -12,6 +13,7 @@ import type {
import {
InteractionStateName,
InterceptType,
+ LayoutWidthType,
OriginEventType,
S2Event,
ScrollbarPositionType,
@@ -381,6 +383,62 @@ describe('Scroll Tests', () => {
},
);
+ // https://github.com/antvis/S2/issues/2222
+ test.each([
+ {
+ type: 'horizontal',
+ offset: {
+ scrollX: 20,
+ scrollY: 0,
+ },
+ },
+ {
+ type: 'vertical',
+ offset: {
+ scrollX: 0,
+ scrollY: 20,
+ },
+ },
+ ])(
+ 'should trigger hover cells when hover cells after scroll by %o',
+ async ({ offset }) => {
+ s2.setOptions({
+ interaction: {
+ hoverAfterScroll: true,
+ },
+ });
+
+ s2.facet.cornerBBox.maxY = -9999;
+ s2.facet.panelBBox.minX = -9999;
+ s2.facet.panelBBox.minY = -9999;
+
+ const bbox = s2.getCanvasElement().getBoundingClientRect();
+ const mousemoveEvent = new MouseEvent(OriginEventType.POINTER_MOVE, {
+ clientX: bbox.left + 100,
+ clientY: bbox.top + 100,
+ });
+
+ canvas.dispatchEvent(mousemoveEvent);
+
+ s2.container.emit = jest.fn();
+
+ const wheelEvent = new WheelEvent('wheel', {
+ deltaX: offset.scrollX,
+ deltaY: offset.scrollY,
+ });
+
+ canvas.dispatchEvent(wheelEvent);
+
+ // wait requestAnimationFrame and debounce
+ await sleep(1000);
+
+ expect(s2.container.emit).toHaveBeenCalledWith(
+ OriginEventType.POINTER_MOVE,
+ expect.any(Object),
+ );
+ },
+ );
+
test('should not trigger scroll event on passive renders', async () => {
const sheet = new PivotSheet(getContainer(), mockDataConfig, {
...s2Options,
@@ -403,7 +461,7 @@ describe('Scroll Tests', () => {
scrollbarPosition: ScrollbarPositionType.CONTENT,
},
style: {
- layoutWidthType: 'compact',
+ layoutWidthType: LayoutWidthType.Compact,
},
});
s2.changeSheetSize(100, 1000); // 横向滚动条
@@ -414,7 +472,8 @@ describe('Scroll Tests', () => {
s2.changeSheetSize(1000, 150); // 纵向滚动条
await s2.render(false);
- expect(s2.facet.vScrollBar.getBBox().x).toBe(195);
+
+ expect(Math.floor(s2.facet.vScrollBar.getBBox().x)).toEqual(195);
s2.setOptions({
interaction: {
@@ -455,11 +514,11 @@ describe('Scroll Tests', () => {
const scrollBar = s2.facet[name];
- const positon = scrollBar['getCoordinatesWithBBoxExtraPadding']();
+ const position = scrollBar['getCoordinatesWithBBoxExtraPadding']();
expect(
Math.round(scrollBar.thumbShape.getBBox()[key] as number),
- ).toStrictEqual(Math.round(positon.end - positon.start));
+ ).toStrictEqual(Math.round(position.end - position.start));
},
);
@@ -492,7 +551,7 @@ describe('Scroll Tests', () => {
rowHeader: true,
},
style: {
- layoutWidthType: 'compact',
+ layoutWidthType: LayoutWidthType.Compact,
rowCell: {
width: 200,
},
@@ -639,13 +698,13 @@ describe('Scroll Tests', () => {
).toBeFalsy();
});
- test('should scroll horizontally when shift key is held', async () => {
+ test('should scroll horizontally when shift key is held on Windows', async () => {
s2.setOptions({
frozen: {
rowHeader: true,
},
style: {
- layoutWidthType: 'compact',
+ layoutWidthType: LayoutWidthType.Compact,
rowCell: {
width: 200,
},
@@ -676,11 +735,39 @@ describe('Scroll Tests', () => {
shiftKey: true,
});
+ Object.defineProperty(window.navigator, 'userAgent', {
+ value: 'Windows',
+ configurable: true,
+ writable: true,
+ });
+
canvas.dispatchEvent(wheelEvent);
+ await sleep(200);
+ expect(onScroll).toHaveBeenCalled();
+ });
- await sleep(1000);
+ test('should not scroll horizontally when shift key is held on macOS', async () => {
+ const onScroll = jest.fn((...args) => {
+ expect(args[0].rowHeaderScrollX).toBeGreaterThan(0);
+ expect(args[0].scrollX).toBe(0);
+ expect(args[0].scrollY).toBe(0);
+ });
- expect(onScroll).toHaveBeenCalled();
+ const wheelEvent = new WheelEvent('wheel', {
+ deltaX: 0,
+ deltaY: 20,
+ shiftKey: true,
+ });
+
+ Object.defineProperty(window.navigator, 'userAgent', {
+ value: 'Mac OS',
+ configurable: true,
+ writable: true,
+ });
+
+ canvas.dispatchEvent(wheelEvent);
+ await sleep(200);
+ expect(onScroll).not.toHaveBeenCalled();
});
it('should not change init body overscrollBehavior style when render and destroyed', async () => {
@@ -766,4 +853,92 @@ describe('Scroll Tests', () => {
expect(errorSpy).not.toHaveBeenCalled();
});
+
+ // https://github.com/antvis/S2/issues/2316
+ test('should not throw infinite error if spreadsheet is unmounted during scrolling', async () => {
+ s2.setOptions({
+ style: {
+ rowCell: {
+ width: 200,
+ },
+ dataCell: {
+ width: 30,
+ },
+ },
+ });
+
+ await s2.render(false);
+
+ const errorSpy = jest
+ .spyOn(console, 'error')
+ .mockImplementationOnce(() => {});
+
+ // 滚动时 unmount 表格实例
+ s2.facet.scrollWithAnimation(
+ {
+ offsetX: {
+ value: 10,
+ animate: true,
+ },
+ offsetY: {
+ value: 10,
+ animate: true,
+ },
+ },
+ 200,
+ );
+ s2.destroy();
+
+ await sleep(500);
+
+ expect(errorSpy).toHaveBeenCalledTimes(0);
+ });
+
+ // 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 isMatchElementSpy = jest
+ .spyOn(s2.interaction.eventController, 'isMatchElement')
+ .mockImplementation(() => true);
+
+ const reset = jest.fn();
+
+ const scrollbar = get(s2.facet, scrollbarName) as ScrollBar;
+ const colCell = s2.facet.getColLeafCells()[0]!;
+
+ 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();
+
+ isMatchElementSpy.mockClear();
+ },
+ );
});
diff --git a/packages/s2-core/__tests__/spreadsheet/sort-by-order-spec.ts b/packages/s2-core/__tests__/spreadsheet/sort-by-order-spec.ts
index 33a238ffdc..ab07de4ac3 100644
--- a/packages/s2-core/__tests__/spreadsheet/sort-by-order-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/sort-by-order-spec.ts
@@ -73,12 +73,12 @@ describe('Manual Sort Tests', () => {
},
{
sortFieldId: 'type2',
- sortBy: ['整体访问', '小程序访问', '支付宝访问'],
+ sortBy: ['支付宝访问', '整体访问', '小程序访问'],
},
],
};
- beforeAll(async () => {
+ beforeEach(async () => {
const container = getContainer();
s2 = new PivotSheet(container, mockDataCfg, s2Options);
@@ -94,12 +94,12 @@ describe('Manual Sort Tests', () => {
s2.dataSet.getDimensionValues('type2', {
type1: '整体访问',
}),
- ).toEqual(['整体访问', '小程序访问', '支付宝访问']);
+ ).toEqual(['支付宝访问', '整体访问', '小程序访问']);
expect(
s2.dataSet.getDimensionValues('type2', {
type1: '小程序访问',
}),
- ).toEqual(['小程序访问', '整体访问', '支付宝访问']);
+ ).toEqual(['支付宝访问', '整体访问', '小程序访问']);
expect(
s2.dataSet.getDimensionValues('type2', {
type1: '支付宝访问',
diff --git a/packages/s2-core/__tests__/spreadsheet/spread-sheet-facet-layout-api-spec.ts b/packages/s2-core/__tests__/spreadsheet/spread-sheet-facet-layout-api-spec.ts
index d711058a39..da32d09082 100644
--- a/packages/s2-core/__tests__/spreadsheet/spread-sheet-facet-layout-api-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/spread-sheet-facet-layout-api-spec.ts
@@ -35,17 +35,17 @@ describe('Facet Layout API Tests', () => {
Array [
Object {
"field": "province",
- "id": "",
+ "id": "province",
"value": "province",
},
Object {
"field": "city",
- "id": "",
+ "id": "city",
"value": "city",
},
Object {
"field": "type",
- "id": "",
+ "id": "type",
"value": "type",
},
Object {
@@ -107,17 +107,17 @@ describe('Facet Layout API Tests', () => {
},
Object {
"field": "province",
- "id": "",
+ "id": "province",
"value": "province",
},
Object {
"field": "city",
- "id": "",
+ "id": "city",
"value": "city",
},
Object {
"field": "type",
- "id": "",
+ "id": "type",
"value": "type",
},
Object {
@@ -164,17 +164,17 @@ describe('Facet Layout API Tests', () => {
Array [
Object {
"field": "province",
- "id": "",
+ "id": "province",
"value": "province",
},
Object {
"field": "city",
- "id": "",
+ "id": "city",
"value": "city",
},
Object {
"field": "type",
- "id": "",
+ "id": "type",
"value": "type",
},
Object {
@@ -226,17 +226,17 @@ describe('Facet Layout API Tests', () => {
Array [
Object {
"field": "province",
- "id": "",
+ "id": "province",
"value": "province",
},
Object {
"field": "city",
- "id": "",
+ "id": "city",
"value": "city",
},
Object {
"field": "type",
- "id": "",
+ "id": "type",
"value": "type",
},
Object {
@@ -314,7 +314,7 @@ describe('Facet Layout API Tests', () => {
Array [
Object {
"field": "type",
- "id": "",
+ "id": "type",
"value": "type",
},
Object {
@@ -353,17 +353,17 @@ describe('Facet Layout API Tests', () => {
Array [
Object {
"field": "province",
- "id": "",
+ "id": "province",
"value": "province",
},
Object {
"field": "city",
- "id": "",
+ "id": "city",
"value": "city",
},
Object {
"field": "type",
- "id": "",
+ "id": "type",
"value": "type",
},
]
@@ -385,17 +385,17 @@ describe('Facet Layout API Tests', () => {
},
Object {
"field": "province",
- "id": "",
+ "id": "province",
"value": "province",
},
Object {
"field": "city",
- "id": "",
+ "id": "city",
"value": "city",
},
Object {
"field": "type",
- "id": "",
+ "id": "type",
"value": "type",
},
]
@@ -407,17 +407,17 @@ describe('Facet Layout API Tests', () => {
Array [
Object {
"field": "province",
- "id": "",
+ "id": "province",
"value": "province",
},
Object {
"field": "city",
- "id": "",
+ "id": "city",
"value": "city",
},
Object {
"field": "type",
- "id": "",
+ "id": "type",
"value": "type",
},
]
@@ -439,17 +439,17 @@ describe('Facet Layout API Tests', () => {
},
Object {
"field": "province",
- "id": "",
+ "id": "province",
"value": "province",
},
Object {
"field": "city",
- "id": "",
+ "id": "city",
"value": "city",
},
Object {
"field": "type",
- "id": "",
+ "id": "type",
"value": "type",
},
]
diff --git a/packages/s2-core/__tests__/spreadsheet/spread-sheet-resize-spec.ts b/packages/s2-core/__tests__/spreadsheet/spread-sheet-resize-spec.ts
index 198c0513c3..4c2abe2f06 100644
--- a/packages/s2-core/__tests__/spreadsheet/spread-sheet-resize-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/spread-sheet-resize-spec.ts
@@ -1,15 +1,15 @@
import * as mockDataConfig from 'tests/data/simple-data.json';
import { getContainer } from 'tests/util/helpers';
import type { Group } from '@antv/g';
-import { PivotSheet } from '@/sheet-type';
import {
- KEY_GROUP_COL_RESIZE_AREA,
- KEY_GROUP_CORNER_RESIZE_AREA,
- KEY_GROUP_ROW_RESIZE_AREA,
type S2Options,
-} from '@/common';
+ PivotSheet,
+ KEY_GROUP_ROW_RESIZE_AREA,
+ KEY_GROUP_CORNER_RESIZE_AREA,
+ KEY_GROUP_COL_RESIZE_AREA,
+} from '../../src';
-async function renderSheet(options: S2Options) {
+async function renderSheet(options?: S2Options) {
const s2 = new PivotSheet(getContainer(), mockDataConfig, {
height: 150,
...options,
@@ -22,6 +22,7 @@ async function renderSheet(options: S2Options) {
},
},
});
+
await s2.render();
return s2;
@@ -191,4 +192,31 @@ describe('SpreadSheet Resize Active Tests', () => {
expect(group.getElementById(KEY_GROUP_ROW_RESIZE_AREA)).toBeNull();
expect(group.getElementById(KEY_GROUP_CORNER_RESIZE_AREA)).toBeNull();
});
+
+ test('should render correctly layout when tree row width is invalid number', async () => {
+ const s2 = await renderSheet();
+
+ s2.setOptions({
+ hierarchyType: 'tree',
+ style: {
+ rowCell: {
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ width: '@',
+ },
+ },
+ });
+
+ await s2.render(false);
+
+ const nodes = s2.facet.getRowNodes().map((node) => {
+ return {
+ id: node.id,
+ width: node.width,
+ height: node.height,
+ };
+ });
+
+ expect(nodes).toMatchSnapshot();
+ });
});
diff --git a/packages/s2-core/__tests__/spreadsheet/spread-sheet-series-number-spec.ts b/packages/s2-core/__tests__/spreadsheet/spread-sheet-series-number-spec.ts
index 6944013201..0573dc8232 100644
--- a/packages/s2-core/__tests__/spreadsheet/spread-sheet-series-number-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/spread-sheet-series-number-spec.ts
@@ -1,8 +1,6 @@
import * as mockDataConfig from 'tests/data/simple-data.json';
import { getContainer } from 'tests/util/helpers';
-import { PivotSheet } from '@/sheet-type';
-import type { S2Options } from '@/common';
-import type { SeriesNumberCell } from '@/cell';
+import { type S2Options, PivotSheet } from '../../src';
const s2Options: S2Options = {
width: 400,
@@ -23,14 +21,10 @@ describe('SpreadSheet Series Number Tests', () => {
await s2.render();
- const seriesNumberHeader = s2.facet.seriesNumberHeader;
+ const seriesNumberCell = s2.facet.getSeriesNumberCells();
- expect(seriesNumberHeader?.children).toHaveLength(1);
-
- const seriesNum1 = seriesNumberHeader?.children[0] as SeriesNumberCell;
-
- // @ts-ignore
- expect(seriesNum1.meta.height).toEqual(60);
+ expect(seriesNumberCell).toHaveLength(1);
+ expect(seriesNumberCell[0].getMeta().height).toEqual(60);
});
test("series number should contain root parent and it's all children in tree mode", async () => {
@@ -41,13 +35,9 @@ describe('SpreadSheet Series Number Tests', () => {
await s2.render();
- const seriesNumberHeader = s2.facet.seriesNumberHeader;
-
- expect(seriesNumberHeader?.children).toHaveLength(1);
-
- const seriesNum1 = seriesNumberHeader?.children[0] as SeriesNumberCell;
+ const seriesNumberCell = s2.facet.getSeriesNumberCells();
- // @ts-ignore
- expect(seriesNum1.meta.height).toEqual(90);
+ expect(seriesNumberCell).toHaveLength(1);
+ expect(seriesNumberCell[0].getMeta().height).toEqual(90);
});
});
diff --git a/packages/s2-core/__tests__/spreadsheet/spread-sheet-totals-spec.ts b/packages/s2-core/__tests__/spreadsheet/spread-sheet-totals-spec.ts
index eeb3b48ac8..666aff715c 100644
--- a/packages/s2-core/__tests__/spreadsheet/spread-sheet-totals-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/spread-sheet-totals-spec.ts
@@ -1,8 +1,7 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
-import { get, merge } from 'lodash';
+import { merge } from 'lodash';
import { assembleDataCfg, assembleOptions, TOTALS_OPTIONS } from 'tests/util';
import { getContainer } from 'tests/util/helpers';
-import { DataCell } from '@/cell';
import type { RawData, S2DataConfig, S2Options } from '@/common';
import type { Node } from '@/facet/layout/node';
import { PivotSheet } from '@/sheet-type';
@@ -147,30 +146,22 @@ describe('Spreadsheet Totals Tests', () => {
});
await spreadsheet.render();
- const grandTotal = spreadsheet.facet.panelScrollGroup.children.find(
- (child) =>
- child instanceof DataCell && get(child, 'meta.rowId') === 'root[&]总计',
- ) as DataCell;
+ const grandTotal = spreadsheet.facet
+ .getDataCells()
+ .find((cell) => cell.getMeta().rowId === 'root[&]总计')!;
- // @ts-ignore
- expect(grandTotal.textShape.attr('text')).toEqual('26193');
+ expect(grandTotal.getTextShape().attr('text')).toEqual('26193');
- const rowSubtotal1 = spreadsheet.facet.panelScrollGroup.children.find(
- (child) =>
- child instanceof DataCell &&
- get(child, 'meta.rowId') === 'root[&]浙江省',
- ) as DataCell;
+ const rowSubtotal1 = spreadsheet.facet
+ .getDataCells()
+ .find((cell) => cell.getMeta().rowId === 'root[&]浙江省')!;
- // @ts-ignore
- expect(rowSubtotal1.textShape).toBeUndefined();
+ expect(rowSubtotal1.getTextShape()).toBeUndefined();
- const rowSubtotal2 = spreadsheet.facet.panelScrollGroup.children.find(
- (child) =>
- child instanceof DataCell &&
- get(child, 'meta.rowId') === 'root[&]浙江省',
- ) as DataCell;
+ const rowSubtotal2 = spreadsheet.facet
+ .getDataCells()
+ .find((cell) => cell.getMeta().rowId === 'root[&]四川省')!;
- // @ts-ignore
- expect(rowSubtotal2.textShape).toBeUndefined();
+ expect(rowSubtotal2.getTextShape()).toBeUndefined();
});
});
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 ae94d02794..2861bae844 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
@@ -1,5 +1,6 @@
import * as mockDataConfig from 'tests/data/simple-data.json';
import { createPivotSheet, getContainer } from 'tests/util/helpers';
+import { PivotSheet } from '../../src';
import type { S2DataConfig, S2Options } from '@/common';
const s2Options: S2Options = {
@@ -11,11 +12,11 @@ const s2Options: S2Options = {
describe('SpreadSheet Tree Mode Tests', () => {
let container: HTMLElement;
- beforeAll(() => {
+ beforeEach(() => {
container = getContainer();
});
- afterAll(() => {
+ afterEach(() => {
container?.remove();
});
@@ -51,5 +52,43 @@ describe('SpreadSheet Tree Mode Tests', () => {
rowsHierarchyWidth,
);
});
+
+ // https://github.com/antvis/S2/issues/2389
+ test('the corner should only have one line with action icon', async () => {
+ // 行头维度更改为较长的 name
+ const newDataCfg: S2DataConfig = {
+ ...mockDataConfig,
+ meta: [
+ {
+ field: 'province',
+ name: '省1234567890份',
+ },
+ {
+ field: 'city',
+ name: '城1234567890市',
+ },
+ ],
+ };
+
+ // 添加 icon
+ const newS2Options: S2Options = {
+ ...s2Options,
+ headerActionIcons: [
+ {
+ icons: ['SortDownSelected'],
+ belongsCell: 'cornerCell',
+ },
+ ],
+ };
+ const s2 = new PivotSheet(container, newDataCfg, newS2Options);
+
+ await s2.render();
+
+ // 检查文本是否只有一行
+ const cornerCell = s2.facet.getCornerCells()[0];
+
+ expect(cornerCell.getTextShapes()).toHaveLength(1);
+ expect(cornerCell.isMultiLineText()).toBeFalsy();
+ });
});
});
diff --git a/packages/s2-core/__tests__/spreadsheet/table-sheet-spec.ts b/packages/s2-core/__tests__/spreadsheet/table-sheet-spec.ts
index c9ae16ea22..19c04800dc 100644
--- a/packages/s2-core/__tests__/spreadsheet/table-sheet-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/table-sheet-spec.ts
@@ -1,20 +1,19 @@
-import { last } from 'lodash';
import { getContainer, getMockData, sleep } from 'tests/util/helpers';
import {
- ColCell,
DeviceType,
ResizeType,
TableSheet,
type RawData,
type S2DataConfig,
type S2Options,
+ LayoutWidthType,
} from '@/index';
const data = getMockData(
'../../../s2-react/__tests__/data/tableau-supermarket.csv',
) as RawData[];
-const columns = [
+const columns: string[] = [
'order_id',
'order_date',
'ship_date',
@@ -75,7 +74,7 @@ const options: S2Options = {
showSeriesNumber: true,
placeholder: '',
style: {
- layoutWidthType: 'compact',
+ layoutWidthType: LayoutWidthType.Compact,
dataCell: {
height: 32,
},
@@ -193,12 +192,11 @@ describe('TableSheet normal spec', () => {
await s2.render();
- const getLastColCell = () =>
- last(s2.facet.getColNodes())!.belongsCell as ColCell;
- const preColWidth = getLastColCell().getMeta().width;
-
await sleep(30);
+ let columnNodes = s2.facet.getColNodes();
+
+ const startCellWidth = columnNodes[columnNodes.length - 1].width;
const { x, width, top } = s2.getCanvasElement().getBoundingClientRect();
s2.getCanvasElement().dispatchEvent(
@@ -232,9 +230,10 @@ describe('TableSheet normal spec', () => {
await sleep(300);
- const currentColWidth = getLastColCell().getMeta().width;
+ columnNodes = s2.facet.getColNodes();
+ const endCellWidth = columnNodes[columnNodes.length - 1].width;
- expect(currentColWidth).toBeGreaterThanOrEqual(resizeLength + preColWidth);
+ expect(Math.floor(endCellWidth - startCellWidth)).toBe(140);
});
test('should render link shape', async () => {
diff --git a/packages/s2-core/__tests__/spreadsheet/theme-spec.ts b/packages/s2-core/__tests__/spreadsheet/theme-spec.ts
index 950807e4d7..2a9e180e62 100644
--- a/packages/s2-core/__tests__/spreadsheet/theme-spec.ts
+++ b/packages/s2-core/__tests__/spreadsheet/theme-spec.ts
@@ -1,7 +1,5 @@
/* eslint-disable jest/expect-expect */
-import { Text, type Group } from '@antv/g';
-import { createPivotSheet } from 'tests/util/helpers';
-import type { RowCell } from '@/cell';
+import { createPivotSheet, createTableSheet } from 'tests/util/helpers';
import {
CellType,
EXTRA_COLUMN_FIELD,
@@ -62,11 +60,17 @@ describe('SpreadSheet Theme Tests', () => {
expect(s2.getThemeName()).toEqual('dark');
});
- test('should get default theme', () => {
+ test('should get pivot sheet default theme', () => {
expect(s2.theme).toMatchSnapshot();
expect(s2.theme).toEqual(s2.getTheme());
});
+ test('should get table sheet theme', () => {
+ const tableSheet = createTableSheet(null);
+
+ expect(tableSheet.theme).toMatchSnapshot();
+ });
+
test.each(['dark', 'gray', 'colorful', 'default'] as ThemeName[])(
'should get %s theme',
(name) => {
@@ -219,7 +223,7 @@ describe('SpreadSheet Theme Tests', () => {
s2.setThemeCfg(getRowCellThemeCfg(align));
await s2.render();
- const rowCell = s2.facet.rowHeader!.children[0] as RowCell;
+ const rowCell = s2.facet.getRowCells()[0];
const rowCellWidth = rowCell.getMeta().width;
const actionIcon = rowCell.getActionIcons()[0];
@@ -463,9 +467,6 @@ describe('SpreadSheet Theme Tests', () => {
});
describe('Series Cell Tests', () => {
- const getTextShape = (group: Group) =>
- group.children.find((child) => child instanceof Text) as Text;
-
test.each(['top', 'middle', 'bottom'] as TextBaseline[])(
'should render %s text align for column nodes',
async (textBaseline) => {
@@ -488,14 +489,19 @@ describe('SpreadSheet Theme Tests', () => {
await s2.render();
- const rowCell = s2.facet.rowHeader!.children[0] as Group; // 浙江省
- const textOfRowCell = getTextShape(rowCell);
+ // 浙江省
+ const rowCell = s2.facet.getRowCells()[0];
+ const rowCellTextShape = rowCell.getTextShape();
- const seriesCell = s2.facet.seriesNumberHeader!.children[0] as Group; // 序号1
- const textOfSeriesCell = getTextShape(seriesCell);
+ // 序号1
+ const seriesCell = s2.facet.getSeriesNumberCells()[0];
+ const seriesCellTextShape = seriesCell.getTextShape();
- expect(textOfRowCell?.attr('textBaseline')).toEqual(textBaseline);
- expect(textOfSeriesCell?.attr('textBaseline')).toEqual(textBaseline);
+ expect(rowCellTextShape?.attr('textBaseline')).toEqual(textBaseline);
+ expect(seriesCellTextShape?.attr('textBaseline')).toEqual(textBaseline);
+ expect(rowCellTextShape.attr('y')).toEqual(
+ seriesCellTextShape.attr('y'),
+ );
},
);
});
diff --git a/packages/s2-core/__tests__/spreadsheet/total-group-spec.ts b/packages/s2-core/__tests__/spreadsheet/total-group-spec.ts
new file mode 100644
index 0000000000..4505813244
--- /dev/null
+++ b/packages/s2-core/__tests__/spreadsheet/total-group-spec.ts
@@ -0,0 +1,332 @@
+import { getContainer } from 'tests/util/helpers';
+import { map } from 'lodash';
+import { s2Options, dataCfg } from '../data/total-group-data';
+import { CellData } from '../../src';
+import type { PivotFacet } from '../../src/facet';
+import { PivotSheet } from '@/sheet-type';
+import { type S2Options, ORIGIN_FIELD } from '@/common';
+
+describe('Total Group Dimension Test', () => {
+ let container: HTMLDivElement;
+
+ let s2: PivotSheet;
+
+ beforeEach(() => {
+ container = getContainer();
+ });
+
+ afterEach(() => {
+ // s2?.destroy();
+ });
+
+ test(`should get correct layout with row total group dimension 'type'`, async () => {
+ s2 = new PivotSheet(container, dataCfg, s2Options as S2Options);
+ await s2.render();
+
+ const facet = s2.facet as PivotFacet;
+ const { rowLeafNodes } = facet.getLayoutResult();
+
+ expect(map(rowLeafNodes, 'id')).toMatchInlineSnapshot(`
+ Array [
+ "root[&]总计[&]家具",
+ "root[&]总计[&]办公用品",
+ "root[&]浙江省[&]小计[&]家具",
+ "root[&]浙江省[&]小计[&]办公用品",
+ "root[&]浙江省[&]杭州市[&]家具",
+ "root[&]浙江省[&]杭州市[&]办公用品",
+ "root[&]浙江省[&]舟山市[&]家具",
+ "root[&]浙江省[&]舟山市[&]办公用品",
+ "root[&]四川省[&]小计[&]家具",
+ "root[&]四川省[&]小计[&]办公用品",
+ "root[&]四川省[&]成都市[&]家具",
+ "root[&]四川省[&]成都市[&]办公用品",
+ "root[&]四川省[&]绵阳市[&]家具",
+ "root[&]四川省[&]绵阳市[&]办公用品",
+ ]
+ `);
+
+ expect((facet.getCellMeta(0, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ type: '家具',
+ price: 2000,
+ });
+ expect((facet.getCellMeta(1, 1)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ type: '办公用品',
+ cost: 1900,
+ });
+ });
+
+ test(`should get correct layout with row total group dimension 'city'`, async () => {
+ const newS2Options = {
+ ...s2Options,
+ totals: {
+ ...s2Options.totals,
+ row: {
+ ...s2Options.totals!.row!,
+ grandTotalsGroupDimensions: ['city'],
+ },
+ },
+ };
+
+ s2 = new PivotSheet(container, dataCfg, newS2Options as S2Options);
+ await s2.render();
+
+ const facet = s2.facet;
+ const { rowLeafNodes } = facet.getLayoutResult();
+
+ expect(map(rowLeafNodes, 'id')).toMatchInlineSnapshot(`
+ Array [
+ "root[&]总计[&]杭州市",
+ "root[&]总计[&]舟山市",
+ "root[&]总计[&]成都市",
+ "root[&]总计[&]绵阳市",
+ "root[&]浙江省[&]小计[&]家具",
+ "root[&]浙江省[&]小计[&]办公用品",
+ "root[&]浙江省[&]杭州市[&]家具",
+ "root[&]浙江省[&]杭州市[&]办公用品",
+ "root[&]浙江省[&]舟山市[&]家具",
+ "root[&]浙江省[&]舟山市[&]办公用品",
+ "root[&]四川省[&]小计[&]家具",
+ "root[&]四川省[&]小计[&]办公用品",
+ "root[&]四川省[&]成都市[&]家具",
+ "root[&]四川省[&]成都市[&]办公用品",
+ "root[&]四川省[&]绵阳市[&]家具",
+ "root[&]四川省[&]绵阳市[&]办公用品",
+ ]
+ `);
+
+ expect((facet.getCellMeta(0, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ city: '杭州市',
+ price: 300,
+ });
+
+ expect((facet.getCellMeta(1, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ city: '舟山市',
+ price: 800,
+ });
+
+ expect((facet.getCellMeta(2, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ city: '成都市',
+ price: 1200,
+ });
+
+ expect((facet.getCellMeta(3, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ city: '绵阳市',
+ price: 1600,
+ });
+ });
+
+ test(`should get correct layout with row sub group dimension 'type'`, async () => {
+ const newS2Options = {
+ ...s2Options,
+ totals: {
+ ...s2Options.totals,
+ row: {
+ ...s2Options.totals!.row,
+ // 总计分组下，city 城市维度会出现分组
+ grandTotalsGroupDimensions: ['city'],
+ subTotalsGroupDimensions: ['type'],
+ },
+ },
+ };
+
+ const newDataCfg = {
+ ...dataCfg,
+ fields: {
+ ...dataCfg.fields,
+ rows: ['province', 'city', 'type'],
+ columns: ['sub_type'],
+ values: ['price', 'cost'],
+ },
+ };
+
+ s2 = new PivotSheet(container, newDataCfg, newS2Options as S2Options);
+ await s2.render();
+
+ const facet = s2.facet;
+ const { rowLeafNodes } = facet.getLayoutResult();
+
+ expect(rowLeafNodes[4].id).toEqual('root[&]浙江省[&]小计[&]家具');
+ expect(rowLeafNodes[5].id).toEqual('root[&]浙江省[&]小计[&]办公用品');
+
+ expect((facet.getCellMeta(4, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ province: '浙江省',
+ price: 600,
+ type: '家具',
+ });
+
+ expect((facet.getCellMeta(5, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ province: '浙江省',
+ type: '办公用品',
+ price: 500,
+ });
+ });
+
+ test(`should get correct layout with col total group dimension 'type'`, async () => {
+ const newS2Options = {
+ ...s2Options,
+ totals: {
+ ...s2Options.totals,
+ col: {
+ ...s2Options.totals!.col,
+ grandTotalsGroupDimensions: ['type'],
+ },
+ },
+ };
+
+ const newDataCfg = {
+ ...dataCfg,
+ fields: {
+ ...dataCfg.fields,
+ rows: ['province'],
+ columns: ['city', 'type', 'sub_type'],
+ values: ['price', 'cost'],
+ },
+ };
+
+ s2 = new PivotSheet(container, newDataCfg, newS2Options as S2Options);
+ await s2.render();
+
+ const facet = s2.facet;
+
+ expect((facet.getCellMeta(0, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ type: '家具',
+ price: 2000,
+ });
+
+ expect((facet.getCellMeta(0, 2)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ type: '办公用品',
+ price: 1900,
+ });
+ });
+
+ test(`should get correct layout with col total group dimension 'sub_type'`, async () => {
+ const newS2Options = {
+ ...s2Options,
+ totals: {
+ ...s2Options.totals,
+ col: {
+ ...s2Options.totals!.col,
+ grandTotalsGroupDimensions: ['sub_type'],
+ },
+ },
+ };
+
+ const newDataCfg = {
+ ...dataCfg,
+ fields: {
+ ...dataCfg.fields,
+ rows: ['province'],
+ columns: ['city', 'type', 'sub_type'],
+ values: ['price', 'cost'],
+ },
+ };
+
+ s2 = new PivotSheet(container, newDataCfg, newS2Options as S2Options);
+ await s2.render();
+
+ const facet = s2.facet;
+
+ expect((facet.getCellMeta(0, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ sub_type: '桌子',
+ price: 1000,
+ });
+
+ expect((facet.getCellMeta(0, 2)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ sub_type: '沙发',
+ price: 1000,
+ });
+
+ expect((facet.getCellMeta(0, 4)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ sub_type: '笔',
+ price: 1000,
+ });
+
+ expect((facet.getCellMeta(0, 6)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ sub_type: '纸张',
+ price: 900,
+ });
+ });
+
+ test(`should get correct layout with col sub total group dimension 'sub_type'`, async () => {
+ const newS2Options = {
+ ...s2Options,
+ totals: {
+ ...s2Options.totals,
+ col: {
+ ...s2Options.totals!.col,
+ grandTotalsGroupDimensions: [],
+ subTotalsDimensions: ['city'],
+ subTotalsGroupDimensions: ['sub_type'],
+ },
+ },
+ };
+
+ const newDataCfg = {
+ ...dataCfg,
+ fields: {
+ ...dataCfg.fields,
+ rows: ['province'],
+ columns: ['city', 'type', 'sub_type'],
+ values: ['price', 'cost'],
+ },
+ };
+
+ s2 = new PivotSheet(container, newDataCfg, newS2Options as S2Options);
+ await s2.render();
+
+ const facet = s2.facet;
+
+ expect((facet.getCellMeta(0, 2)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ city: '杭州市',
+ sub_type: '桌子',
+ price: 100,
+ });
+
+ expect((facet.getCellMeta(0, 4)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ city: '杭州市',
+ sub_type: '沙发',
+ price: 100,
+ });
+
+ expect((facet.getCellMeta(0, 6)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ city: '杭州市',
+ sub_type: '笔',
+ price: 100,
+ });
+ });
+
+ test(`should get correct layout with giving total data`, async () => {
+ const newDataCfg = {
+ ...dataCfg,
+ data: dataCfg.data.concat([
+ {
+ type: '家具',
+ price: 6666,
+ cost: 6666,
+ },
+ {
+ type: '办公用品',
+ price: 9999,
+ cost: 9999,
+ },
+ ]),
+ };
+
+ s2 = new PivotSheet(container, newDataCfg, s2Options as S2Options);
+ await s2.render();
+
+ const facet = s2.facet;
+
+ expect((facet.getCellMeta(0, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ type: '家具',
+ price: 6666,
+ cost: 6666,
+ });
+
+ expect((facet.getCellMeta(1, 0)!.data as CellData)[ORIGIN_FIELD]).toEqual({
+ type: '办公用品',
+ price: 9999,
+ cost: 9999,
+ });
+ });
+});
diff --git a/packages/s2-core/__tests__/unit/cell/col-cell-spec.ts b/packages/s2-core/__tests__/unit/cell/col-cell-spec.ts
index 9331a781d0..66be515b2d 100644
--- a/packages/s2-core/__tests__/unit/cell/col-cell-spec.ts
+++ b/packages/s2-core/__tests__/unit/cell/col-cell-spec.ts
@@ -1,13 +1,13 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
-import { get, set } from 'lodash';
+import { set } from 'lodash';
import { createFakeSpreadSheet, createPivotSheet } from 'tests/util/helpers';
import type { ColHeaderConfig } from '../../../src/facet/header';
import { getContainer } from './../../util/helpers';
-import type { Node } from '@/facet/layout/node';
-import { PivotDataSet } from '@/data-set';
-import { SpreadSheet, PivotSheet } from '@/sheet-type';
-import { EXTRA_FIELD, type Formatter, type TextAlign } from '@/common';
import { ColCell } from '@/cell';
+import { EXTRA_FIELD, type Formatter, type TextAlign } from '@/common';
+import { PivotDataSet } from '@/data-set';
+import type { Node } from '@/facet/layout/node';
+import { PivotSheet, SpreadSheet } from '@/sheet-type';
const MockPivotSheet = PivotSheet as unknown as jest.Mock| 家具 | 家具 | 办公用品 | 办公用品 |
| 桌子 | 沙发 | 笔 | 纸张 |
| 数量 | 数量 | 数量 | 数量 |
| 浙江省 | 杭州市 |
| 浙江省 | 绍兴市 |
| 浙江省 | 宁波市 |
| 浙江省 | 舟山市 |
| 四川省 | 成都市 |
| 四川省 | 绵阳市 |
| 四川省 | 南充市 |
| 四川省 | 乐山市 |
| 家具 | 家具 | 家具 | 办公用品 | 办公用品 |
| 桌子 | 沙发 | 小计 | 笔 | 纸张 |
| number | number | 小计 | number | number |
| 家具 | 家具 | 家具 | 办公用品 | 办公用品 | ||
| 桌子 | 沙发 | 小计 | 笔 | 纸张 | ||
| 数量 | 数量 | 数量 | 数量 | |||
| 浙江省 | 18375-@ | 14043-@ | 32418-@ | 4826-@ | 5854-@ | |
| 浙江省 | 杭州市 | 7789-@ | 5343-@ | 13132-@ | 945-@ | 1343-@ |
| 浙江省 | 绍兴市 | 2367-@ | 632-@ | 2999-@ | 1304-@ | 1354-@ |
| 浙江省 | 宁波市 | 3877-@ | 7234-@ | 11111-@ | 1145-@ | 1523-@ |
| 浙江省 | 舟山市 | 4342-@ | 834-@ | 5176-@ | 1432-@ | 1634-@ |
| 四川省 | 7818-@ | 9473-@ | 17291-@ | 7495-@ | 10984-@ | |
| 四川省 | 成都市 | 1723-@ | 2451-@ | 4174-@ | 2335-@ | 4004-@ |
| 四川省 | 绵阳市 | 1822-@ | 2244-@ | 4066-@ | 245-@ | 3077-@ |
| 四川省 | 南充市 | 1943-@ | 2333-@ | 4276-@ | 2457-@ | 3551-@ |
| 四川省 | 乐山市 | 2330-@ | 2445-@ | 4775-@ | 2458-@ | 352-@ |
| 总计 | 26193-@ | 23516-@ | 49709-@ | 12321-@ | 16838-@ |
| 家具 | 家具 | 家具 | 办公用品 | 办公用品 | ||
| 桌子 | 沙发 | 小计 | 笔 | 纸张 | ||
| 数量 | 数量 | 数量 | 数量 | |||
| 浙江省 | 18375 | 14043 | 32418 | 4826 | 5854 | |
| 浙江省 | 杭州市 | 7789 | 5343 | 13132 | 945 | 1343 |
| 浙江省 | 绍兴市 | 2367 | 632 | 2999 | 1304 | 1354 |
| 浙江省 | 宁波市 | 3877 | 7234 | 11111 | 1145 | 1523 |
| 浙江省 | 舟山市 | 4342 | 834 | 5176 | 1432 | 1634 |
| 四川省 | 7818 | 9473 | 17291 | 7495 | 10984 | |
| 四川省 | 成都市 | 1723 | 2451 | 4174 | 2335 | 4004 |
| 四川省 | 绵阳市 | 1822 | 2244 | 4066 | 245 | 3077 |
| 四川省 | 南充市 | 1943 | 2333 | 4276 | 2457 | 3551 |
| 四川省 | 乐山市 | 2330 | 2445 | 4775 | 2458 | 352 |
| 总计 | 26193 | 23516 | 49709 | 12321 | 16838 |
| 家具 | 家具 | 家具 | 办公用品 | 办公用品 |
| 桌子 | 沙发 | 小计 | 笔 | 纸张 |
| number | number | 小计 | number | number |
+
+### multipleMap 如何计算 - getMultipleMap 函数
+
+行总计 multipleMap：
+
+1. 初始化一个长度与 rows 相同的数组 [ 1, 1, 1 ,1 ]
+2. 从后往前判断 totalDimensionGroup.includes(field)
+ - 第一个处理子类别，不做处理
+ - 第二个处理 类别,判断为 false，将类别数值向前移动[ 1, 2, 0, 1]
+ - 第三个判断 城市，判断为 false，将城市数值向前移动[ 3, 0, 0, 1]
+ - 第四个 省份，首个维度不做遍历
+3. multipleMap 结果为 [ 3, 0, 0, 1]
+
+行小计 multipleMap：
+
+1. 初始化一个长度与 rows 相同的数组 [ 1, 1, 1 ,1 ]
+2. 从后往前判断 subTotalDimensionGroup.includes(field)
+ - 第一个处理子类别，判断为 true，不做处理
+ - 第二个处理 类别,判断为 false，将类别数值向前移动[ 1, 1, 2, 0]
+ - 第三个判断 城市，判断为 flase，不做处理
+ - 第四个 省份，首个维度不做遍历
+3. multipleMap 结果为 [ 1, 1, 2, 0]
+
+### multipleMap 如何使用 - adjustTotalNodesCoordinate 函数
+
+总计的 multipleMap = [ 1 , 1 ，2 ，0 ]
+
+multipleMap 表示：
+
+- row 的第一第二个维度占据一个单元格
+- 第三个维度合并两个单元格
+- 第四个维度没有节点
+
+小计的 multipleMap = [ 3，0，0，1 ]
+
+multipleMap 表示：
+
+- 小计结点，row的第一个维度合并三个单元格
+- 小计结点的最后一个维度占据一个单元格
+
+当小计节点出现在第二个维度，则合并量为‘最近的上一个不为0的值’ - level 差
+
+即实际该小计节点实际的 multipleMap 为 [1,2,0,1]
diff --git a/packages/s2-core/src/facet/base-facet.ts b/packages/s2-core/src/facet/base-facet.ts
index 1cd3eeec29..8375b25398 100644
--- a/packages/s2-core/src/facet/base-facet.ts
+++ b/packages/s2-core/src/facet/base-facet.ts
@@ -47,6 +47,7 @@ import {
KEY_GROUP_PANEL_SCROLL,
KEY_GROUP_ROW_INDEX_RESIZE_AREA,
KEY_GROUP_ROW_RESIZE_AREA,
+ OriginEventType,
PANEL_GROUP_GROUP_CONTAINER_Z_INDEX,
PANEL_GROUP_SCROLL_GROUP_Z_INDEX,
S2Event,
@@ -54,9 +55,9 @@ import {
} from '../common/constant';
import { DEFAULT_PAGE_INDEX } from '../common/constant/pagination';
import {
- DebuggerUtil,
DEBUG_HEADER_LAYOUT,
DEBUG_VIEW_RENDER,
+ DebuggerUtil,
} from '../common/debug';
import type {
AdjustLeafNodesParams,
@@ -83,22 +84,24 @@ import { getAdjustedRowScrollX, getAdjustedScrollOffset } from '../utils/facet';
import { getAllChildCells } from '../utils/get-all-child-cells';
import { getColsForGrid, getRowsForGrid } from '../utils/grid';
import { diffPanelIndexes, type PanelIndexes } from '../utils/indexes';
-import { isMobile } from '../utils/is-mobile';
-import { CornerBBox } from './bbox/cornerBBox';
-import { PanelBBox } from './bbox/panelBBox';
+import { isMobile, isWindows } from '../utils/is-mobile';
+import { floor } from '../utils/math';
+import { CornerBBox } from './bbox/corner-bbox';
+import { PanelBBox } from './bbox/panel-bbox';
import {
ColHeader,
CornerHeader,
Frame,
RowHeader,
SeriesNumberHeader,
+ type RowHeaderConfig,
} from './header';
import type { Hierarchy } from './layout/hierarchy';
import type { ViewCellHeights } from './layout/interface';
import { Node } from './layout/node';
import { WheelEvent as MobileWheel } from './mobile/wheelEvent';
import {
- calculateInViewIndexes,
+ areAllFieldsEmpty,
getCellRange,
optimizeScrollXY,
translateGroup,
@@ -141,7 +144,7 @@ export abstract class BaseFacet {
* 当前布局节点信息
* @description 内部消费, 外部调用请使用 facet.getLayoutResult()
*/
- private layoutResult: LayoutResult;
+ protected layoutResult: LayoutResult;
public viewCellWidths: number[];
@@ -171,8 +174,17 @@ export abstract class BaseFacet {
protected abstract doLayout(): LayoutResult;
+ protected abstract clip(scrollX: number, scrollY: number): void;
+
+ public abstract calculateXYIndexes(
+ scrollX: number,
+ scrollY: number,
+ ): PanelIndexes;
+
public abstract getViewCellHeights(): ViewCellHeights;
+ public abstract addDataCell(cell: DataCell): void;
+
public abstract getCellMeta(
rowIndex: number,
colIndex: number,
@@ -212,7 +224,6 @@ export abstract class BaseFacet {
protected initGroups() {
const container = this.spreadsheet.container;
- // the main three layer groups
this.backgroundGroup = container.appendChild(
new Group({
name: KEY_GROUP_BACK_GROUND,
@@ -221,6 +232,7 @@ export abstract class BaseFacet {
);
this.initPanelGroups();
+
this.foregroundGroup = container.appendChild(
new Group({
name: KEY_GROUP_FORE_GROUND,
@@ -356,11 +368,25 @@ export abstract class BaseFacet {
colsHierarchy.sampleNodesForAllLevels = compact(
sampleMaxHeightNodesForAllLevels,
);
+
colsHierarchy.sampleNodesForAllLevels.forEach((levelSampleNode) => {
levelSampleNode.height = this.getColNodeHeight(
levelSampleNode,
colsHierarchy,
);
+ if (levelSampleNode.level === 0) {
+ levelSampleNode.y = 0;
+ } else {
+ const preLevelSample = colsHierarchy.sampleNodesForAllLevels[
+ levelSampleNode.level - 1
+ ] ?? {
+ y: 0,
+ height: 0,
+ };
+
+ levelSampleNode.y = preLevelSample.y + preLevelSample.height;
+ }
+
colsHierarchy.height += levelSampleNode.height;
});
}
@@ -410,6 +436,7 @@ export abstract class BaseFacet {
const { deltaX, deltaY, x, y } = ev;
// The coordinates of mobile and pc are three times different
+ // TODO: 手指快速往上滚动时, deltaY 有时会为负数, 导致向下滚动时然后回弹, 看起来就像表格在抖动, 需要判断滚动方向, next 版本未复现
this.onWheel({
...originEvent,
deltaX,
@@ -429,6 +456,10 @@ export abstract class BaseFacet {
* Start render, call from outside
*/
public render() {
+ if (areAllFieldsEmpty(this.spreadsheet.dataCfg.fields)) {
+ return;
+ }
+
this.adjustScrollOffset();
this.renderHeaders();
this.renderScrollBars();
@@ -528,7 +559,7 @@ export abstract class BaseFacet {
const offset = get(scrollOffset, key);
if (!isUndefined(offset)) {
- this.spreadsheet.store.set(key, Math.floor(offset));
+ this.spreadsheet.store.set(key, floor(offset));
}
});
};
@@ -566,7 +597,7 @@ export abstract class BaseFacet {
const { current = DEFAULT_PAGE_INDEX, pageSize } = pagination;
const total = this.viewCellHeights.getTotalLength();
- const pageCount = Math.floor((total - 1) / pageSize) + 1;
+ const pageCount = floor((total - 1) / pageSize) + 1;
this.spreadsheet.emit(S2Event.LAYOUT_PAGINATION, {
pageSize,
@@ -602,35 +633,6 @@ export abstract class BaseFacet {
this.viewCellHeights = this.getViewCellHeights();
};
- /**
- * The purpose of this rewrite is to take into account that when rowHeader supports scrollbars
- *the panel viewable area must vary with the horizontal distance of the scroll
- * @param scrollX
- * @param scrollY
- * @public
- */
- public calculateXYIndexes(scrollX: number, scrollY: number): PanelIndexes {
- const { viewportHeight: height, viewportWidth: width } = this.panelBBox;
-
- const indexes = calculateInViewIndexes({
- scrollX,
- scrollY,
- widths: this.viewCellWidths,
- heights: this.viewCellHeights,
- viewport: {
- width,
- height,
- x: 0,
- y: 0,
- },
- rowRemainWidth: this.getRealScrollX(this.cornerBBox.width),
- });
-
- return {
- center: indexes,
- };
- }
-
getRealScrollX = (scrollX: number, hRowScroll = 0) =>
this.spreadsheet.isFrozenRowHeader() ? hRowScroll : scrollX;
@@ -710,19 +712,25 @@ export abstract class BaseFacet {
);
this.timer = timer((elapsed) => {
- const ratio = Math.min(elapsed / duration, 1);
- const [scrollX, scrollY, rowHeaderScrollX] = interpolate(ratio);
-
- this.setScrollOffset({
- rowHeaderScrollX,
- scrollX,
- scrollY,
- });
- this.startScroll();
+ try {
+ const ratio = Math.min(elapsed / duration, 1);
+ const [scrollX, scrollY, rowHeaderScrollX] = interpolate(ratio);
+
+ this.setScrollOffset({
+ rowHeaderScrollX,
+ scrollX,
+ scrollY,
+ });
+ this.startScroll();
- if (elapsed > duration) {
+ if (elapsed > duration) {
+ this.timer.stop();
+ cb?.();
+ }
+ } catch (e) {
+ // eslint-disable-next-line no-console
+ console.error(e);
this.timer.stop();
- cb?.();
}
});
};
@@ -829,7 +837,7 @@ export abstract class BaseFacet {
ScrollType.ScrollChange,
({ offset }: ScrollChangeParams) => {
const newOffset = this.getValidScrollBarOffset(offset, maxOffset);
- const rowHeaderScrollX = Math.floor(newOffset);
+ const rowHeaderScrollX = floor(newOffset);
this.setScrollOffset({ rowHeaderScrollX });
@@ -871,7 +879,7 @@ export abstract class BaseFacet {
clamp(offset, 0, maxOffset);
renderHScrollBar = (width: number, realWidth: number, scrollX: number) => {
- if (Math.floor(width) < Math.floor(realWidth)) {
+ if (floor(width) < floor(realWidth)) {
const halfScrollSize = this.scrollBarSize / 2;
const { maxY } = this.getScrollbarPosition();
const isScrollContainsRowHeader = !this.spreadsheet.isFrozenRowHeader();
@@ -1158,9 +1166,16 @@ export abstract class BaseFacet {
};
private stopScrollChaining = (event: WheelEvent) => {
- event?.preventDefault?.();
+ if (event?.cancelable) {
+ event?.preventDefault?.();
+ }
+
// 移动端的 prevent 存在于 originalEvent上
- (event as unknown as GraphEvent)?.originalEvent?.preventDefault?.();
+ const mobileEvent = (event as unknown as GraphEvent)?.originalEvent;
+
+ if (mobileEvent?.cancelable) {
+ mobileEvent?.preventDefault?.();
+ }
};
onWheel = (event: WheelEvent) => {
@@ -1168,8 +1183,9 @@ export abstract class BaseFacet {
let { deltaX, deltaY, offsetX, offsetY } = event;
const { shiftKey } = event;
- // 按住shift时，固定为水平方向滚动
- if (shiftKey) {
+ // Windows 环境，按住 shift 时，固定为水平方向滚动，macOS 环境默认有该行为
+ // see https://github.com/antvis/S2/issues/2198
+ if (shiftKey && isWindows()) {
offsetX = offsetX - deltaX + deltaY;
deltaX = deltaY;
offsetY -= deltaY;
@@ -1265,26 +1281,21 @@ export abstract class BaseFacet {
scrollY,
KEY_GROUP_ROW_INDEX_RESIZE_AREA,
);
- this.cornerHeader.onCorScroll(
+ this.cornerHeader?.onCorScroll(
this.getRealScrollX(scrollX, hRowScroll),
KEY_GROUP_CORNER_RESIZE_AREA,
);
- this.centerFrame.onChangeShadowVisibility(
+ this.centerFrame?.onChangeShadowVisibility(
scrollX,
this.getRealWidth() - this.panelBBox.width,
);
- this.centerFrame.onBorderScroll(this.getRealScrollX(scrollX));
- this.columnHeader.onColScroll(scrollX, KEY_GROUP_COL_RESIZE_AREA);
+ this.centerFrame?.onBorderScroll(this.getCenterFrameScrollX(scrollX));
+ this.columnHeader?.onColScroll(scrollX, KEY_GROUP_COL_RESIZE_AREA);
}
- addDataCell = (cell: DataCell) => {
- this.panelScrollGroup?.appendChild(cell);
-
- setTimeout(() => {
- this.spreadsheet.emit(S2Event.DATA_CELL_RENDER, cell);
- this.spreadsheet.emit(S2Event.LAYOUT_CELL_RENDER, cell);
- }, 100);
- };
+ protected getCenterFrameScrollX(scrollX: number) {
+ return this.getRealScrollX(scrollX);
+ }
realDataCellRender = (scrollX: number, scrollY: number) => {
const indexes = this.calculateXYIndexes(scrollX, scrollY);
@@ -1305,6 +1316,11 @@ export abstract class BaseFacet {
if (viewMeta) {
const cell = this.spreadsheet.options.dataCell?.(viewMeta)!;
+ if (!cell) {
+ return;
+ }
+
+ cell.position = [j, i];
// mark cell for removing
cell.name = `${i}-${j}`;
this.addDataCell(cell);
@@ -1431,20 +1447,24 @@ export abstract class BaseFacet {
this.foregroundGroup.appendChild(this.centerFrame);
}
+ protected getRowHeaderCfg(): RowHeaderConfig {
+ const { y, viewportHeight, viewportWidth, height } = this.panelBBox;
+ const seriesNumberWidth = this.getSeriesNumberWidth();
+
+ return {
+ width: this.cornerBBox.width,
+ height,
+ viewportWidth,
+ viewportHeight,
+ position: { x: seriesNumberWidth, y },
+ nodes: this.layoutResult.rowNodes,
+ spreadsheet: this.spreadsheet,
+ };
+ }
+
protected getRowHeader(): RowHeader | null {
if (!this.rowHeader) {
- const { y, viewportHeight, viewportWidth, height } = this.panelBBox;
- const seriesNumberWidth = this.getSeriesNumberWidth();
-
- return new RowHeader({
- width: this.cornerBBox.width,
- height,
- viewportWidth,
- viewportHeight,
- position: { x: seriesNumberWidth, y },
- nodes: this.layoutResult.rowNodes,
- spreadsheet: this.spreadsheet,
- });
+ return new RowHeader(this.getRowHeaderCfg());
}
return this.rowHeader;
@@ -1524,8 +1544,12 @@ export abstract class BaseFacet {
protected getGridInfo = () => {
const [colMin, colMax, rowMin, rowMax] = this.preCellIndexes!.center;
- const cols = getColsForGrid(colMin, colMax, this.layoutResult.colLeafNodes);
- const rows = getRowsForGrid(rowMin, rowMax, this.viewCellHeights);
+ const cols = getColsForGrid(
+ colMin!,
+ colMax!,
+ this.layoutResult.colLeafNodes,
+ );
+ const rows = getRowsForGrid(rowMin!, rowMax!, this.viewCellHeights);
return {
cols,
@@ -1550,12 +1574,7 @@ export abstract class BaseFacet {
scrollY: originalScrollY,
rowHeaderScrollX,
} = this.getScrollOffset();
- const defaultScrollY = originalScrollY + this.getPaginationScrollY();
- const scrollY = getAdjustedScrollOffset(
- defaultScrollY,
- this.viewCellHeights.getTotalHeight(),
- this.panelBBox.viewportHeight,
- );
+ const scrollY = originalScrollY + this.getPaginationScrollY();
this.spreadsheet.hideTooltip();
this.spreadsheet.interaction.clearHoverTimer();
@@ -1563,6 +1582,9 @@ export abstract class BaseFacet {
this.realDataCellRender(scrollX, scrollY);
this.updatePanelScrollGroup();
this.translateRelatedGroups(scrollX, scrollY, rowHeaderScrollX);
+
+ this.clip(scrollX, scrollY);
+
if (!skipScrollEvent) {
this.emitScrollEvent({ scrollX, scrollY, rowHeaderScrollX });
}
@@ -1575,11 +1597,31 @@ export abstract class BaseFacet {
}
protected onAfterScroll = debounce(() => {
- const { interaction } = this.spreadsheet;
+ const { interaction, container } = this.spreadsheet;
// 如果是选中单元格状态, 则继续保留 hover 拦截, 避免滚动后 hover 清空已选单元格
if (!interaction.isSelectedState()) {
- this.spreadsheet.interaction.removeIntercepts([InterceptType.HOVER]);
+ interaction.removeIntercepts([InterceptType.HOVER]);
+
+ if (interaction.getHoverAfterScroll()) {
+ // https://github.com/antvis/S2/issues/2222
+ const canvasMousemoveEvent =
+ interaction.eventController.canvasMousemoveEvent;
+
+ if (canvasMousemoveEvent) {
+ const { x, y } = canvasMousemoveEvent;
+ const shape = container.document.elementFromPointSync(x, y);
+
+ if (shape) {
+ container.emit(OriginEventType.POINTER_MOVE, {
+ ...canvasMousemoveEvent,
+ shape,
+ target: shape,
+ timestamp: performance.now(),
+ });
+ }
+ }
+ }
}
}, 300);
@@ -1607,8 +1649,9 @@ export abstract class BaseFacet {
return;
}
- return hiddenColumnsDetail.find((detail) =>
- detail.hideColumnNodes.some((node) => node.id === columnNode.id),
+ return hiddenColumnsDetail.find(
+ (detail) =>
+ detail?.hideColumnNodes?.some((node) => node.id === columnNode.id),
);
}
@@ -1732,6 +1775,10 @@ export abstract class BaseFacet {
return colNodes.filter((node) => node.level === level);
}
+ public getTopLevelColNodes() {
+ return this.getColNodes(0);
+ }
+
/**
* 根据 id 获取指定列头节点
* @example facet.getColNodeById('root[&]节点1[&]数值')
diff --git a/packages/s2-core/src/facet/bbox/baseBBox.ts b/packages/s2-core/src/facet/bbox/base-bbox.ts
similarity index 100%
rename from packages/s2-core/src/facet/bbox/baseBBox.ts
rename to packages/s2-core/src/facet/bbox/base-bbox.ts
diff --git a/packages/s2-core/src/facet/bbox/cornerBBox.ts b/packages/s2-core/src/facet/bbox/corner-bbox.ts
similarity index 93%
rename from packages/s2-core/src/facet/bbox/cornerBBox.ts
rename to packages/s2-core/src/facet/bbox/corner-bbox.ts
index e7ca126e02..6aebf3f4b8 100644
--- a/packages/s2-core/src/facet/bbox/cornerBBox.ts
+++ b/packages/s2-core/src/facet/bbox/corner-bbox.ts
@@ -1,6 +1,7 @@
import { clamp, isBoolean } from 'lodash';
import { DEFAULT_CORNER_MAX_WIDTH_RATIO } from '../../common/constant';
-import { BaseBBox } from './baseBBox';
+import { floor } from '../../utils/math';
+import { BaseBBox } from './base-bbox';
export class CornerBBox extends BaseBBox {
calculateBBox() {
@@ -26,7 +27,7 @@ export class CornerBBox extends BaseBBox {
return colCell?.height;
}
- return Math.floor(colsHierarchy.height);
+ return floor(colsHierarchy.height);
}
private getCornerBBoxHeight() {
@@ -38,7 +39,7 @@ export class CornerBBox extends BaseBBox {
private getCornerBBoxWidth() {
const { rowsHierarchy } = this.layoutResult;
- this.originalWidth = Math.floor(
+ this.originalWidth = floor(
rowsHierarchy.width + this.facet.getSeriesNumberWidth(),
);
@@ -87,6 +88,6 @@ export class CornerBBox extends BaseBBox {
clippedWidth = maxCornerBBoxWidth;
}
- return Math.floor(clippedWidth);
+ return floor(clippedWidth);
}
}
diff --git a/packages/s2-core/src/facet/bbox/panelBBox.ts b/packages/s2-core/src/facet/bbox/panel-bbox.ts
similarity index 85%
rename from packages/s2-core/src/facet/bbox/panelBBox.ts
rename to packages/s2-core/src/facet/bbox/panel-bbox.ts
index aa27d03aad..3cea077be9 100644
--- a/packages/s2-core/src/facet/bbox/panelBBox.ts
+++ b/packages/s2-core/src/facet/bbox/panel-bbox.ts
@@ -1,5 +1,6 @@
+import { floor } from '../../utils/math';
import { Frame } from '../header/frame';
-import { BaseBBox } from './baseBBox';
+import { BaseBBox } from './base-bbox';
export class PanelBBox extends BaseBBox {
calculateBBox() {
@@ -8,8 +9,8 @@ export class PanelBBox extends BaseBBox {
const { cornerBBox } = this.facet;
const cornerPosition = {
- x: Math.floor(cornerBBox.maxX),
- y: Math.floor(cornerBBox.maxY),
+ x: floor(cornerBBox.maxX),
+ y: floor(cornerBBox.maxY),
};
// splitLine 也应该占位，panelBBox = canvasBBox - cornerBBox - splitLineBBox
@@ -30,10 +31,10 @@ export class PanelBBox extends BaseBBox {
this.width = panelWidth;
this.height = panelHeight;
this.viewportHeight = Math.abs(
- Math.floor(Math.min(panelHeight, this.originalHeight)),
+ floor(Math.min(panelHeight, this.originalHeight)),
);
this.viewportWidth = Math.abs(
- Math.floor(Math.min(panelWidth, this.originalWidth)),
+ floor(Math.min(panelWidth, this.originalWidth)),
);
this.maxX = this.x + this.viewportWidth;
this.maxY = this.y + this.viewportHeight;
diff --git a/packages/s2-core/src/facet/frozen-facet.ts b/packages/s2-core/src/facet/frozen-facet.ts
new file mode 100644
index 0000000000..5045e4b778
--- /dev/null
+++ b/packages/s2-core/src/facet/frozen-facet.ts
@@ -0,0 +1,775 @@
+import { Group, Rect, type LineStyleProps } from '@antv/g';
+import { last } from 'lodash';
+import type { DataCell } from '../cell';
+import {
+ FRONT_GROUND_GROUP_FROZEN_Z_INDEX,
+ FrozenCellGroupMap,
+ FrozenGroupType,
+ KEY_GROUP_FROZEN_SPLIT_LINE,
+ KEY_GROUP_PANEL_FROZEN_BOTTOM,
+ KEY_GROUP_PANEL_FROZEN_COL,
+ KEY_GROUP_PANEL_FROZEN_ROW,
+ KEY_GROUP_PANEL_FROZEN_TOP,
+ KEY_GROUP_PANEL_FROZEN_TRAILING_COL,
+ KEY_GROUP_PANEL_FROZEN_TRAILING_ROW,
+ PANEL_GROUP_FROZEN_GROUP_Z_INDEX,
+ S2Event,
+ SPLIT_LINE_WIDTH,
+} from '../common/constant';
+import type { SimpleBBox } from '../engine';
+import { FrozenGroup } from '../group/frozen-group';
+import { getValidFrozenOptions, renderLine } from '../utils';
+import {
+ getColsForGrid,
+ getFrozenRowsForGrid,
+ getRowsForGrid,
+} from '../utils/grid';
+import type { Indexes, PanelIndexes } from '../utils/indexes';
+import { floor } from '../utils/math';
+import { BaseFacet } from './base-facet';
+import { Frame } from './header/frame';
+import { Node } from './layout/node';
+import {
+ calculateFrozenCornerCells,
+ calculateInViewIndexes,
+ getFrozenDataCellType,
+ getFrozenLeafNodesCount,
+ splitInViewIndexesWithFrozen,
+ translateGroup,
+} from './utils';
+
+/**
+ * Defines the row freeze abstract standard interface
+ */
+export abstract class FrozenFacet extends BaseFacet {
+ public rowOffsets: number[];
+
+ public frozenGroupInfo = {
+ [FrozenGroupType.FROZEN_COL]: {
+ width: 0,
+ x: 0,
+ range: [] as number[],
+ },
+ [FrozenGroupType.FROZEN_TRAILING_COL]: {
+ width: 0,
+ x: 0,
+ range: [] as number[],
+ },
+ [FrozenGroupType.FROZEN_ROW]: {
+ height: 0,
+ y: 0,
+ range: [] as number[],
+ },
+ [FrozenGroupType.FROZEN_TRAILING_ROW]: {
+ height: 0,
+ y: 0,
+ range: [] as number[],
+ },
+ } satisfies Record<
+ FrozenGroupType,
+ {
+ width?: number;
+ height?: number;
+ x?: number;
+ y?: number;
+ range: number[];
+ }
+ >;
+
+ public panelScrollGroupIndexes: Indexes = [0, 0, 0, 0];
+
+ protected override initPanelGroups(): void {
+ super.initPanelGroups();
+ [
+ this.frozenRowGroup,
+ this.frozenColGroup,
+ this.frozenTrailingRowGroup,
+ this.frozenTrailingColGroup,
+ this.frozenTopGroup,
+ this.frozenBottomGroup,
+ ] = [
+ KEY_GROUP_PANEL_FROZEN_ROW,
+ KEY_GROUP_PANEL_FROZEN_COL,
+ KEY_GROUP_PANEL_FROZEN_TRAILING_ROW,
+ KEY_GROUP_PANEL_FROZEN_TRAILING_COL,
+ KEY_GROUP_PANEL_FROZEN_TOP,
+ KEY_GROUP_PANEL_FROZEN_BOTTOM,
+ ].map((name) => {
+ const frozenGroup = new FrozenGroup({
+ name,
+ zIndex: PANEL_GROUP_FROZEN_GROUP_Z_INDEX,
+ s2: this.spreadsheet,
+ });
+
+ this.panelGroup.appendChild(frozenGroup);
+
+ return frozenGroup;
+ });
+ }
+
+ protected getFrozenOptions() {
+ const colLength = this.getColLeafNodes().length;
+ const cellRange = this.getCellRange();
+
+ return getValidFrozenOptions(
+ this.spreadsheet.options.frozen!,
+ colLength,
+ cellRange.end - cellRange.start + 1,
+ );
+ }
+
+ public calculateFrozenGroupInfo() {
+ const {
+ colCount = 0,
+ rowCount = 0,
+ trailingColCount = 0,
+ trailingRowCount = 0,
+ } = this.getFrozenOptions();
+
+ const topLevelColNodes = this.getTopLevelColNodes();
+ const viewCellHeights = this.viewCellHeights;
+ const cellRange = this.getCellRange();
+ const { frozenCol, frozenTrailingCol, frozenRow, frozenTrailingRow } =
+ this.frozenGroupInfo;
+
+ if (colCount > 0) {
+ frozenCol.width =
+ topLevelColNodes[colCount - 1].x + topLevelColNodes[colCount - 1].width;
+ frozenCol.x = 0;
+ frozenCol.range = [0, colCount - 1];
+ }
+
+ if (rowCount > 0) {
+ frozenRow.height =
+ viewCellHeights.getCellOffsetY(cellRange.start + rowCount) -
+ viewCellHeights.getCellOffsetY(cellRange.start);
+ frozenRow.y = 0;
+ frozenRow.range = [cellRange.start, cellRange.start + rowCount - 1];
+ }
+
+ if (trailingColCount > 0) {
+ frozenTrailingCol.width =
+ topLevelColNodes[topLevelColNodes.length - 1].x -
+ topLevelColNodes[topLevelColNodes.length - trailingColCount].x +
+ topLevelColNodes[topLevelColNodes.length - 1].width;
+ frozenTrailingCol.x = this.panelBBox.width - frozenTrailingCol.width;
+ frozenTrailingCol.range = [
+ topLevelColNodes.length - trailingColCount,
+ topLevelColNodes.length - 1,
+ ];
+ }
+
+ if (trailingRowCount > 0) {
+ frozenTrailingRow.height =
+ viewCellHeights.getCellOffsetY(cellRange.end + 1) -
+ viewCellHeights.getCellOffsetY(cellRange.end + 1 - trailingRowCount);
+ frozenTrailingRow.y = this.panelBBox.height - frozenTrailingRow.height;
+ frozenTrailingRow.range = [
+ cellRange.end - trailingRowCount + 1,
+ cellRange.end,
+ ];
+ }
+ }
+
+ protected getFinalViewport() {
+ const { viewportHeight: height, viewportWidth: width } = this.panelBBox;
+
+ const {
+ colCount = 0,
+ rowCount = 0,
+ trailingColCount = 0,
+ trailingRowCount = 0,
+ } = this.getFrozenOptions();
+
+ const finalViewport: SimpleBBox = {
+ width,
+ height,
+ x: 0,
+ y: 0,
+ };
+
+ if (colCount > 0 || trailingColCount > 0) {
+ const { frozenTrailingCol, frozenCol } = this.frozenGroupInfo;
+
+ finalViewport.width -= frozenTrailingCol.width! + frozenCol.width!;
+ finalViewport.x += frozenCol.width!;
+ }
+
+ if (rowCount > 0 || trailingRowCount > 0) {
+ const { frozenRow, frozenTrailingRow } = this.frozenGroupInfo;
+
+ // canvas 高度小于 row height 和 trailingRow height 的时候 height 为 0
+ if (
+ finalViewport.height <
+ frozenRow.height! + frozenTrailingRow.height!
+ ) {
+ finalViewport.height = 0;
+ finalViewport.y = 0;
+ } else {
+ finalViewport.height -= frozenRow.height! + frozenTrailingRow.height!;
+ finalViewport.y += frozenRow.height!;
+ }
+ }
+
+ return finalViewport;
+ }
+
+ public calculateXYIndexes(scrollX: number, scrollY: number): PanelIndexes {
+ const colLength = this.getColLeafNodes().length;
+ const cellRange = this.getCellRange();
+
+ const {
+ colCount = 0,
+ rowCount = 0,
+ trailingColCount = 0,
+ trailingRowCount = 0,
+ } = this.getFrozenOptions();
+
+ const finalViewport: SimpleBBox = this.getFinalViewport();
+
+ const indexes =
+ this.spreadsheet.isTableMode() && this.spreadsheet.dataSet?.isEmpty?.()
+ ? this.spreadsheet.dataSet.getEmptyViewIndexes()
+ : calculateInViewIndexes({
+ scrollX,
+ scrollY,
+ widths: this.viewCellWidths,
+ heights: this.viewCellHeights,
+ viewport: finalViewport,
+ rowRemainWidth: this.getRealScrollX(this.cornerBBox.width),
+ });
+
+ this.panelScrollGroupIndexes = indexes;
+
+ const { colCount: realColCount, trailingColCount: realTrailingColCount } =
+ this.getRealFrozenColumns(colCount, trailingColCount);
+
+ return splitInViewIndexesWithFrozen(
+ indexes,
+ {
+ colCount: realColCount,
+ trailingColCount: realTrailingColCount,
+ rowCount,
+ trailingRowCount,
+ },
+ colLength,
+ cellRange,
+ );
+ }
+
+ addDataCell = (cell: DataCell) => {
+ const {
+ rowCount = 0,
+ colCount = 0,
+ trailingRowCount = 0,
+ trailingColCount = 0,
+ } = this.getFrozenOptions();
+
+ const colLength = this.getColNodes().length;
+ const cellRange = this.getCellRange();
+ const { colCount: realColCount, trailingColCount: realTrailingColCount } =
+ this.getRealFrozenColumns(colCount, trailingColCount);
+
+ const frozenCellType = getFrozenDataCellType(
+ cell.getMeta(),
+ {
+ rowCount,
+ trailingRowCount,
+ colCount: realColCount,
+ trailingColCount: realTrailingColCount,
+ },
+ colLength,
+ cellRange,
+ );
+
+ const groupName = FrozenCellGroupMap[frozenCellType];
+
+ if (groupName) {
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ const group = this[groupName] as Group;
+
+ group.appendChild(cell);
+ }
+
+ setTimeout(() => {
+ this.spreadsheet.emit(S2Event.DATA_CELL_RENDER, cell);
+ this.spreadsheet.emit(S2Event.LAYOUT_CELL_RENDER, cell);
+ }, 100);
+ };
+
+ addFrozenCell = (colIndex: number, rowIndex: number, group: Group) => {
+ const viewMeta = this.getCellMeta(rowIndex, colIndex);
+
+ if (viewMeta) {
+ viewMeta.isFrozenCorner = true;
+ const cell = this.spreadsheet.options.dataCell?.(viewMeta)!;
+
+ group.appendChild(cell);
+ }
+ };
+
+ protected updateFrozenGroupGrid(): void {
+ [
+ FrozenGroupType.FROZEN_COL,
+ FrozenGroupType.FROZEN_ROW,
+ FrozenGroupType.FROZEN_TRAILING_COL,
+ FrozenGroupType.FROZEN_TRAILING_ROW,
+ ].forEach((key) => {
+ if (!this.frozenGroupInfo[key].range) {
+ return;
+ }
+
+ let cols: number[] = [];
+ let rows: number[] = [];
+
+ if (key.toLowerCase().includes('row')) {
+ const [rowMin, rowMax] = this.frozenGroupInfo[key].range || [];
+
+ cols = this.gridInfo.cols;
+ rows = getRowsForGrid(rowMin, rowMax, this.viewCellHeights);
+
+ if (key === FrozenGroupType.FROZEN_TRAILING_ROW) {
+ const top =
+ this.frozenGroupInfo[FrozenGroupType.FROZEN_TRAILING_ROW].y;
+
+ rows = getFrozenRowsForGrid(
+ rowMin,
+ rowMax,
+ top,
+ this.viewCellHeights,
+ );
+ }
+ } else {
+ const [colMin, colMax] = this.frozenGroupInfo[key].range || [];
+ const nodes = this.getTopLevelColNodes();
+
+ cols = getColsForGrid(colMin, colMax, nodes);
+ rows = this.gridInfo.rows;
+ }
+
+ this[`${key}Group`].updateGrid(
+ {
+ cols,
+ rows,
+ },
+ `${key}Group`,
+ );
+ });
+ }
+
+ public updatePanelScrollGroup(): void {
+ super.updatePanelScrollGroup();
+ this.updateFrozenGroupGrid();
+ }
+
+ protected translateRelatedGroups(
+ scrollX: number,
+ scrollY: number,
+ hRowScroll: number,
+ ) {
+ super.translateRelatedGroups(scrollX, scrollY, hRowScroll);
+ this.translateFrozenGroups();
+ this.updateRowResizeArea();
+ this.renderFrozenGroupSplitLine(scrollX, scrollY);
+ }
+
+ protected translateFrozenGroups = () => {
+ const { scrollY, scrollX } = this.getScrollOffset();
+ const paginationScrollY = this.getPaginationScrollY();
+
+ const { x, y } = this.panelBBox;
+
+ translateGroup(this.frozenTopGroup, x, y - paginationScrollY);
+ translateGroup(this.frozenBottomGroup, x, y);
+
+ translateGroup(this.frozenRowGroup, x - scrollX, y - paginationScrollY);
+ translateGroup(this.frozenTrailingRowGroup, x - scrollX, y);
+
+ translateGroup(this.frozenColGroup, x, y - scrollY - paginationScrollY);
+ translateGroup(
+ this.frozenTrailingColGroup,
+ x,
+ y - scrollY - paginationScrollY,
+ );
+ };
+
+ protected updateRowResizeArea() {}
+
+ // eslint-disable-next-line max-lines-per-function
+ protected renderFrozenGroupSplitLine = (scrollX: number, scrollY: number) => {
+ const {
+ width: panelWidth,
+ height: panelHeight,
+ viewportWidth,
+ viewportHeight,
+ x: panelBBoxStartX,
+ y: panelBBoxStartY,
+ } = this.panelBBox;
+
+ const topLevelColNodes = this.getTopLevelColNodes();
+ const cellRange = this.getCellRange();
+ const {
+ rowCount: frozenRowCount = 0,
+ colCount: frozenColCount = 0,
+ trailingColCount: frozenTrailingColCount = 0,
+ trailingRowCount: frozenTrailingRowCount = 0,
+ } = this.getFrozenOptions();
+
+ // 在分页条件下需要额外处理 Y 轴滚动值
+ const relativeScrollY = Math.floor(scrollY - this.getPaginationScrollY());
+
+ // scroll boundary
+ const maxScrollX = Math.max(0, last(this.viewCellWidths)! - viewportWidth);
+ const maxScrollY = Math.max(
+ 0,
+ this.viewCellHeights.getCellOffsetY(cellRange.end + 1) -
+ this.viewCellHeights.getCellOffsetY(cellRange.start) -
+ viewportHeight,
+ );
+
+ // remove previous split line group
+ this.foregroundGroup.getElementById(KEY_GROUP_FROZEN_SPLIT_LINE)?.remove();
+
+ const { splitLine } = this.spreadsheet.theme;
+ const splitLineGroup = this.foregroundGroup.appendChild(
+ new Group({
+ id: KEY_GROUP_FROZEN_SPLIT_LINE,
+ style: {
+ zIndex: FRONT_GROUND_GROUP_FROZEN_Z_INDEX,
+ },
+ }),
+ );
+
+ const verticalBorderStyle: Partial