From 7a0de4d6bd893141e5fd84c9c873bcb1981e5b59 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 3 Dec 2018 16:45:22 +0800
Subject: [PATCH] [improvement] Dialog: optimize transition prop (#1000)

---
 packages/dialog/README.md  | 4 ++--
 packages/dialog/dialog.ts  | 6 +++---
 packages/dialog/index.ts   | 4 ++--
 packages/dialog/index.wxml | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/dialog/README.md b/packages/dialog/README.md
index da91d7a9..0b808f44 100644
--- a/packages/dialog/README.md
+++ b/packages/dialog/README.md
@@ -138,7 +138,7 @@ Page({
 | closeOnClickOverlay | 点击蒙层时是否关闭弹窗 | `Boolean` | `false` |
 | asyncClose | 是否异步关闭弹窗，开启后需要手动控制弹窗的关闭 | `Boolean` | `false` |
 | context | 选择器的选择范围，可以传入自定义组件的 this 作为上下文 | `Object` | 当前页面 |
-| transition | 是否开启进场动画 | `Boolean` | `true` |
+| transition | 动画名称，可选值为`fade` | `String` | `scale` |
 
 ### API
 
@@ -159,7 +159,7 @@ Page({
 | close-on-click-overlay | 点击蒙层时是否关闭弹窗 | `Boolean` | `false` |
 | use-slot | 是否使用自定义内容的插槽 | `Boolean` | `false` |
 | async-close | 是否异步关闭弹窗，开启后需要手动控制弹窗的关闭 | `Boolean` | `false` |
-| transition | 是否开启进场动画 | `Boolean` | `true` |
+| transition | 动画名称，可选值为`fade` | `String` | `scale` |
 
 ### Event
 
diff --git a/packages/dialog/dialog.ts b/packages/dialog/dialog.ts
index 997e141d..149e29e0 100644
--- a/packages/dialog/dialog.ts
+++ b/packages/dialog/dialog.ts
@@ -9,6 +9,7 @@ type DialogOptions = {
   message?: string;
   overlay?: boolean;
   selector?: string;
+  transition?: string;
   asyncClose?: boolean;
   confirmButtonText?: string;
   cancelButtonText?: string;
@@ -16,7 +17,6 @@ type DialogOptions = {
   showCancelButton?: boolean;
   closeOnClickOverlay?: boolean;
   confirmButtonOpenType?: string;
-  transition?: boolean;
 }
 
 interface Dialog {
@@ -68,14 +68,14 @@ Dialog.defaultOptions = {
   zIndex: 100,
   overlay: true,
   asyncClose: false,
+  transition: 'scale',
   selector: '#van-dialog',
   confirmButtonText: '确认',
   cancelButtonText: '取消',
   showConfirmButton: true,
   showCancelButton: false,
   closeOnClickOverlay: false,
-  confirmButtonOpenType: '',
-  transition: true
+  confirmButtonOpenType: ''
 };
 
 Dialog.alert = Dialog;
diff --git a/packages/dialog/index.ts b/packages/dialog/index.ts
index 8d3c13fb..01f34f38 100644
--- a/packages/dialog/index.ts
+++ b/packages/dialog/index.ts
@@ -34,8 +34,8 @@ VantComponent({
       value: true
     },
     transition: {
-      type: Boolean,
-      value: true
+      type: String,
+      value: 'scale'
     }
   },
 
diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
index c36c513d..71edae7a 100644
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@@ -1,9 +1,9 @@
 <van-popup
   show="{{ show }}"
-  transition="{{ transition ? 'scale' : '' }}"
   z-index="{{ zIndex }}"
   overlay="{{ overlay }}"
   custom-class="van-dialog"
+  transition="{{ transition }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   bind:close="onClickOverlay"
 >