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(formula): reverse undo range list #2389

Merged
merged 4 commits into from
Jun 15, 2024
Merged

Conversation

Dushusir
Copy link
Member

@Dushusir Dushusir commented Jun 1, 2024

如何测试?
输入公式 =SUM(1) 后,按Enter光标移动到下方,或者 Tab 后光标移动到右侧。原先是跳了2格。

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).

@Dushusir Dushusir marked this pull request as ready for review June 1, 2024 10:42
@Dushusir Dushusir requested a review from DR-Univer as a code owner June 1, 2024 10:42
@univer-bot univer-bot bot added the qa:untested This PR is ready to be tested label Jun 1, 2024
Copy link

codecov bot commented Jun 1, 2024

Codecov Report

Attention: Patch coverage is 91.20879% with 8 lines in your changes missing coverage. Please review.

Project coverage is 27.16%. Comparing base (856cfb8) to head (f9e881f).

Files Patch % Lines
...formula/src/controllers/utils/ref-range-formula.ts 93.02% 6 Missing ⚠️
...gine-formula/src/models/utils/formula-data-util.ts 60.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              dev    #2389      +/-   ##
==========================================
+ Coverage   27.15%   27.16%   +0.01%     
==========================================
  Files        1654     1654              
  Lines       83330    83346      +16     
  Branches    17258    17262       +4     
==========================================
+ Hits        22626    22643      +17     
+ Misses      60704    60703       -1     

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

Copy link

github-actions bot commented Jun 1, 2024

View Deployment

📑 Examples 📚 Storybook
🔗 Preview link 🔗 Preview link

@oumomomo oumomomo 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 Jun 3, 2024
@zhaolixin7 zhaolixin7 removed the qa:verified This PR has already by verified by a QA and is considered good enough to be merge label Jun 3, 2024
@zhaolixin7
Copy link

删除公式结果选区第一列后undo,undo后显示为值未显示为公式
2024_6_3 11_34_02 video.webm

@univer-bot
Copy link

univer-bot bot commented Jun 3, 2024

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

After deleting the first column of the formula result selection, undo is displayed. After undo, it is displayed as a value but not as a formula.
2024_6_3 11_34_02 video.webm

@Dushusir Dushusir added qa:untested This PR is ready to be tested and removed qa:rejected labels Jun 3, 2024
@univer-bot
Copy link

univer-bot bot commented Jun 3, 2024

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

Origin Title: fix(formula): reverse undo range list

Title: fix(formula): reverse undo range list


如何测试?
输入公式 =SUM(1) 后,按Enter光标移动到下方,或者 Tab 后光标移动到右侧。原先是跳了2格。

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).

@zhaolixin7
Copy link

@Dushusir 1、删除引用值然后进入编辑后退出,使用undo快捷键 表现:会进入编辑态
2、删除引用之后undo,表现:公式结果显示#ref。预期正确显示公式结果
2024_6_4 15_17_53 commands.json
2024_6_4 15_17_53 video.webm

@univer-bot
Copy link

univer-bot bot commented Jun 4, 2024

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

@Dushusir 1. Delete the reference value and then enter editing and then exit. Use the undo shortcut key. Performance: you will enter the editing state.
2. After deleting the reference and undo, the performance: the formula result displays #ref. Formula results are displayed correctly as expected
2024_6_4 15_17_53 commands.json
2024_6_4 15_17_53 video.webm

@univer-bot univer-bot bot removed the qa:untested This PR is ready to be tested label Jun 4, 2024
@Dushusir Dushusir force-pushed the dushusir/formula-bug0601 branch 2 times, most recently from 38be7d8 to 346d15b Compare June 6, 2024 02:23
@Dushusir Dushusir added the qa:untested This PR is ready to be tested label Jun 6, 2024
@univer-bot univer-bot bot removed the qa:rejected label Jun 6, 2024
@Dushusir
Copy link
Member Author

Dushusir commented Jun 6, 2024

@Dushusir 1、删除引用值然后进入编辑后退出,使用undo快捷键 表现:会进入编辑态 2、删除引用之后undo,表现:公式结果显示#ref。预期正确显示公式结果 2024_6_4 15_17_53 commands.json 2024_6_4 15_17_53 video.webm

  1. dev下, 编辑单元格保存后,再撤销,也会出现进入编辑的情况,待主分支修复后复测
  2. 已修复

@univer-bot
Copy link

univer-bot bot commented Jun 6, 2024

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

@Dushusir 1. Delete the reference value and then enter editing and then exit. Use the undo shortcut key. Performance: you will enter the editing state. 2. After deleting the reference, undo, performance: the formula result displays #ref. Formula results are displayed correctly as expected 2024_6_4 15_17_53 commands.json [2024_6_4 15_17_53 video.webm](https://github .com/dream-num/univer/assets/154207126/28776b03-a065-44aa-b531-dd3c04f62d42)

  1. Under dev, after saving the edited cell and then undoing it, `Enter Editing' will also appear. Retest after the main branch is repaired.
  2. Fixed

@univer-bot
Copy link

univer-bot bot commented Jun 14, 2024

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

@Dushusir The calculation result of deleting the yi reference value is wrong
2024_6_14 11_24_53 video.webm

@univer-bot univer-bot bot removed the qa:untested This PR is ready to be tested label Jun 14, 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 Jun 14, 2024
@univer-bot univer-bot bot removed the qa:rejected label Jun 14, 2024
@Dushusir Dushusir merged commit b6ef910 into dev Jun 15, 2024
9 checks passed
@Dushusir Dushusir deleted the dushusir/formula-bug0601 branch June 15, 2024 07:36
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
3 participants