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

fix: 修复明细表在 dataCfg 为空, 同时开启序号列时, 错误的渲染了占位符的问题 #3042

Merged
merged 2 commits into from
Dec 20, 2024

Conversation

lijinke666
Copy link
Member

@lijinke666 lijinke666 commented Dec 17, 2024

👀 PR includes

🐛 Bugfix

  • Solve the issue and close #0

📝 Description

🖼️ Screenshot

🔗 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 Dec 17, 2024

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

Name Status Preview Comments Updated (UTC)
antvis-s2 ❌ Failed (Inspect) Dec 17, 2024 9:07am

@github-actions github-actions bot added the next 2.0-next 版本的问题 label Dec 17, 2024
Copy link
Contributor

你好 @lijinke666,非常感谢你的贡献.
为了让代码更健壮, 请根据 贡献指南 补充相应单元测试 (文档改动或其他特殊场景除外), 如果有 API 改动, 请修改 相应的文档.
同时请检查 linttest 相关 CI 是否通过, 如果失败, 请点击 [Details] 按钮查看, 并根据日志修复.

Hello, @lijinke666, 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.
At the same time, please check whether the CI related to lint and test passes. If the CI fails, please click [Details] button to check and repair according to the log.

@github-actions github-actions bot requested a review from wjgogogo December 17, 2024 03:53
@github-actions github-actions bot added the pr(fix) bug fix label Dec 17, 2024
Copy link

Walkthrough: 这个PR修复了当dataCfg为空且序号列开启时,明细表错误渲染占位符的问题。通过在table-facet.ts中添加shouldRender方法,避免了仅包含序号列时渲染占位符。测试文件table-sheet-spec.ts也进行了相应的更新。

Changes:

文件 概要
packages/s2-core/tests/spreadsheet/table-sheet-spec.ts 更新了测试用例以验证在不同序号列设置下不渲染占位符的行为。
packages/s2-core/src/facet/table-facet.ts 添加了shouldRender方法以避免仅包含序号列时渲染占位符。

(field) => field === SERIES_NUMBER_FIELD,
);

return super.shouldRender() && !isOnlyContainedSeriesNumber;

Choose a reason for hiding this comment

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

The shouldRender method ensures that the placeholder is not rendered when only the series number column is present. This is a logical fix to prevent unnecessary rendering.

@@ -86,6 +86,15 @@ export class TableFacet extends FrozenFacet {
this.initEmptyPlaceholderGroup();
}

protected shouldRender(): boolean {
const { fields } = this.spreadsheet.dataSet;
const isOnlyContainedSeriesNumber = fields?.columns?.every(
Copy link
Member Author

@lijinke666 lijinke666 Dec 17, 2024

Choose a reason for hiding this comment

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

image

dataCfg 为空时, 明细表开启序号, columns 会添加 SERIES_NUMBER_FIELD, 所以 shouldRender() 没有拦截到, 这种情况不应该渲染

@codecov-commenter
Copy link

codecov-commenter commented Dec 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.77%. Comparing base (ecdc9c8) to head (f618893).
Report is 566 commits behind head on next.

Additional details and impacted files
@@            Coverage Diff             @@
##             next    #3042      +/-   ##
==========================================
  Coverage   75.77%   75.77%              
==========================================
  Files         257       51     -206     
  Lines       11994     1490   -10504     
  Branches     2464      284    -2180     
==========================================
- Hits         9088     1129    -7959     
+ Misses       1398      210    -1188     
+ Partials     1508      151    -1357     

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

Copy link
Contributor

github-actions bot commented Dec 17, 2024

Size Change: +48 B (+0.01%)

Total Size: 618 kB

Filename Size Change
./packages/s2-core/dist/s2.min.js 257 kB +48 B (+0.02%)
ℹ️ View Unchanged
Filename Size
./packages/s2-core/dist/s2-extends.min.js 154 kB
./packages/s2-core/dist/s2.min.css 581 B
./packages/s2-react-components/dist/s2-react-components.min.css 2.55 kB
./packages/s2-react-components/dist/s2-react-components.min.js 124 kB
./packages/s2-react/dist/s2-react.min.css 1.74 kB
./packages/s2-react/dist/s2-react.min.js 38.3 kB
./packages/s2-vue/dist/s2-vue.min.css 2.05 kB
./packages/s2-vue/dist/s2-vue.min.js 38.3 kB

compressed-size-action

@lijinke666 lijinke666 merged commit feab43f into next Dec 20, 2024
9 of 11 checks passed
@lijinke666 lijinke666 deleted the fix-empty-series branch December 20, 2024 03:54
@lijinke666
Copy link
Member Author

🎉 This PR is included in version @antv/s2-v2.1.5 🎉

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(fix) bug fix released on @latest
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants