feat: 完善交叉表分页功能 by lcx-seima · Pull Request #1037 · antvis/S2

lcx-seima · 2022-01-24T03:16:32Z

👀 PR includes

✨ Feature

New feature

🎨 Enhance

🐛 Bugfix

Solve the issue and close 🐛 透视表分页支持 #883

🔧 Chore

📝 Description

主要修改点

master 已存 BUG：
- 序号列未展示
- 组件初始化未设置分页 total
PanelBBox 引入 viewportHeight 后，角头等未使用正确的高度，导致多渲染或 clip 错误

🖼️ Screenshot

	Before	After
视窗高度不足
视窗高度充足

🔗 Related issue link

🔍 Self Check before Merge

Add or update relevant Docs.
Add or update relevant Demos.
Add or update relevant TypeScript definitions.

github-actions · 2022-01-24T03:16:46Z

🎊 PR Preview has been successfully built and deployed to https://s2-preview-pr-1037.surge.sh

github-actions · 2022-01-24T03:22:23Z

Size Change: +314 B (0%)

Total Size: 189 kB

Filename	Size	Change
`./packages/s2-core/dist/index.min.js`	118 kB	-79 B (0%)
`./packages/s2-react/dist/index.min.js`	68 kB	+393 B (+1%)

ℹ️ View Unchanged

Filename	Size
`./packages/s2-core/dist/style.min.css`	362 B
`./packages/s2-react/dist/style.min.css`	2.77 kB

_{compressed-size-action}

github-actions · 2022-01-24T03:26:41Z

你好, @lcx-seima CI 执行失败, 请点击 [Details] 按钮查看, 并根据日志修复。

Hello, @lcx-seima CI run failed, please click the [Details] button for detailed log information and fix it.

codecov · 2022-01-24T03:37:54Z

Codecov Report

Merging #1037 (1d11b6e) into master (2082c22) will increase coverage by 0.21%.
The diff coverage is 36.00%.

@@            Coverage Diff             @@
##           master    #1037      +/-   ##
==========================================
+ Coverage   71.88%   72.10%   +0.21%     
==========================================
  Files         170      170              
  Lines       12243    12285      +42     
  Branches     2884     2899      +15     
==========================================
+ Hits         8801     8858      +57     
+ Misses       2244     2233      -11     
+ Partials     1198     1194       -4

Impacted Files	Coverage Δ
packages/s2-core/src/cell/row-cell.ts	`72.05% <0.00%> (ø)`
packages/s2-core/src/facet/pivot-facet.ts	`75.40% <ø> (ø)`
packages/s2-core/src/facet/header/series-number.ts	`26.71% <14.28%> (-0.42%)`	⬇️
packages/s2-core/src/facet/header/row.ts	`67.02% <50.00%> (+5.31%)`	⬆️
packages/s2-core/src/utils/facet.ts	`85.00% <83.33%> (ø)`
packages/s2-core/src/facet/base-facet.ts	`73.42% <100.00%> (+0.44%)`	⬆️
packages/s2-core/src/facet/table-facet.ts	`82.24% <0.00%> (+0.23%)`	⬆️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2082c22...1d11b6e. Read the comment docs.

xingwanying

LG

* chore: 🤖 auto sync site s2 lock and changelog [skip ci] (#1004) * chore(release): 🔖@antv/[email protected] @antv/[email protected] * chore(release): 🔖 @antv/[email protected] @antv/[email protected] * chore(release): 🤖 @antv/s2-v1.3.0 [skip ci] * chore(release): 🤖 @antv/s2-react-v1.3.0 [skip ci] * chore(release): 🔖@antv/[email protected] @antv/[email protected] * chore(release): 🤖 @antv/s2-v1.4.0 [skip ci] * chore(release): 🤖 @antv/s2-react-v1.4.0 [skip ci] * chore(release): 🔖@antv/[email protected] @antv/[email protected] * chore(release): 🤖 @antv/s2-v1.5.0 [skip ci] * chore(release): 🤖 @antv/s2-react-v1.5.0 [skip ci] * chore(release): @antv/[email protected] @antv/[email protected] (#1003) * chore(release): 🤖 @antv/s2-v1.6.0 [skip ci] * chore(release): 🤖 @antv/s2-react-v1.6.0 [skip ci] * chore: 🤖 auto sync site s2 lock and changelog [skip ci] Co-authored-by: yingying.xwy <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: xinhui.zxh <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Update base-facet.ts (#1009) 手机端滑动问题修改 * docs: 修复文档404链接和报错demo (#1025) * chore(ci): 新增 prerelease 推送 & CI 细节调整 (#1027) * chore(ci): 新增 prerelease 推送 & ci 细节调整 * chore(ci): 去掉 --ignore-scripts * chore(ci): 去掉 --ignore-scripts * fix(facet): scroll speed options & pagination totals (#1031) * fix: scrollSpeedRatio value * fix: ts err * fix: revert change * fix: pagination total * fix(s2-core): 修复延迟销毁表格时没有移除canvas节点的问题 close #1011 (#1033) * docs: 增加小册子demo《哲学家的观点》 (#1035) * fix(tooltip): 修复单元格文字过长时 tooltip 显示被截断 close #1028 (#1034) * feat: 支持配置前端计算小计/总计 (#921) * feat: surport caculate totals in pivot data set * test: add number calculate and totals calculate test * refactor: change totals type to readonly * refactor: code style * refactor: code style and optimize test * docs: add calcTotals's docs and demos * fix: get cell data * test: table facet test's width * feat: 重构前端计算汇总值 * test: 增加前端计算totals测试 * refactor: 抽离getAggregationAndCalcFuncByQuery到utils * test: 增加getAggregationAndCalcFuncByQuery的测试 * docs: 小计总计文档更新 * fix(tooltip): 修复明细表列头的 tooltip 内容被错误的格式化 close #998 (#1036) * fix(tooltip): 修复明细表列头的 tooltip 内容被错误的格式化 close #998 * chore: 还原 meta * test: 修复测试 * fix(interactive): table move problem (#1013) * fix: table move problem * fix: code * fix: v * fix: move * fix: calculateInViewIndexes * feat: update table facet * fix: v * fix: code 整理 * fix: 修复测试用例 Co-authored-by: xinhui.zxh <[email protected]> * docs: 优化demo《哲学家的观点》 (#1038) * feat: 完善交叉表分页功能 (#1037) * chore: s2-react watch script * fix: maxHeight等于offset数组值时下标返回偏大 * fix(s2react): 交叉表初始化未更新分页total * fix(facet): 序号列无法渲染 * fix(pivotfacet): 渲染行数返回错误 * fix(facet): 按视窗高度剪裁行头和序号列 * fix: 计算文字位置时应使用viewportHeight视窗高度 * fix(facet): rowIndexHeader可能为null * fix(facet): 序号列应早于列头添加到group (#1040) * chore(release): @antv/[email protected] @antv/[email protected] (#1039) * chore(release): @antv/[email protected] @antv/[email protected] (#1039) (#1041) This reverts commit 0d538f2. * chore(release): @antv/[email protected] @antv/[email protected] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yingying.xwy <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: xinhui.zxh <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: gehaiyi <[email protected]> Co-authored-by: Jinke Li <[email protected]> Co-authored-by: yangzhanmei <[email protected]> Co-authored-by: 刘嘉一 <[email protected]>

lijinke666 · 2022-01-24T10:55:12Z

🎉 This PR is included in version @antv/s2-v1.7.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2022-01-24T10:58:29Z

🎉 This PR is included in version @antv/s2-react-v1.7.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2022-01-26T04:29:39Z

🎉 This PR is included in version @antv/s2-v1.7.0-alpha.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

lijinke666 · 2022-01-26T04:32:37Z

🎉 This PR is included in version @antv/s2-react-v1.7.0-alpha.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

* chore: s2-react watch script * fix: maxHeight等于offset数组值时下标返回偏大 * fix(s2react): 交叉表初始化未更新分页total * fix(facet): 序号列无法渲染 * fix(pivotfacet): 渲染行数返回错误 * fix(facet): 按视窗高度剪裁行头和序号列 * fix: 计算文字位置时应使用viewportHeight视窗高度 * fix(facet): rowIndexHeader可能为null

lcx-seima added 7 commits January 21, 2022 14:33

chore: s2-react watch script

c28f789

fix: maxHeight等于offset数组值时下标返回偏大

6af34ed

fix(s2react): 交叉表初始化未更新分页total

65e9ee9

fix(facet): 序号列无法渲染

b3db942

fix(pivotfacet): 渲染行数返回错误

826f7da

fix(facet): 按视窗高度剪裁行头和序号列

19279c6

fix: 计算文字位置时应使用viewportHeight视窗高度

2d084bc

github-actions bot added the pr(feature) new feature label Jan 24, 2022

github-actions bot assigned lcx-seima Jan 24, 2022

github-actions bot requested review from YardWill, lijinke666, qubaomingg, stone-lyl, wjgogogo, xingwanying, yangzhanmei and zxc0328 January 24, 2022 03:17

github-actions bot added the 🚨 test failed 单元测试挂了 label Jan 24, 2022

fix(facet): rowIndexHeader可能为null

1d11b6e

github-actions bot removed the 🚨 test failed 单元测试挂了 label Jan 24, 2022

xingwanying approved these changes Jan 24, 2022

View reviewed changes

xingwanying merged commit 9c8657d into master Jan 24, 2022

xingwanying deleted the fix/pagination-0121 branch January 24, 2022 06:19

lijinke666 added the released label Jan 24, 2022

lijinke666 added the released on @alpha label Jan 26, 2022

lcx-seima mentioned this pull request Apr 15, 2022

fix: 修复交叉表分页问题 #1260

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: 完善交叉表分页功能#1037

feat: 完善交叉表分页功能#1037
xingwanying merged 8 commits intomasterfrom
fix/pagination-0121

lcx-seima commented Jan 24, 2022 •

edited by xingwanying

Loading

Uh oh!

github-actions bot commented Jan 24, 2022 •

edited

Loading

Uh oh!

github-actions bot commented Jan 24, 2022 •

edited

Loading

Uh oh!

github-actions bot commented Jan 24, 2022

Uh oh!

codecov bot commented Jan 24, 2022 •

edited

Loading

Uh oh!

xingwanying left a comment

Uh oh!

lijinke666 commented Jan 24, 2022

Uh oh!

lijinke666 commented Jan 24, 2022

Uh oh!

lijinke666 commented Jan 26, 2022

Uh oh!

lijinke666 commented Jan 26, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

lcx-seima commented Jan 24, 2022 • edited by xingwanying Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

👀 PR includes

📝 Description

🖼️ Screenshot

🔗 Related issue link

🔍 Self Check before Merge

Uh oh!

github-actions bot commented Jan 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 24, 2022

Uh oh!

codecov bot commented Jan 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

xingwanying left a comment

Choose a reason for hiding this comment

Uh oh!

lijinke666 commented Jan 24, 2022

Uh oh!

lijinke666 commented Jan 24, 2022

Uh oh!

lijinke666 commented Jan 26, 2022

Uh oh!

lijinke666 commented Jan 26, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

lcx-seima commented Jan 24, 2022 •

edited by xingwanying

Loading

github-actions bot commented Jan 24, 2022 •

edited

Loading

github-actions bot commented Jan 24, 2022 •

edited

Loading

codecov bot commented Jan 24, 2022 •

edited

Loading