Fix drawer destroy (ElemeFE#20715)

* Drawer: fix destroyOnClose bug
abigail-0111 · Dec 21, 2021 · d0a0788 · d0a0788
1 parent 5c4767f
commit d0a0788
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/packages/drawer/src/main.vue b/packages/drawer/src/main.vue
@@ -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();

diff --git a/test/unit/specs/drawer.spec.js b/test/unit/specs/drawer.spec.js
@@ -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: `