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(sheet): editor change sheet #1241

Closed
wants to merge 12 commits into from
Closed

fix(sheet): editor change sheet #1241

wants to merge 12 commits into from

Conversation

DR-Univer
Copy link
Collaborator

@DR-Univer DR-Univer commented Jan 24, 2024 •
edited
Loading

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

close #991
close #1054

@DR-Univer DR-Univer requested a review from Jocs as a code owner January 24, 2024 03:29
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 24, 2024 •
edited
Loading

View Deployment

📑 Examples 📚 Storybook
🔗 Preview link 🔗 Preview link

@codecov Codecov
Copy link

codecov bot commented Jan 24, 2024 •
edited
Loading

Codecov Report

Attention: 16 lines in your changes are missing coverage. Please review.

Comparison is base (ee85ccb) 29.63% compared to head (7cad529) 29.62%.
Report is 8 commits behind head on dev.

Files Patch % Lines
...ui/src/services/contextmenu/contextmenu.service.ts 0.00% 5 Missing and 1 partial ⚠️
...ine-render/src/components/sheets/sheet-skeleton.ts 0.00% 0 Missing and 3 partials ⚠️
...rc/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx 0.00% 2 Missing and 1 partial ⚠️
packages/core/src/sheets/row-manager.ts 0.00% 2 Missing ⚠️
...s-ui/src/controllers/editor/end-edit.controller.ts 0.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##              dev    #1241      +/-   ##
==========================================
- Coverage   29.63%   29.62%   -0.01%     
==========================================
  Files         829      829              
  Lines       46860    46869       +9     
  Branches     9590     9592       +2     
==========================================
  Hits        13885    13885              
- Misses      28761    28768       +7     
- Partials     4214     4216       +2

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

@zhaolixin7
Copy link

@DR-Univer 未退出编辑态切换子表直接编辑，单元格位置还不对，文字无法输入
2024_1_24 11_45_17 video.webm
2024_1_24 11_45_17 commands.json

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jan 24, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@DR-Univer DR-Univer added qa:untested This PR is ready to be tested and removed qa:rejected labels Jan 24, 2024
@DR-Univer
Copy link
Collaborator Author

@zhaolixin7 这个问题和禁用菜单的问题相关，我一起解了，可以一起看看

@Issues-translate-bot
Copy link

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

@zhaolixin7 This problem is related to the problem of disabling the menu. I solved it together. You can take a look together.

@zhaolixin7 zhaolixin7 added qa:verified This PR has already by verified by a QA and is considered good enough to be merge and removed qa:untested This PR is ready to be tested labels Jan 25, 2024
Jocs
Jocs reviewed Jan 25, 2024
View reviewed changes
Copy link
Contributor

@Jocs Jocs left a comment

Choose a reason for hiding this comment

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

带有 isAutoHeight 重构的代码？

packages/engine-render/src/components/sheets/sheet-skeleton.ts
@@ -1330,8 +1330,8 @@ export class SpreadsheetSkeleton extends Skeleton {
if (!rowDataItem) {
continue;
}
const { h = defaultRowHeight, ah, isAutoHeight } = rowDataItem;
if ((isAutoHeight == null || !!isAutoHeight) && typeof ah === 'number') {
const { h = defaultRowHeight, ah, ia } = rowDataItem;
Copy link
Contributor

Choose a reason for hiding this comment

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

这是我漏改了吗😅

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

这个分支废弃吧 哲能帮我弄了

@DR-Univer DR-Univer closed this Jan 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jocs Jocs Jocs left review comments

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

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

@Dushusir Dushusir Awaiting requested review from Dushusir Dushusir 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.

[Bug] 编辑公式预期无法进行其他操作 [Bug] 未退出编辑时切换子表，编辑框异常
6 participants
@DR-Univer @zhaolixin7 @Issues-translate-bot @Jocs @yuhongz @jikkai