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: border for merged cell #3506

Merged
merged 3 commits into from
Sep 23, 2024
Merged

fix: border for merged cell #3506

merged 3 commits into from
Sep 23, 2024

Conversation

lumixraku
Copy link
Contributor

@lumixraku lumixraku commented Sep 20, 2024

close https://github.com/dream-num/univer-pro/issues/2561
close #3391

Pull Request Checklist

  • Related tickets or issues have been linked in the PR description (or missing issue).
  • Naming convention is followed (do please check it especially when you created new plugins, commands and resources).
  • Unit tests have been added for the changes (if applicable).
  • Breaking changes have been documented (or no breaking changes introduced in this PR).

@univer-bot univer-bot bot added the qa:untested This PR is ready to be tested label Sep 20, 2024
Copy link

github-actions bot commented Sep 20, 2024

View Deployment

📑 Examples 📚 Storybook
🔗 Preview link 🔗 Preview link

Copy link

github-actions bot commented Sep 20, 2024

Playwright test results

passed  4 passed

Details

stats  4 tests across 2 suites
duration  1 minute, 23 seconds
commit  ab8f523
info  For more information, see full report

Copy link

codecov bot commented Sep 20, 2024

Codecov Report

Attention: Patch coverage is 88.55932% with 27 lines in your changes missing coverage. Please review.

Project coverage is 30.93%. Comparing base (f11c87f) to head (ab8f523).
Report is 3 commits behind head on dev.

Files with missing lines Patch % Lines
...sheets/src/commands/commands/set-border-command.ts 88.55% 27 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              dev    #3506      +/-   ##
==========================================
+ Coverage   30.90%   30.93%   +0.02%     
==========================================
  Files        2161     2161              
  Lines      113511   113530      +19     
  Branches    24893    24888       -5     
==========================================
+ Hits        35079    35116      +37     
+ Misses      78432    78414      -18     
Flag Coverage Δ
30.93% <88.55%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@zhaolixin7
Copy link

zhaolixin7 commented Sep 20, 2024

1、水平、垂直合并后分别设置上、下、左、右后取消边框
表现:垂直的合并的地步边框未取消、水平的有边框未消失image

@univer-bot
Copy link

univer-bot bot commented Sep 20, 2024

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

  1. After merging horizontally and vertically, set the top, bottom, left, and right respectively and then cancel the borders.
    Performance: Vertical merged borders are not cancelled, horizontal borders are not disappearedimage

@lumixraku lumixraku force-pushed the fix/border-data branch 2 times, most recently from 9eb80a2 to 4f9d9a8 Compare September 20, 2024 12:35
Copy link
Member

@wzhudev wzhudev left a comment

Choose a reason for hiding this comment

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

There should be unit tests for the bugfix.

@zhaolixin7
Copy link

@lumixraku 单元格和合并单元格组合,设置内边框边框线预期:外边框线不应该显示
image

@univer-bot
Copy link

univer-bot bot commented Sep 21, 2024

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

@lumixraku Cell and merged cell combination, set inner border border line Expectation: outer border line should not be displayed
image

@zhaolixin7 zhaolixin7 added qa:rejected and removed qa:untested This PR is ready to be tested labels Sep 21, 2024
@zhaolixin7 zhaolixin7 added the qa:verified This PR has already by verified by a QA and is considered good enough to be merge label Sep 21, 2024
@univer-bot univer-bot bot removed the qa:rejected label Sep 21, 2024
@lumixraku lumixraku self-assigned this Sep 23, 2024
@lumixraku lumixraku closed this Sep 23, 2024
@lumixraku lumixraku reopened this Sep 23, 2024
@lumixraku
Copy link
Contributor Author

lumixraku commented Sep 23, 2024

@lumixraku lumixraku marked this pull request as draft September 23, 2024 03:27
@lumixraku lumixraku marked this pull request as ready for review September 23, 2024 03:27
Copy link
Member

@wzhudev wzhudev left a comment

Choose a reason for hiding this comment

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

LGTM

@lumixraku lumixraku merged commit 1c4c237 into dev Sep 23, 2024
9 checks passed
@lumixraku lumixraku deleted the fix/border-data branch September 23, 2024 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
qa:verified This PR has already by verified by a QA and is considered good enough to be merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug Report: Excel Border Issue and Text Alignment Problem After Download
3 participants