fix: 自定义计算汇总 calcFunc 回调函数增加 s2 实例, 修复无法获取汇总数据的问题 close #2795 #2805

lijinke666 · 2024-07-03T09:59:49Z

👀 PR includes

🐛 Bugfix

Solve the issue and close 🐛小计总计功能自定义总计函数(calcFunc)中无小计汇总信息 #2795

📝 Description

🖼️ Screenshot

Before	After
❌	✅

🔗 Related issue link

🔍 Self-Check before the merge

Add or update relevant docs.
Add or update relevant demos.
Add or update test case.
Add or update relevant TypeScript definitions.

vercel · 2024-07-03T09:59:52Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
antvis-s2	❌ Failed (Inspect)			Jul 3, 2024 11:13am

github-actions · 2024-07-03T10:02:28Z

Size Change: +8 B (0%)

Total Size: 7.96 MB

Filename	Size	Change
`./packages/s2-core/dist/index.min.js`	183 kB	+2 B (0%)
`./packages/s2-react/node_modules/@antv/s2/dist/index.min.js`	183 kB	+2 B (0%)
`./packages/s2-shared/node_modules/@antv/s2/dist/index.min.js`	183 kB	+2 B (0%)
`./packages/s2-vue/node_modules/@antv/s2/dist/index.min.js`	183 kB	+2 B (0%)

ℹ️ View Unchanged

Filename	Size
`./packages/s2-core/dist/style.min.css`	391 B
`./packages/s2-core/node_modules/@antv/g-canvas/dist/g.min.js`	61.7 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.cjs.js`	22.1 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.esm.js`	21.5 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.umd.js`	86.8 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/@testing-library/dom.umd.min.js`	48.8 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/config.js`	1.14 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/DOMElementFilter.js`	1.86 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/event-map.js`	1.19 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/events.js`	1.53 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/get-node-text.js`	299 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/get-queries-for-element.js`	742 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/get-user-code-frame.js`	805 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/helpers.js`	1.09 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/index.js`	1.14 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/label-helpers.js`	1.05 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/matches.js`	1.12 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/pretty-dom.js`	1.72 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/all-utils.js`	339 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/alt-text.js`	571 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/display-value.js`	710 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/index.js`	418 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/label-text.js`	1.78 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/placeholder-text.js`	489 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/role.js`	2.64 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/test-id.js`	496 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/text.js`	1.01 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/queries/title.js`	719 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/query-helpers.js`	1.8 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/role-helpers.js`	2.82 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/screen.js`	1.63 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/suggestions.js`	1.5 kB
`./packages/s2-core/node_modules/@testing-library/dom/dist/wait-for-element-to-be-removed.js`	736 B
`./packages/s2-core/node_modules/@testing-library/dom/dist/wait-for.js`	2.34 kB
`./packages/s2-core/node_modules/d3-dsv/dist/d3-dsv.js`	2.31 kB
`./packages/s2-core/node_modules/d3-dsv/dist/d3-dsv.min.js`	1.53 kB
`./packages/s2-core/node_modules/d3-interpolate/dist/d3-interpolate.js`	4.55 kB
`./packages/s2-core/node_modules/d3-interpolate/dist/d3-interpolate.min.js`	3.19 kB
`./packages/s2-core/node_modules/d3-timer/dist/d3-timer.js`	1.44 kB
`./packages/s2-core/node_modules/d3-timer/dist/d3-timer.min.js`	924 B
`./packages/s2-core/node_modules/tinycolor2/dist/tinycolor-min.js`	5.5 kB
`./packages/s2-react/dist/index.min.js`	67.7 kB
`./packages/s2-react/dist/style.min.css`	3.4 kB
`./packages/s2-react/node_modules/@ant-design/icons/dist/index.umd.js`	200 kB
`./packages/s2-react/node_modules/@ant-design/icons/dist/index.umd.min.js`	170 kB
`./packages/s2-react/node_modules/@antv/g-canvas/dist/g.min.js`	61.7 kB
`./packages/s2-react/node_modules/@antv/s2/dist/style.min.css`	391 B
`./packages/s2-react/node_modules/@testing-library/react/dist/@testing-library/react.cjs.js`	4.26 kB
`./packages/s2-react/node_modules/@testing-library/react/dist/@testing-library/react.esm.js`	3.87 kB
`./packages/s2-react/node_modules/@testing-library/react/dist/@testing-library/react.pure.cjs.js`	3.95 kB
`./packages/s2-react/node_modules/@testing-library/react/dist/@testing-library/react.pure.esm.js`	3.57 kB
`./packages/s2-react/node_modules/@testing-library/react/dist/@testing-library/react.pure.umd.js`	74.6 kB
`./packages/s2-react/node_modules/@testing-library/react/dist/@testing-library/react.pure.umd.min.js`	39.1 kB
`./packages/s2-react/node_modules/@testing-library/react/dist/@testing-library/react.umd.js`	74.9 kB
`./packages/s2-react/node_modules/@testing-library/react/dist/@testing-library/react.umd.min.js`	39.2 kB
`./packages/s2-react/node_modules/@testing-library/react/dist/act-compat.js`	1.85 kB
`./packages/s2-react/node_modules/@testing-library/react/dist/fire-event.js`	855 B
`./packages/s2-react/node_modules/@testing-library/react/dist/index.js`	631 B
`./packages/s2-react/node_modules/@testing-library/react/dist/pure.js`	2.04 kB
`./packages/s2-react/node_modules/ahooks/dist/ahooks.js`	32.1 kB
`./packages/s2-react/node_modules/antd/dist/antd-with-locales.js`	768 kB
`./packages/s2-react/node_modules/antd/dist/antd-with-locales.min.js`	349 kB
`./packages/s2-react/node_modules/antd/dist/antd.compact.css`	72.4 kB
`./packages/s2-react/node_modules/antd/dist/antd.compact.min.css`	67.9 kB
`./packages/s2-react/node_modules/antd/dist/antd.css`	72.4 kB
`./packages/s2-react/node_modules/antd/dist/antd.dark.css`	73.7 kB
`./packages/s2-react/node_modules/antd/dist/antd.dark.min.css`	69.3 kB
`./packages/s2-react/node_modules/antd/dist/antd.js`	693 kB
`./packages/s2-react/node_modules/antd/dist/antd.min.css`	68 kB
`./packages/s2-react/node_modules/antd/dist/antd.min.js`	293 kB
`./packages/s2-react/node_modules/antd/dist/antd.variable.css`	77.4 kB
`./packages/s2-react/node_modules/antd/dist/antd.variable.min.css`	68.5 kB
`./packages/s2-react/node_modules/antd/dist/compact-theme.js`	121 B
`./packages/s2-react/node_modules/antd/dist/dark-theme.js`	119 B
`./packages/s2-react/node_modules/antd/dist/default-theme.js`	7.71 kB
`./packages/s2-react/node_modules/antd/dist/theme.js`	4.29 kB
`./packages/s2-react/node_modules/antd/dist/variable-theme.js`	123 B
`./packages/s2-react/node_modules/d3-dsv/dist/d3-dsv.js`	2.31 kB
`./packages/s2-react/node_modules/d3-dsv/dist/d3-dsv.min.js`	1.53 kB
`./packages/s2-react/node_modules/react-beautiful-dnd/dist/react-beautiful-dnd.cjs.js`	45.9 kB
`./packages/s2-react/node_modules/react-beautiful-dnd/dist/react-beautiful-dnd.esm.js`	45.7 kB
`./packages/s2-react/node_modules/react-beautiful-dnd/dist/react-beautiful-dnd.js`	73.6 kB
`./packages/s2-react/node_modules/react-beautiful-dnd/dist/react-beautiful-dnd.min.js`	31.3 kB
`./packages/s2-react/node_modules/vite-plugin-svgr/dist/index.js`	828 B
`./packages/s2-shared/node_modules/@antv/s2/dist/style.min.css`	391 B
`./packages/s2-vue/dist/index.min.js`	21.4 kB
`./packages/s2-vue/dist/style.min.css`	1.67 kB
`./packages/s2-vue/node_modules/@antv/s2/dist/style.min.css`	391 B
`./packages/s2-vue/node_modules/@testing-library/vue/dist/fire-event.js`	1.4 kB
`./packages/s2-vue/node_modules/@testing-library/vue/dist/index.js`	584 B
`./packages/s2-vue/node_modules/@testing-library/vue/dist/render.js`	1.57 kB
`./packages/s2-vue/node_modules/@vue/shared/dist/shared.cjs.js`	7.91 kB
`./packages/s2-vue/node_modules/@vue/shared/dist/shared.cjs.prod.js`	7.9 kB
`./packages/s2-vue/node_modules/@vue/shared/dist/shared.esm-bundler.js`	7.66 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd-with-locales.js`	745 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd-with-locales.min.js`	367 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.compact.css`	73 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.compact.min.css`	66.1 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.css`	73 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.dark.css`	74.3 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.dark.min.css`	67.3 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.js`	679 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.min.css`	66.1 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.min.js`	317 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.variable.css`	78.7 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/antd.variable.min.css`	66.7 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/compact-theme.js`	121 B
`./packages/s2-vue/node_modules/ant-design-vue/dist/dark-theme.js`	119 B
`./packages/s2-vue/node_modules/ant-design-vue/dist/default-theme.js`	7.62 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/theme.js`	4.23 kB
`./packages/s2-vue/node_modules/ant-design-vue/dist/variable-theme.js`	123 B
`./packages/s2-vue/node_modules/vue/dist/vue.cjs.js`	1.01 kB
`./packages/s2-vue/node_modules/vue/dist/vue.cjs.prod.js`	820 B
`./packages/s2-vue/node_modules/vue/dist/vue.esm-browser.js`	106 kB
`./packages/s2-vue/node_modules/vue/dist/vue.esm-browser.prod.js`	51.1 kB
`./packages/s2-vue/node_modules/vue/dist/vue.esm-bundler.js`	913 B
`./packages/s2-vue/node_modules/vue/dist/vue.global.js`	106 kB
`./packages/s2-vue/node_modules/vue/dist/vue.global.prod.js`	49.9 kB
`./packages/s2-vue/node_modules/vue/dist/vue.runtime.esm-browser.js`	72.7 kB
`./packages/s2-vue/node_modules/vue/dist/vue.runtime.esm-browser.prod.js`	33.3 kB
`./packages/s2-vue/node_modules/vue/dist/vue.runtime.esm-bundler.js`	306 B
`./packages/s2-vue/node_modules/vue/dist/vue.runtime.global.js`	74 kB
`./packages/s2-vue/node_modules/vue/dist/vue.runtime.global.prod.js`	33.1 kB

_{compressed-size-action}

codecov-commenter · 2024-07-03T10:07:47Z

Codecov Report

Attention: Patch coverage is 66.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 79.94%. Comparing base (1adc25d) to head (3c557c9).
Report is 168 commits behind head on master.

Files	Patch %	Lines
packages/s2-core/src/utils/data-set-operate.ts	66.66%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2805      +/-   ##
==========================================
+ Coverage   76.48%   79.94%   +3.45%     
==========================================
  Files         240      160      -80     
  Lines       12312     9529    -2783     
  Branches     2630     2060     -570     
==========================================
- Hits         9417     7618    -1799     
+ Misses       1377      602     -775     
+ Partials     1518     1309     -209

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

github-actions · 2024-07-03T11:01:03Z

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

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

s2-site/package.json

lijinke666 · 2024-07-05T08:37:47Z

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

The release is available on:

Your semantic-release bot 📦🚀

fix: 自定义计算汇总 calcFunc 回调函数增加 s2 实例, 修复无法获取汇总数据的问题 close #2795

e44141e

github-actions bot added the pr(fix) bug fix label Jul 3, 2024

github-actions bot assigned lijinke666 Jul 3, 2024

github-actions bot requested review from wjgogogo and wuhaiyang July 3, 2024 10:00

vercel bot had a problem deploying to Preview July 3, 2024 10:03 Failure

docs: 更新文档主题版本

0376e94

vercel bot had a problem deploying to Preview July 3, 2024 11:00 Failure

github-actions bot added 🚨 lint failed 静态检查失败 🚨 test failed 单元测试挂了 labels Jul 3, 2024

lijinke666 added 2 commits July 3, 2024 19:06

docs: 更新文档主题版本

3094788

Merge branch 'fix-2795' of github.com:antvis/S2 into fix-2795

3c557c9

lijinke666 commented Jul 3, 2024

View reviewed changes

s2-site/package.json Show resolved Hide resolved

github-actions bot removed the 🚨 lint failed 静态检查失败 label Jul 3, 2024

vercel bot had a problem deploying to Preview July 3, 2024 11:13 Failure

github-actions bot removed the 🚨 test failed 单元测试挂了 label Jul 3, 2024

wjgogogo approved these changes Jul 5, 2024

View reviewed changes

lijinke666 merged commit 2c28e84 into master Jul 5, 2024
8 of 9 checks passed

lijinke666 deleted the fix-2795 branch July 5, 2024 07:59

lijinke666 added the released label Jul 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: 自定义计算汇总 calcFunc 回调函数增加 s2 实例, 修复无法获取汇总数据的问题 close #2795 #2805

fix: 自定义计算汇总 calcFunc 回调函数增加 s2 实例, 修复无法获取汇总数据的问题 close #2795 #2805

lijinke666 commented Jul 3, 2024 •

edited

Loading

vercel bot commented Jul 3, 2024 •

edited

Loading

github-actions bot commented Jul 3, 2024 •

edited

Loading

codecov-commenter commented Jul 3, 2024 •

edited

Loading

github-actions bot commented Jul 3, 2024 •

edited

Loading

lijinke666 commented Jul 5, 2024

fix: 自定义计算汇总 calcFunc 回调函数增加 s2 实例, 修复无法获取汇总数据的问题 close #2795 #2805

fix: 自定义计算汇总 calcFunc 回调函数增加 s2 实例, 修复无法获取汇总数据的问题 close #2795 #2805

Conversation

lijinke666 commented Jul 3, 2024 • edited Loading

👀 PR includes

📝 Description

🖼️ Screenshot

🔗 Related issue link

🔍 Self-Check before the merge

vercel bot commented Jul 3, 2024 • edited Loading

github-actions bot commented Jul 3, 2024 • edited Loading

codecov-commenter commented Jul 3, 2024 • edited Loading

Codecov Report

github-actions bot commented Jul 3, 2024 • edited Loading

lijinke666 commented Jul 5, 2024

lijinke666 commented Jul 3, 2024 •

edited

Loading

vercel bot commented Jul 3, 2024 •

edited

Loading

github-actions bot commented Jul 3, 2024 •

edited

Loading

codecov-commenter commented Jul 3, 2024 •

edited

Loading

github-actions bot commented Jul 3, 2024 •

edited

Loading