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: resolve the issue of reduced row count after merging cells #5166

Merged
merged 1 commit into from
Jan 11, 2024

Conversation

LIlGG
Copy link
Member

@LIlGG LIlGG commented Jan 10, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

为表格 tr 增加 style 字段,解决由于合并单元格后 tr 高度为 0 的问题

How to test it?

将三列三行的表格,每列进行不一样的组合合并单元格后,查看其是否会出现变成两行的问题。

Which issue(s) this PR fixes:

Fixes #5143

Does this PR introduce a user-facing change?

解决默认编辑器表格合并单元格后行丢失的问题

@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Jan 10, 2024
@f2c-ci-robot f2c-ci-robot bot requested review from wan92hen and wzrove January 10, 2024 04:52
Copy link

codecov bot commented Jan 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (0b30c0d) 55.91% compared to head (75247df) 55.91%.
Report is 15 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #5166   +/-   ##
=========================================
  Coverage     55.91%   55.91%           
  Complexity     3032     3032           
=========================================
  Files           524      524           
  Lines         17826    17826           
  Branches       1329     1329           
=========================================
  Hits           9968     9968           
  Misses         7309     7309           
  Partials        549      549           

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

@ruibaby
Copy link
Member

ruibaby commented Jan 10, 2024

/area editor

@f2c-ci-robot f2c-ci-robot bot added the area/editor Issues or PRs related to the Editor label Jan 10, 2024
@ruibaby
Copy link
Member

ruibaby commented Jan 10, 2024

/milestone 2.12.x

@f2c-ci-robot f2c-ci-robot bot added this to the 2.12.x milestone Jan 10, 2024
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 Jan 10, 2024
Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

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

It works very well.

/approve

image

Copy link

f2c-ci-robot bot commented Jan 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

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 Jan 11, 2024
@JohnNiang JohnNiang merged commit 6830660 into halo-dev:main Jan 11, 2024
4 checks passed
@ruibaby ruibaby modified the milestones: 2.12.x, 2.12.0 Jan 15, 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.

表格合并单元格后变成两行表格了
4 participants