Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
e1990a70
Commit
e1990a70
authored
Jun 07, 2021
by
zj9495
Committed by
GitHub
Jun 07, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix drawer destroy (#20715)
* Drawer: fix destroyOnClose bug
parent
4ed7ac67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
1 deletion
+30
-1
packages/drawer/src/main.vue
packages/drawer/src/main.vue
+6
-1
test/unit/specs/drawer.spec.js
test/unit/specs/drawer.spec.js
+24
-0
No files found.
packages/drawer/src/main.vue
View file @
e1990a70
...
...
@@ -136,7 +136,12 @@ export default {
}
this
.
prevActiveElement
=
document
.
activeElement
;
}
else
{
if
(
!
this
.
closed
)
this
.
$emit
(
'
close
'
);
if
(
!
this
.
closed
)
{
this
.
$emit
(
'
close
'
);
if
(
this
.
destroyOnClose
===
true
)
{
this
.
rendered
=
false
;
}
}
this
.
$nextTick
(()
=>
{
if
(
this
.
prevActiveElement
)
{
this
.
prevActiveElement
.
focus
();
...
...
test/unit/specs/drawer.spec.js
View file @
e1990a70
...
...
@@ -132,6 +132,30 @@ describe('Drawer', () => {
expect
(
vm
.
$el
.
querySelector
(
'
.el-drawer__body
'
)).
not
.
to
.
exist
;
});
it
(
'
should destroy every child by visible change when destroy-on-close flag is true
'
,
async
()
=>
{
vm
=
createVue
({
template
:
`
<el-drawer :title='title' :visible='visible' :append-to-body='true' :destroy-on-close='true' ref='drawer'>
<span>
${
content
}
</span>
</el-drawer>
`
,
data
()
{
return
{
title
,
visible
:
true
};
}
});
await
waitImmediate
();
expect
(
vm
.
$el
.
querySelector
(
'
.el-drawer__body span
'
).
textContent
).
to
.
equal
(
content
);
vm
.
visible
=
false
;
await
wait
(
400
);
expect
(
vm
.
$el
.
querySelector
(
'
.el-drawer__body
'
)).
not
.
to
.
exist
;
});
it
(
'
should close dialog by clicking the close button
'
,
async
()
=>
{
vm
=
createVue
({
template
:
`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment