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.

Sign up for GitHub

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

Jump to bottom

fix(sheets): refactor mergecell generating logic #1636

Merged
merged 21 commits into from
Apr 2, 2024
Merged

fix(sheets): refactor mergecell generating logic #1636

merged 21 commits into from
Apr 2, 2024

Conversation

ybzky
Copy link
Contributor

@ybzky ybzky commented Mar 19, 2024 •
edited

需要回归合并单元格关于增删行列 移动行列的交叉场景

@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 19, 2024 •
edited

View Deployment

📑 Examples 📚 Storybook
🔗 Preview link 🔗 Preview link

@codecov Codecov
Copy link

codecov bot commented Mar 19, 2024 •
edited

Codecov Report

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

Project coverage is 29.79%. Comparing base (9961b32) to head (82b81e5).
Report is 8 commits behind head on dev.

Files Patch % Lines
...es/sheets/src/controllers/merge-cell.controller.ts 80.76% 45 Missing ⚠️
...sheets/src/services/ref-range/ref-range.service.ts 71.42% 2 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##              dev    #1636      +/-   ##
==========================================
+ Coverage   29.65%   29.79%   +0.14%     
==========================================
  Files        1138     1141       +3     
  Lines       61858    62029     +171     
  Branches    12939    13019      +80     
==========================================
+ Hits        18343    18482     +139     
- Misses      43515    43547      +32

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

@ybzky ybzky force-pushed the refactor-mergecell-generating-logic branch from 2c8ec7c to 2ec1e6a Compare March 19, 2024 08:31
@ybzky ybzky changed the title Refactor mergecell generating logic fix(sheet): Refactor mergecell generating logic Mar 19, 2024
@univer-bot univer-bot bot added the qa:untested This PR is ready to be tested label Mar 19, 2024
@ybzky ybzky changed the title fix(sheet): Refactor mergecell generating logic fix(sheet): refactor mergecell generating logic Mar 19, 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 19, 2024
@univer-bot univer-bot bot removed the qa:untested This PR is ready to be tested label Mar 19, 2024
@ybzky ybzky force-pushed the refactor-mergecell-generating-logic branch from 26f9d3a to 06df474 Compare March 20, 2024 07:31
wzhudev
wzhudev requested changes Mar 26, 2024
View reviewed changes
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.

Good work! Some problems need to be addressed to improve code quality.

packages/core/src/shared/object-matrix.ts Outdated Show resolved Hide resolved
packages/core/src/shared/tools.ts Outdated Show resolved Hide resolved
packages/sheets-ui/src/commands/commands/add-worksheet-merge.command.ts Outdated Show resolved Hide resolved
packages/sheets/src/controllers/insert-or-remove-row-col.controller.ts Outdated Show resolved Hide resolved
packages/sheets/src/controllers/insert-or-remove-row-col.controller.ts Outdated Show resolved Hide resolved
@ybzky ybzky requested a review from Gggpound as a code owner March 26, 2024 04:11
@ybzky ybzky force-pushed the refactor-mergecell-generating-logic branch 2 times, most recently from c8945c5 to 92eacca Compare March 27, 2024 08:36
@ybzky ybzky added the qa:untested This PR is ready to be tested label Mar 27, 2024
@univer-bot univer-bot bot removed the qa:verified This PR has already by verified by a QA and is considered good enough to be merge label Mar 27, 2024
@univer-bot
Copy link

univer-bot bot commented Mar 27, 2024 •
edited

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

Origin Title: fix(sheets): refactor mergecell generating logic

Title: fix(sheets): refactor mergecell generating logic

需要回归合并单元格关于增删行列 移动行列的交叉场景

@ybzky ybzky force-pushed the refactor-mergecell-generating-logic branch from 6bf8e96 to 92eacca Compare March 27, 2024 09:27
@jikkai jikkai changed the title fix(sheet): refactor mergecell generating logic fix(sheets): refactor mergecell generating logic Mar 28, 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 Apr 2, 2024
@univer-bot univer-bot bot removed the qa:untested This PR is ready to be tested label Apr 2, 2024
@ybzky ybzky force-pushed the refactor-mergecell-generating-logic branch from 3ab64fa to 5dc1bb9 Compare April 2, 2024 07:51
@ybzky ybzky requested a review from wzhudev April 2, 2024 07:57
@ybzky ybzky requested a review from wzhudev April 2, 2024 11:14
@wzhudev wzhudev merged commit 02cd695 into dev Apr 2, 2024
8 checks passed
@wzhudev wzhudev deleted the refactor-mergecell-generating-logic branch April 2, 2024 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wzhudev wzhudev wzhudev approved these changes

@jikkai jikkai Awaiting requested review from jikkai jikkai is a code owner

@DR-Univer DR-Univer Awaiting requested review from DR-Univer DR-Univer is a code owner

@Gggpound Gggpound Awaiting requested review from Gggpound Gggpound is a code owner

Assignees
No one assigned
Labels
qa:verified This PR has already by verified by a QA and is considered good enough to be merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ybzky @wzhudev @zhaolixin7