Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 增强行列冻结能力 #2706

Merged
merged 48 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
84a29ef
refactor: 将 frozen groups 收敛到 frozen facet 中
wjgogogo May 9, 2024
61f1be9
refactor: 移除 frozen cell 相关的特殊坐标计算,统一采用 translate 做偏移处理
wjgogogo May 9, 2024
7253dfa
Merge branch 'next' into feat-frozen
wjgogogo May 9, 2024
223b555
refactor: 简化 table-col 冻结处理
wjgogogo May 10, 2024
fecdc21
feat: 增加透视表对 trailingRow 冻结的支持
wjgogogo May 10, 2024
5c9dd10
chore: merge with next
wjgogogo May 11, 2024
68706c7
feat: 完善 splitLine 逻辑
wjgogogo May 11, 2024
e392867
Merge branch 'next' into feat-frozen
wjgogogo May 11, 2024
18278c9
feat: 处理行头列头滚动布局和 resize 布局
wjgogogo May 11, 2024
9dd77eb
feat: 处理明细表 data cell resize 绘制
wjgogogo May 11, 2024
b1d7202
feat: 更新 playground
wjgogogo May 11, 2024
12f32b9
test: 单测修复
wjgogogo May 11, 2024
584a36e
fix: 修复列头 resize 布局偏移问题
wjgogogo May 13, 2024
b787bd3
test: 单测修复
wjgogogo May 13, 2024
27e7194
fix: 修复方向键移动选中逻辑
wjgogogo May 13, 2024
7313e0b
test: 单测修复
wjgogogo May 13, 2024
acf8ba9
test: data brush selection 单测修复
wjgogogo May 13, 2024
3d31c4d
fix: 调整明细表 rowOffsets 计算时机
wjgogogo May 14, 2024
897533c
style: 修复 lint 问题
wjgogogo May 14, 2024
0191bc8
Merge branch 'next' into feat-frozen
wjgogogo May 14, 2024
13e1885
docs: 文档更新
wjgogogo May 14, 2024
9a37b83
feat: 更新 playground
wjgogogo May 14, 2024
a7b90d5
test: 单测 snapshot 更新
wjgogogo May 14, 2024
8dff672
Update s2-site/examples/layout/frozen/demo/frozen-pivot-tree.ts
wjgogogo May 15, 2024
76effdb
refactor: 重命名 frozen 变量名
wjgogogo May 17, 2024
fecfee9
refactor: 将 calculateRowOffsets 替换为抽象方法
wjgogogo May 17, 2024
52bdaed
refactor: 添加方法注释
wjgogogo May 17, 2024
a0fe47c
chore: 合并 next 代码
wjgogogo May 20, 2024
d8b3b4b
refactor: row-cell 抽取工具函数
wjgogogo May 20, 2024
4ffa908
Merge branch 'next' into feat-frozen
wjgogogo May 20, 2024
fec8edd
test: 增加透视表行冻结单测
wjgogogo May 21, 2024
3a86caf
fix: 在 resize 时加上 preventDefault 事件,兼容 chrome 125 事件更新的处理 (#2739)
wjgogogo May 23, 2024
aa03e61
refactor: 移除对 frozen options 从 top 到 leaf 的转换
wjgogogo May 24, 2024
7ef1b8a
feat: 增加透视表列头冻结能力
wjgogogo May 27, 2024
8f350de
feat: 增加透视表序号列冻结的能力
wjgogogo May 27, 2024
8d08e46
fix: 修复 centerFrame line shadow 显示问题
wjgogogo May 27, 2024
a216d61
fix: 修复类型问题
wjgogogo May 27, 2024
bc1475c
refactor: series number cell 继承自 row cell
wjgogogo May 28, 2024
2d1684d
Merge branch 'next' into feat-frozen
wjgogogo May 28, 2024
4c83311
fix: 修复 lint 问题
wjgogogo May 28, 2024
a719f30
test: 单测修复
wjgogogo May 28, 2024
25f0c06
test: 增加透视表列头冻结单测
wjgogogo May 28, 2024
5be4a3c
docs: 冻结文档更新
wjgogogo May 28, 2024
c273f2d
Merge branch 'next' into feat-frozen
wjgogogo May 28, 2024
690cb01
test: snapshot 更新
wjgogogo May 28, 2024
836dab6
fix: s2Options 冻结类型更新
wjgogogo May 28, 2024
c5c20e7
chore: merge with 'next'
wjgogogo Jun 3, 2024
478f261
refactor: rename S2TableSheetFrozenOptions to S2BaseFrozenOptions
wjgogogo Jun 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/s2-core/__tests__/bugs/issue-2684-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { InteractionStateName } from '../../src';
import { getSelectedData } from '../../src/utils/export/copy';
import * as mockDataConfig from '../data/data-issue-2684.json';
import { createPivotSheet } from '../util/helpers';
import type { S2Options, SpreadSheet } from '@/index';
import type { CellMeta, S2Options, SpreadSheet } from '@/index';

const s2Options: S2Options = {
width: 600,
Expand Down Expand Up @@ -48,7 +48,7 @@ describe('PivotSheet Special Dimension Values Copy Tests', () => {
: String(rowLeafNodes[meta.rowIndex].id);

return { ...meta, colId, rowId };
});
}) as unknown as CellMeta[];

s2.interaction.changeState({
cells,
Expand Down
4 changes: 4 additions & 0 deletions packages/s2-core/__tests__/bugs/issue-2707-spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
/**
* 明细表数据含有空值导致排序失效
* @description spec for issue 2707
Expand Down Expand Up @@ -29,6 +30,7 @@ describe('PivotSheet Special Dimension Values Copy Tests', () => {
});
await s2.render();

// @ts-ignore
expect(s2.dataSet.displayData).toMatchSnapshot();
});

Expand All @@ -38,6 +40,7 @@ describe('PivotSheet Special Dimension Values Copy Tests', () => {
});
await s2.render();

// @ts-ignore
expect(s2.dataSet.displayData).toMatchSnapshot();
});

Expand All @@ -59,6 +62,7 @@ describe('PivotSheet Special Dimension Values Copy Tests', () => {
});
await s2.render();

// @ts-ignore
expect(s2.dataSet.displayData).toMatchSnapshot();
});
});
Loading
Loading