From 1ab44ea05537b67e19bba5d9feb0c987fd3c47d8 Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 14 Apr 2017 17:36:24 +0800
Subject: [PATCH] dialog fix

---
 docs/examples-docs/dialog.md      | 17 +++++++++++++++++
 packages/dialog/src/dialog.js     |  4 ++++
 packages/dialog/src/dialog.vue    |  2 +-
 packages/toast/src/toast.vue      |  7 +------
 packages/zanui-css/src/dialog.css |  5 +++++
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/docs/examples-docs/dialog.md b/docs/examples-docs/dialog.md
index a899befdd..4e383a4b0 100644
--- a/docs/examples-docs/dialog.md
+++ b/docs/examples-docs/dialog.md
@@ -25,6 +25,14 @@ export default {
       });
     },
 
+    handleAlert2Click() {
+      Dialog.alert({
+        message: '无标题alert'
+      }).then((action) => {
+        console.log(action);
+      });
+    },
+
     handleConfirmClick() {
       Dialog.confirm({
         title: 'confirm标题',
@@ -58,6 +66,7 @@ import { Dialog } from '@youzan/zanui-vue';
 :::demo 消息提示
 ```html
 <zan-button @click="handleAlertClick">alert</zan-button>
+<zan-button @click="handleAlert2Click">无标题alert</zan-button>
 
 <script>
 export default {
@@ -69,6 +78,14 @@ export default {
       }).then((action) => {
         console.log(action);
       });
+    },
+
+    handleAlert2Click() {
+      Dialog.alert({
+        message: '弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。'
+      }).then((action) => {
+        console.log(action);
+      });
     }
   }
 };
diff --git a/packages/dialog/src/dialog.js b/packages/dialog/src/dialog.js
index 5c13346cd..7f1e1abbf 100644
--- a/packages/dialog/src/dialog.js
+++ b/packages/dialog/src/dialog.js
@@ -76,6 +76,8 @@ var DialogBox = options => {
 DialogBox.alert = function(options) {
   return DialogBox(merge({
     type: 'alert',
+    title: '',
+    message: '',
     closeOnClickOverlay: false,
     showCancelButton: false
   }, options));
@@ -84,6 +86,8 @@ DialogBox.alert = function(options) {
 DialogBox.confirm = function(options) {
   return DialogBox(merge({
     type: 'confirm',
+    title: '',
+    message: '',
     closeOnClickOverlay: true,
     showCancelButton: true
   }, options));
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index 47b8f1cbb..d8bb490c5 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -6,7 +6,7 @@
           <div class="zan-dialog__title" v-text="title"></div>
         </div>
         <div class="zan-dialog__content" v-if="message">
-          <div class="zan-dialog__message" v-html="message"></div>
+          <div class="zan-dialog__message" :class="{ 'zan-dialog__message--notitle': !title }" v-html="message"></div>
         </div>
         <div class="zan-dialog__footer" :class="{ 'is-twobtn': showCancelButton && showConfirmButton }">
           <button class="zan-dialog__btn zan-dialog__cancel" v-show="showCancelButton" @click="handleAction('cancel')">{{ cancelButtonText }}</button>
diff --git a/packages/toast/src/toast.vue b/packages/toast/src/toast.vue
index 3ffe32bea..535dc60e7 100644
--- a/packages/toast/src/toast.vue
+++ b/packages/toast/src/toast.vue
@@ -56,12 +56,7 @@ export default {
     },
     message: {
       type: String,
-      default: '',
-      validator(value) {
-        if (this.type === 'success' || this.type === 'fail') {
-          return value.length <= 16;
-        }
-      }
+      default: ''
     },
     forbidClick: {
       type: Boolean,
diff --git a/packages/zanui-css/src/dialog.css b/packages/zanui-css/src/dialog.css
index 41fbddc48..e842e3c96 100644
--- a/packages/zanui-css/src/dialog.css
+++ b/packages/zanui-css/src/dialog.css
@@ -46,6 +46,11 @@
       margin: 0;
       font-size: 14px;
       line-height: 1.5;
+
+      @m notitle {
+        color: #333;
+        font-size: 16px;
+      }
     }
 
     @e footer {