From 5a6526922f24fa5aa6a424360b81db7c41fd753b Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 30 Jul 2019 15:54:28 +0800
Subject: [PATCH] [new feature] Dialog: add new prop custom-style

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

diff --git a/packages/dialog/README.md b/packages/dialog/README.md
index 566bb268..3db11d37 100644
--- a/packages/dialog/README.md
+++ b/packages/dialog/README.md
@@ -134,7 +134,8 @@ Page({
 | message | 内容 | `String` | - |
 | messageAlign | 内容对齐方式，可选值为`left` `right` | `String` | `center` |
 | zIndex | z-index 层级 | `Number` | `100` |
-| className | 自定义类名 | `String` | '' |
+| className | 自定义类名，dialog在自定义组件内时无效 | `String` | '' |
+| customStyle | 自定义样式 | `String` | '' |
 | selector | 自定义选择器 | `String` | `van-dialog` |
 | showConfirmButton | 是否展示确认按钮 | `Boolean` | `true` |
 | showCancelButton | 是否展示取消按钮 | `Boolean` | `false` |
@@ -171,7 +172,8 @@ Page({
 | message | 内容 | `String` | - |
 | message-align | 内容对齐方式，可选值为`left` `right` | `String` | `center` |
 | z-index | z-index 层级 | `Number` | `100` |
-| class-name | 自定义类名 | `String` | '' |
+| class-name | 自定义类名，dialog在自定义组件内时无效 | `String` | '' |
+| customStyle | 自定义样式 | `String` | '' |
 | show-confirm-button | 是否展示确认按钮 | `Boolean` |  `true` |
 | show-cancel-button | 是否展示取消按钮 | `Boolean` |  `false` |
 | confirm-button-text | 确认按钮的文案 | `String` |  `确认` |
diff --git a/packages/dialog/dialog.ts b/packages/dialog/dialog.ts
index bec3b6be..17cc1fa8 100644
--- a/packages/dialog/dialog.ts
+++ b/packages/dialog/dialog.ts
@@ -12,6 +12,7 @@ type DialogOptions = {
   selector?: string;
   ariaLabel?: string;
   className?: string;
+  customStyle?: string;
   transition?: string;
   asyncClose?: boolean;
   businessId?: number;
@@ -79,6 +80,7 @@ Dialog.defaultOptions = {
   zIndex: 100,
   overlay: true,
   className: '',
+  customStyle: '',
   asyncClose: false,
   messageAlign: '',
   transition: 'scale',
diff --git a/packages/dialog/index.ts b/packages/dialog/index.ts
index 4faaf91e..834cbe67 100644
--- a/packages/dialog/index.ts
+++ b/packages/dialog/index.ts
@@ -13,6 +13,7 @@ VantComponent({
     message: String,
     useSlot: Boolean,
     className: String,
+    customStyle: String,
     asyncClose: Boolean,
     messageAlign: String,
     showCancelButton: Boolean,
diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
index 6c9dac42..13a77d16 100644
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@@ -4,6 +4,7 @@
   overlay="{{ overlay }}"
   custom-class="van-dialog {{ className }}"
   transition="{{ transition }}"
+  custom-style="{{ customStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   bind:close="onClickOverlay"
 >