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

refactor: 去除多余的 TotalsStatus,只保留 TotalStatus #2623

Merged
merged 1 commit into from
Mar 25, 2024

Conversation

wjgogogo
Copy link
Contributor

@wjgogogo wjgogogo commented Mar 25, 2024

👀 PR includes

✨ Feature

  • New feature

🎨 Enhance

  • Code style optimization
  • Refactoring
  • Change the UI
  • Improve the performance
  • Type optimization

🐛 Bugfix

  • Solve the issue and close #0

🔧 Chore

  • Test case
  • Docs / demos update
  • CI / workflow
  • Release version
  • Other ()

📝 Description

  • 去除 TotalsStatus, 保留 TotalStatus
  • TotalStatus 中总计配置增加 Grand 关键字,保持风格统一

🖼️ 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.

Copy link

vercel bot commented Mar 25, 2024

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

Name Status Preview Comments Updated (UTC)
antvis-s2 ❌ Failed (Inspect) Mar 25, 2024 3:41am

@github-actions github-actions bot added the pr(refactor) refactor label Mar 25, 2024
@github-actions github-actions bot added the next 2.0-next 版本的问题 label Mar 25, 2024
Copy link
Contributor

Size Change: +49 B (0%)

Total Size: 318 kB

Filename Size Change
./packages/s2-core/dist/index.min.js 222 kB +49 B (0%)
ℹ️ View Unchanged
Filename Size
./packages/s2-core/dist/style.min.css 402 B
./packages/s2-react/dist/index.min.js 69.3 kB
./packages/s2-react/dist/style.min.css 4 kB
./packages/s2-vue/dist/index.min.js 20.3 kB
./packages/s2-vue/dist/style.min.css 1.97 kB

compressed-size-action

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 75.00000% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 79.03%. Comparing base (ecdc9c8) to head (451910e).
Report is 292 commits behind head on next.

Files Patch % Lines
packages/s2-core/src/utils/data-set-operate.ts 75.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             next    #2623      +/-   ##
==========================================
+ Coverage   75.77%   79.03%   +3.26%     
==========================================
  Files         257      274      +17     
  Lines       11994    12392     +398     
  Branches     2464     2529      +65     
==========================================
+ Hits         9088     9794     +706     
+ Misses       1398     1061     -337     
- Partials     1508     1537      +29     

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

@@ -112,6 +113,7 @@ export class PivotFacet extends FrozenFacet {
const isTotals =
row.isTotals || row.isTotalMeasure || col.isTotals || col.isTotalMeasure;

const totalStatus = getHeaderTotalStatus(row, col);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master 上是有这个逻辑的,似乎是合代码合掉了

@lijinke666 lijinke666 merged commit 4d0dfc9 into next Mar 25, 2024
14 of 15 checks passed
@lijinke666 lijinke666 deleted the refactor-totalstatus branch March 25, 2024 05:53
@lijinke666
Copy link
Member

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

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(refactor) refactor released on @next
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants