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: incorrect column width calculation after merging cells in the table #5803

Merged
merged 1 commit into from
May 16, 2024

Conversation

LIlGG
Copy link
Member

@LIlGG LIlGG commented Apr 26, 2024

What type of PR is this?

/kind bug
/area editor
/milestone 2.16.x

What this PR does / why we need it:

默认编辑器中的表格首行被合并单元格之后,将会出现当前表在刷新之后宽度被重置为默认。此 PR 改正了计算宽度,使其首次刷新时,也能返回正确的数组。

How to test it?

  1. 将表格首行使用合并单元格之后,改变表格宽度。
  2. 刷新表格,查看表格宽度是否不再变为默认宽度。

Which issue(s) this PR fixes:

Fixes #5767

Does this PR introduce a user-facing change?

解决默认编辑器中的表格首行合并单元格后会出现宽度重置的问题

@f2c-ci-robot f2c-ci-robot bot added kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Apr 26, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.15.x milestone Apr 26, 2024
@f2c-ci-robot f2c-ci-robot bot added the area/editor Issues or PRs related to the Editor label Apr 26, 2024
@f2c-ci-robot f2c-ci-robot bot requested review from guqing and JohnNiang April 26, 2024 04:05
Copy link

codecov bot commented Apr 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.40%. Comparing base (5fdf6c0) to head (b484764).
Report is 171 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #5803      +/-   ##
============================================
- Coverage     56.91%   56.40%   -0.51%     
- Complexity     3319     3449     +130     
============================================
  Files           587      612      +25     
  Lines         18968    20442    +1474     
  Branches       1401     1411      +10     
============================================
+ Hits          10795    11531     +736     
- Misses         7594     8333     +739     
+ Partials        579      578       -1     

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

@LIlGG LIlGG changed the title fix: incorrect column width calculation after merging cells in the table WIP: fix: incorrect column width calculation after merging cells in the table Apr 26, 2024
@f2c-ci-robot f2c-ci-robot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 26, 2024
@ruibaby ruibaby modified the milestones: 2.15.x, 2.16.x May 7, 2024
@f2c-ci-robot f2c-ci-robot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 8, 2024
@LIlGG LIlGG force-pushed the fix/merge-cell-table-col branch from 38cb08d to b484764 Compare May 8, 2024 04:03
@LIlGG
Copy link
Member Author

LIlGG commented May 8, 2024

/retitle fix: incorrect column width calculation after merging cells in the table

@f2c-ci-robot f2c-ci-robot bot changed the title WIP: fix: incorrect column width calculation after merging cells in the table fix: incorrect column width calculation after merging cells in the table May 8, 2024
@f2c-ci-robot f2c-ci-robot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 8, 2024
Copy link

sonarcloud bot commented May 8, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.2% Duplication on New Code

See analysis details on SonarCloud

@LIlGG LIlGG requested a review from ruibaby May 8, 2024 04:04
Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label May 16, 2024
Copy link

f2c-ci-robot bot commented May 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: guqing

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 16, 2024
@f2c-ci-robot f2c-ci-robot bot merged commit 607898b into halo-dev:main May 16, 2024
8 checks passed
@LIlGG LIlGG deleted the fix/merge-cell-table-col branch May 16, 2024 07:16
@ruibaby ruibaby modified the milestones: 2.16.x, 2.16.0 May 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/editor Issues or PRs related to the Editor kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

默认编辑器的表格自己刷新格式
3 participants