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: 增加对自定义行列头总计、小计节点和组内排序的支持,修复明细表自定义列头 icon 问题 icon closes #2898 #2893 #2934

Merged
merged 18 commits into from
Oct 28, 2024

Conversation

lijinke666
Copy link
Member

@lijinke666 lijinke666 commented Oct 23, 2024

👀 PR includes

🎨 Enhance

  • Change the UI

🐛 Bugfix

📝 Description

  1. 透视表开启自定义行列头时, 增加对组内排序的支持
  2. 自定义行列头时, 增加对总计、小计的支持
  3. 增加自定义行列头的一些限制条件说明
  4. 修复明细表自定义列头时, 非指标也出现排序 icon 的问题

🖼️ Screenshot

Before After
image 2024-10-28 15 51 18
image 2024-10-28 15 51 40
image image

🔗 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.

Copy link

vercel bot commented Oct 23, 2024

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

Name Status Preview Comments Updated (UTC)
antvis-s2 ❌ Failed (Inspect) Oct 28, 2024 9:34am

Copy link
Contributor

github-actions bot commented Oct 23, 2024

Size Change: -33 B (-0.01%)

Total Size: 335 kB

Filename Size Change
./packages/s2-core/dist/index.min.js 236 kB -32 B (-0.01%)
./packages/s2-react/dist/index.min.js 70.9 kB -1 B (0%)
ℹ️ View Unchanged
Filename Size
./packages/s2-core/dist/style.min.css 388 B
./packages/s2-react/dist/style.min.css 3.77 kB
./packages/s2-vue/dist/index.min.js 22.9 kB
./packages/s2-vue/dist/style.min.css 1.85 kB

compressed-size-action

Copy link
Contributor

github-actions bot commented Oct 23, 2024

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

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

@codecov-commenter
Copy link

codecov-commenter commented Oct 23, 2024

Codecov Report

Attention: Patch coverage is 81.25000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 80.77%. Comparing base (ecdc9c8) to head (ada22e0).
Report is 465 commits behind head on next.

Files with missing lines Patch % Lines
packages/s2-core/src/data-set/pivot-data-set.ts 66.66% 0 Missing and 2 partials ⚠️
packages/s2-react/src/hooks/useSpreadSheet.ts 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             next    #2934      +/-   ##
==========================================
+ Coverage   75.77%   80.77%   +5.00%     
==========================================
  Files         257      179      -78     
  Lines       11994    10422    -1572     
  Branches     2464     2369      -95     
==========================================
- Hits         9088     8418     -670     
+ Misses       1398      555     -843     
+ Partials     1508     1449      -59     

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

@lijinke666 lijinke666 changed the title fix: 开启自定义行列头时, 不应该渲染总计节点和组内排序 icon closes #2898 #2893 [WIP] fix: 开启自定义行列头时, 不应该渲染总计节点和组内排序 icon closes #2898 #2893 Oct 24, 2024
@github-actions github-actions bot removed the pr(fix) bug fix label Oct 24, 2024
@lijinke666 lijinke666 changed the title [WIP] fix: 开启自定义行列头时, 不应该渲染总计节点和组内排序 icon closes #2898 #2893 fix: 开启自定义行列头时, 不应该渲染总计节点和组内排序 icon closes #2898 #2893 Oct 25, 2024
@github-actions github-actions bot added the pr(fix) bug fix label Oct 25, 2024
@github-actions github-actions bot removed the 🚨 test failed 单元测试挂了 label Oct 25, 2024
@lijinke666 lijinke666 changed the title fix: 开启自定义行列头时, 不应该渲染总计节点和组内排序 icon closes #2898 #2893 [WIP] fix: 开启自定义行列头时, 不应该渲染总计节点和组内排序 icon closes #2898 #2893 Oct 25, 2024
@github-actions github-actions bot removed the pr(fix) bug fix label Oct 25, 2024
@wjgogogo wjgogogo changed the title [WIP] fix: 开启自定义行列头时, 不应该渲染总计节点和组内排序 icon closes #2898 #2893 feat: 增加对自定义行列头总计、小计节点和组内排序的支持,修复明细表自定义列头 icon 问题 icon closes #2898 #2893 Oct 28, 2024
@github-actions github-actions bot added the pr(feature) new feature label Oct 28, 2024
@lijinke666 lijinke666 merged commit a4ae432 into next Oct 28, 2024
7 of 9 checks passed
@lijinke666 lijinke666 deleted the fix-custom-header branch October 28, 2024 11:09
@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-v2.0.0-next.31 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-react-v2.0.0-next.30 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-vue-v2.0.0-next.16 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
next 2.0-next 版本的问题 pr(feature) new feature released on @next
Projects
None yet
3 participants