From 5e623c1e349c211f55e9d1650d299878e6a4e6c4 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 11 Jan 2019 21:22:41 +0800
Subject: [PATCH] [improvement] Dialog: enable lazy-render (#2495)

---
 packages/address-edit/test/index.spec.js | 2 ++
 packages/contact-card/test/index.spec.js | 2 ++
 packages/dialog/Dialog.vue               | 1 +
 packages/dialog/demo/index.vue           | 1 +
 packages/dialog/test/index.spec.js       | 4 +++-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/address-edit/test/index.spec.js b/packages/address-edit/test/index.spec.js
index d40656d2e..a8942bf96 100644
--- a/packages/address-edit/test/index.spec.js
+++ b/packages/address-edit/test/index.spec.js
@@ -218,6 +218,8 @@ test('delete address', async () => {
 
   const deleteButton = wrapper.findAll('.van-button').at(1);
   deleteButton.trigger('click');
+
+  await later();
   document.querySelector('.van-dialog__cancel').click();
   deleteButton.trigger('click');
   document.querySelector('.van-dialog__confirm').click();
diff --git a/packages/contact-card/test/index.spec.js b/packages/contact-card/test/index.spec.js
index 97899e949..15f167f29 100644
--- a/packages/contact-card/test/index.spec.js
+++ b/packages/contact-card/test/index.spec.js
@@ -95,6 +95,8 @@ describe('ContactEdit', () => {
 
     const deleteButton = wrapper.findAll('.van-button').at(1);
     deleteButton.trigger('click');
+
+    await later();
     document.querySelector('.van-dialog__confirm').click();
 
     await later();
diff --git a/packages/dialog/Dialog.vue b/packages/dialog/Dialog.vue
index b3dbe6061..9f8b6c58a 100644
--- a/packages/dialog/Dialog.vue
+++ b/packages/dialog/Dialog.vue
@@ -1,6 +1,7 @@
 <template>
   <transition name="van-dialog-bounce">
     <div
+      v-if="shouldRender"
       v-show="value"
       :class="[b(), className]"
     >
diff --git a/packages/dialog/demo/index.vue b/packages/dialog/demo/index.vue
index e167b08a1..8283fd2db 100644
--- a/packages/dialog/demo/index.vue
+++ b/packages/dialog/demo/index.vue
@@ -38,6 +38,7 @@
       <van-dialog
         v-model="show"
         show-cancel-button
+        :lazy-render="false"
         :before-close="beforeClose"
       >
         <van-field
diff --git a/packages/dialog/test/index.spec.js b/packages/dialog/test/index.spec.js
index 00a302da0..b6d1cc1ba 100644
--- a/packages/dialog/test/index.spec.js
+++ b/packages/dialog/test/index.spec.js
@@ -9,10 +9,11 @@ test('Dialog function call', async () => {
   Dialog.close();
   Dialog.alert('1');
 
+  await later();
+
   const callback = jest.fn();
   const dialog = document.querySelector('.van-dialog');
 
-  await later();
   expect(dialog.style.display).toEqual('');
   Dialog.close();
 
@@ -33,6 +34,7 @@ test('Dialog function call', async () => {
 test('before close', () => {
   const wrapper = mount(DialogVue, {
     propsData: {
+      value: true,
       beforeClose: (action, done) => done(false)
     }
   });