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: 调整换行高度自适应和自定义高度的优先级 close #2613 #2630

Merged
merged 3 commits into from
Mar 29, 2024

Conversation

lijinke666
Copy link
Member

@lijinke666 lijinke666 commented Mar 26, 2024

👀 PR includes

🐛 Bugfix

🔧 Chore

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

📝 Description

  s2.setOptions({
    style: {
      colCell: {
        height: 70,
      },
      rowCell: {
        heightByField: {
          0: 70,
          1: 100,
       	  2: 150,
        },
      },
    },
  });
  1. 修复开启换行时, 且不存在换行文本时自定义单元格高度失效的问题, 现在自定义单元格宽高的优先级最高.
  2. 完善相关单测和文档

🖼️ Screenshot

Before After
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 Mar 26, 2024

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

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

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

github-actions bot commented Mar 26, 2024

Size Change: +168 B (0%)

Total Size: 318 kB

Filename Size Change
./packages/s2-core/dist/index.min.js 222 kB +168 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

Copy link
Contributor

github-actions bot commented Mar 26, 2024

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

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

@github-actions github-actions bot added the 🚨 test failed 单元测试挂了 label Mar 26, 2024
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.02%. Comparing base (ecdc9c8) to head (ec82125).
Report is 295 commits behind head on next.

Additional details and impacted files
@@            Coverage Diff             @@
##             next    #2630      +/-   ##
==========================================
+ Coverage   75.77%   79.02%   +3.25%     
==========================================
  Files         257      274      +17     
  Lines       11994    12401     +407     
  Branches     2464     2537      +73     
==========================================
+ Hits         9088     9800     +712     
+ Misses       1398     1063     -335     
- Partials     1508     1538      +30     

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

@wjgogogo wjgogogo merged commit 4caabed into next Mar 29, 2024
8 of 9 checks passed
@wjgogogo wjgogogo deleted the fix-2613 branch March 29, 2024 07:20
@lijinke666
Copy link
Member Author

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

Successfully merging this pull request may close these issues.

🐛当设置文本自动换行时,设置单元格高度无效
3 participants