feat: 支持配置前端计算小计/总计 by yangzhanmei · Pull Request #921 · antvis/S2

yangzhanmei · 2021-12-20T16:04:34Z

👀 PR includes

✨ Feature

New feature

📝 Description

支持配置前端计算小计/总计

🖼️ Screenshot

Before	After
❌	✅

🔗 Related issue link

close #537

🔍 Self Check before Merge

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

github-actions · 2021-12-20T16:04:49Z

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

github-actions · 2021-12-20T16:10:25Z

Size Change: +733 B (0%)

Total Size: 189 kB

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

ℹ️ View Unchanged

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

_{compressed-size-action}

lgtm-com · 2021-12-20T16:10:30Z

This pull request fixes 1 alert when merging 7991b49 into d6ebc3d - view on LGTM.com

fixed alerts:

1 for Unused variable, import, function or class

github-actions · 2021-12-20T16:11:47Z

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

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

lgtm-com · 2021-12-20T16:20:44Z

This pull request fixes 1 alert when merging 9fe0742 into d6ebc3d - view on LGTM.com

fixed alerts:

1 for Unused variable, import, function or class

codecov · 2021-12-20T16:23:39Z

Codecov Report

Merging #921 (e128739) into master (f7ba78f) will increase coverage by 0.03%.
The diff coverage is 51.38%.

@@            Coverage Diff             @@
##           master     #921      +/-   ##
==========================================
+ Coverage   71.88%   71.92%   +0.03%     
==========================================
  Files         170      171       +1     
  Lines       12243    12306      +63     
  Branches     2884     2907      +23     
==========================================
+ Hits         8801     8851      +50     
- Misses       2244     2248       +4     
- Partials     1198     1207       +9

Impacted Files	Coverage Δ
packages/s2-core/src/utils/tooltip.ts	`48.31% <ø> (+2.18%)`	⬆️
packages/s2-core/src/utils/data-set-operate.ts	`70.88% <22.22%> (-6.04%)`	⬇️
packages/s2-core/src/utils/number-calculate.ts	`60.00% <44.44%> (ø)`
packages/s2-core/src/data-set/pivot-data-set.ts	`69.66% <63.88%> (-0.04%)`	⬇️
...ckages/s2-core/src/utils/dataset/pivot-data-set.ts	`78.78% <0.00%> (-1.02%)`	⬇️
packages/s2-core/src/facet/base-facet.ts	`73.37% <0.00%> (+0.39%)`	⬆️
packages/s2-core/src/cell/header-cell.ts	`51.94% <0.00%> (+0.48%)`	⬆️
... and 1 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 f7ba78f...e128739. Read the comment docs.

xingwanying · 2021-12-21T04:56:55Z

补充下对应文档？

github-actions · 2021-12-21T11:54:08Z

你好 @yangzhanmei，感谢你的贡献, 为了让代码更健壮, 请补充相应单元测试, 如果有API改动, 请修改相应的文档

Hello, @yangzhanmei, Thanks for your contribution. In order to make the code more robust, please add the corresponding unit tests, and update the docs if there are API changes.

packages/s2-core/__tests__/unit/dataset/pivot-dataset-total-spec.ts

packages/s2-core/src/data-set/pivot-data-set.ts

packages/s2-core/src/common/interface/basic.ts

Cuiyansong · 2022-01-05T02:45:57Z

请问，当前这个PR是官方发布的版本，还是社区支持？是否有前端计算总计和小记的PRD。目前，我们也实现了一套简单的总计功能。

@xingwanying xing @yangzhanmei yan

xingwanying · 2022-01-14T08:18:27Z

请问，当前这个PR是官方发布的版本，还是社区支持？是否有前端计算总计和小记的PRD。目前，我们也实现了一套简单的总计功能。

@xingwanying xing @yangzhanmei yan

目前还在孵化阶段，欢迎给我们提pr 0，0

packages/s2-core/src/common/interface/basic.ts

* 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:33Z

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

The release is available on:

Your semantic-release bot 📦🚀

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

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

The release is available on:

Your semantic-release bot 📦🚀

* 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: 小计总计文档更新

yangzhanmei added 4 commits December 20, 2021 23:40

feat: surport caculate totals in pivot data set

b01347b

test: add number calculate and totals calculate test

ff5a61d

fix: merge master

b0eaf51

refactor: change totals type to readonly

7991b49

github-actions bot assigned yangzhanmei Dec 20, 2021

github-actions bot requested review from YardWill, lijinke666, qubaomingg, stone-lyl, wjgogogo, xingwanying and zxc0328 December 20, 2021 16:04

github-actions bot added the pr(feature) new feature label Dec 20, 2021

github-actions bot added the 🚨 test failed 单元测试挂了 label Dec 20, 2021

refactor: code style

9fe0742

github-actions bot removed the 🚨 test failed 单元测试挂了 label Dec 20, 2021

lijinke666 added the 🙏 need test cases or docs 需要单元测试或者补充文档 label Dec 21, 2021

xingwanying reviewed Dec 22, 2021

View reviewed changes

packages/s2-core/__tests__/unit/dataset/pivot-dataset-total-spec.ts Outdated Show resolved Hide resolved

stone-lyl reviewed Dec 24, 2021

View reviewed changes

packages/s2-core/src/data-set/pivot-data-set.ts Show resolved Hide resolved

stone-lyl reviewed Dec 24, 2021

View reviewed changes

packages/s2-core/src/data-set/pivot-data-set.ts Show resolved Hide resolved

yangzhanmei added 2 commits December 30, 2021 17:45

fix: merge master

e5ce29f

refactor: code style and optimize test

1ddeb15

docs: add calcTotals's docs and demos

bb28013

github-actions bot added the 🚨 test failed 单元测试挂了 label Dec 30, 2021

fix: get cell data

49a790d

github-actions bot removed the 🚨 test failed 单元测试挂了 label Dec 30, 2021

yangzhanmei removed the 🙏 need test cases or docs 需要单元测试或者补充文档 label Dec 31, 2021

yangzhanmei added 2 commits December 31, 2021 16:18

fix: merge master

6704f9a

test: table facet test's width

cf00717

github-actions bot added the 🚨 test failed 单元测试挂了 label Dec 31, 2021

xingwanying reviewed Jan 1, 2022

View reviewed changes

packages/s2-core/src/common/interface/basic.ts Outdated Show resolved Hide resolved

yangzhanmei added 6 commits January 20, 2022 17:32

feat: 重构前端计算汇总值

1f2241e

test: 增加前端计算totals测试

3c9f12e

fix: merge master

0d24b5e

refactor: 抽离getAggregationAndCalcFuncByQuery到utils

209e6a1

test: 增加getAggregationAndCalcFuncByQuery的测试

1d79766

docs: 小计总计文档更新

e128739

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

xingwanying reviewed Jan 20, 2022

View reviewed changes

packages/s2-core/src/common/interface/basic.ts Show resolved Hide resolved

xingwanying closed this Jan 21, 2022

xingwanying reopened this Jan 24, 2022

xingwanying approved these changes Jan 24, 2022

View reviewed changes

xingwanying merged commit 999cfc1 into master Jan 24, 2022

xingwanying deleted the feat-surport-caculate-totals branch January 24, 2022 03:59

lijinke666 added the released label Jan 24, 2022

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

Conversation

yangzhanmei commented Dec 20, 2021 • edited 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 Dec 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Dec 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lgtm-com bot commented Dec 20, 2021

Uh oh!

github-actions bot commented Dec 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lgtm-com bot commented Dec 20, 2021

Uh oh!

codecov bot commented Dec 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

xingwanying commented Dec 21, 2021

Uh oh!

github-actions bot commented Dec 21, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

xingwanying commented Jan 14, 2022

Uh oh!

Uh oh!

lijinke666 commented Jan 24, 2022

Uh oh!

lijinke666 commented Jan 26, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

yangzhanmei commented Dec 20, 2021 •

edited

Loading

github-actions bot commented Dec 20, 2021 •

edited

Loading

github-actions bot commented Dec 20, 2021 •

edited

Loading

github-actions bot commented Dec 20, 2021 •

edited

Loading

codecov bot commented Dec 20, 2021 •

edited

Loading

Cuiyansong commented Jan 5, 2022 •

edited

Loading