From 1d48bb308e01aaa0d18ad33018d08ebc8f6697bb Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 10 Oct 2018 11:24:41 +0800
Subject: [PATCH] [improvement] Dialog: support line wrap (#725)
---
example/pages/dialog/index.wxml | 8 ++++----
packages/dialog/index.wxml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/example/pages/dialog/index.wxml b/example/pages/dialog/index.wxml
index 26fa3f80..5590ad79 100644
--- a/example/pages/dialog/index.wxml
+++ b/example/pages/dialog/index.wxml
@@ -1,14 +1,14 @@
<demo-block title="消息提示" padding>
- <van-button bind:click="onClickAlert" custom-class="demo-margin-right">Alert</van-button>
- <van-button bind:click="onClickAlert2">无标题 Alert</van-button>
+ <van-button type="primary" plain bind:click="onClickAlert" custom-class="demo-margin-right">消息提示</van-button>
+ <van-button type="primary" plain bind:click="onClickAlert2">无标题提示</van-button>
</demo-block>
<demo-block title="消息确认" padding>
- <van-button bind:click="onClickConfirm">Confirm</van-button>
+ <van-button type="primary" plain bind:click="onClickConfirm">消息确认</van-button>
</demo-block>
<demo-block title="组件调用" padding>
- <van-button bind:click="showCustomDialog">组件调用</van-button>
+ <van-button type="danger" plain bind:click="showCustomDialog">组件调用</van-button>
<van-dialog
use-slot
async-close
diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
index 46dc8f0d..e59a0c8b 100644
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@@ -13,7 +13,7 @@
<view class="van-dialog__content" wx:if="{{ message || useSlot }}">
<slot wx:if="{{ useSlot }}" />
<view wx:elif="{{ message }}" class="van-dialog__message {{ title ? 'van-dialog__message--has-title' : '' }}">
- {{ message }}
+ <text>{{ message }}</text>
</view>
</view>
<view class="van-hairline--top van-dialog__footer {{ showCancelButton && showConfirmButton ? 'van-dialog__footer--buttons' : '' }}">