[improvement] Dialog: support line wrap (#725)

This commit is contained in:
neverland 2018-10-10 11:24:41 +08:00 committed by GitHub
parent 45a1cd669c
commit 1d48bb308e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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' : '' }}">