-
Notifications
You must be signed in to change notification settings - Fork 353
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
Fix0817 #2708
Merged
Merged
Fix0817 #2708
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
这个修复不太合适 问题描述应该是组件本身的问题 |
已修改重新发起合并请求,请查阅~ |
xiaosansiji
approved these changes
Aug 31, 2023
Merged
chaishi
added a commit
that referenced
this pull request
Sep 22, 2023
* fix(table): tree.defaultExpandAll (#2752) * Fix0817 (#2708) * fix: 弹窗组件如果初始默认显示, 按esc关不掉问题修复 (#2608) * fix: 弹窗组件如果初始默认显示, 按esc关不掉问题修复 (#2608) * fix: 弹窗组件如果初始默认显示, 按esc关不掉问题修复 (#2608) * fix: 弹窗组件如果初始默认显示, 按esc关不掉问题修复 (#2608) * fix: 弹窗组件如果初始默认显示, 按esc关不掉问题修复 (#2608) * fix(checkbox): multitple checkbox-group exist at the page (#2768) * fix(checkbox): multitple checkboxgroup * fix(table): unique key * feat(table): fix resetValue does not work on clear filter; * fix(form): fix reset form error (#2760) Co-authored-by: zhangjiancheng <zhangjiancheng@aibaoxian.com> * feat(table): fix false value can not highlight filter icon; support filter.label (#2771) * fix(table): support filter value which is false can highlight filter icon * feat(table): support filter.label * docs(table): update demove * fix(table): title is a function * fix: lint error * fix(image): dulplicate preview icon (#2770) * fix(image): dulplicate preview icon * fix(image): fix preview url * fix(table): lint error * test: update snapshots * feat(dialog): confirmLoading (#2769) * feat(dialog): confirmLoading * test: update snapshots * fix(popup): clear queued open action caused by accident (#2747) * Revert "fix(popup): clear queued open action caused by accident (#2747)" (#2775) This reverts commit e1a1f95. * fix: fix bundle content (#2776) * fix: fix remove listener hook (#2777) * fix(loading): fix loading false create instance again (#2778) * fix(Select): fix delete exist option when delete input value (#2779) * feat: release 1.6.5 (#2774) * feat: release 1.6.5 * chore: changelog's changes --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * fix(checkbox): group dynamic (#2793) * fix(table): multiple editable table (#2787) * fix(table): multiple editable table * docs(dialog): demo * chore: release 1.6.6 (#2795) * chore: 1.6.6 * chore: changelog's changes --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * feat(treeselect): support panel content API (#2797) * fix: useResizeObserver (#2806) * chore: update README (#2808) * feat(table): support group columns (#2810) * feat(table): column controller * test(table): update snapshots * fix(table): props.locale * fix: lint error * fix: lint error * fix(dialog): Dialog component support confirmLoading (#2814) * fix(dialog): confirmLoading * docs(dialog): remove docs * feat(card): replace title span with div (#2812) * feat(card): replace title span with div * feat(card): replace title span with div * chore: release 1.6.7 (#2817) * chore: release 1.6.7 * chore: changelog's changes --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * chore: release 1.6.7-naruto * chore: release 1.6.7-naruto --------- Co-authored-by: sheepluo <yaoyanhuoyi@qq.com> Co-authored-by: Zhanjiachun <49758402+Zhanjiachun@users.noreply.github.com> Co-authored-by: Zz-ZzzZ <48228016+Zz-ZzzZ@users.noreply.github.com> Co-authored-by: zhangjiancheng <zhangjiancheng@aibaoxian.com> Co-authored-by: ikeq <ikeq@foxmail.com> Co-authored-by: azhe <xiaosansiji@gmail.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
弹窗组件如果初始默认显示, 按esc关不掉问题修复
🤔 这个 PR 的性质是?
🔗 相关 Issue
#2608
💡 需求背景和解决方案
问题:[Dialog] 弹窗组件如果初始默认显示,按esc关不掉 。
解决方案:组件代码里面存在两个问题:1、还没渲染完成就调用this.storeUid(value),导致dialog传入value都为0,需要将该函数等渲染后再调用,才能拿到组件的uid;2、封装的stack函数,老的逻辑是当有dialog默认值为true就一定走push(),当dialog默认值为false就会一定走pop(),这两个都是共用一个data数据,导致data里面的true的dialog都被其他不相干的false的dialog给pop()掉了,这就导致了按ESC没有反应,因为默认true的数据都是空的。所以就要给pop加一个限制,当data不为空时,只有data对应的dialog才有权限去pop();
📝 更新日志
fix(Dialog): 修复弹窗组件如果初始默认显示,按ESC无法关闭的问题
☑️ 请求合并前的自查清单