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(sheet): fix error edit position after merging #1520

Merged
merged 1 commit into from Mar 19, 2024

Conversation

ybzky
Copy link
Contributor

@ybzky ybzky commented Mar 8, 2024

  • I am sure that the code is update-to-date with the dev branch.

close #1438

修复问题
1.合并单元格后直接编辑编辑框位置不正确
2.undo、redo之前选区是不跟随合并单元格选区变化的问题
3.合并区间内有值的情况下 点击弹出modal的button导致焦点捕获后编辑不响应问题

[#1438]

@ybzky ybzky added the bug Something isn't working label Mar 8, 2024
@ybzky ybzky self-assigned this Mar 8, 2024
@univer-bot univer-bot bot added the qa:untested This PR is ready to be tested label Mar 8, 2024
Copy link

github-actions bot commented Mar 8, 2024

View Deployment

📑 Examples 📚 Storybook
🔗 Preview link 🔗 Preview link

Copy link

codecov bot commented Mar 8, 2024

Codecov Report

Attention: Patch coverage is 8.33333% with 44 lines in your changes are missing coverage. Please review.

Project coverage is 32.75%. Comparing base (a684e9d) to head (8a63940).
Report is 60 commits behind head on dev.

Files Patch % Lines
...heets/src/commands/utils/handle-merge-operation.ts 0.00% 42 Missing ⚠️
packages/ui/src/services/layout/layout.service.ts 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              dev    #1520      +/-   ##
==========================================
- Coverage   32.78%   32.75%   -0.03%     
==========================================
  Files         914      915       +1     
  Lines       50810    50857      +47     
  Branches    10592    10606      +14     
==========================================
+ Hits        16656    16660       +4     
- Misses      34154    34197      +43     

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

@jikkai jikkai removed the bug Something isn't working label Mar 8, 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 Mar 16, 2024
@univer-bot univer-bot bot removed the qa:untested This PR is ready to be tested label Mar 16, 2024
@ybzky ybzky merged commit 8685e14 into dev Mar 19, 2024
9 checks passed
@ybzky ybzky deleted the fix-sheet-edit-after-merge branch March 19, 2024 08:49
ybzky added a commit that referenced this pull request Mar 20, 2024
Co-authored-by: yuanbin <ybzkyfafa@gamil.com>
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] 合并单元格后编辑,编辑框位置不对
4 participants