From 47a606416aad2512d215d8d5332fcc2314b219f3 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 6 Sep 2018 17:01:59 +0800 Subject: [PATCH] [improvement] Dialog: support confirm button open type (#518) --- dist/dialog/dialog.js | 3 ++- dist/dialog/index.js | 1 + dist/dialog/index.wxml | 1 + packages/dialog/README.md | 4 +++- packages/dialog/dialog.js | 3 ++- packages/dialog/index.js | 1 + packages/dialog/index.wxml | 1 + 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dist/dialog/dialog.js b/dist/dialog/dialog.js index c47f1c32..0473445c 100644 --- a/dist/dialog/dialog.js +++ b/dist/dialog/dialog.js @@ -30,7 +30,8 @@ Dialog.defaultOptions = { cancelButtonText: '取消', showConfirmButton: true, showCancelButton: false, - closeOnClickOverlay: false + closeOnClickOverlay: false, + confirmButtonOpenType: '' }; Dialog.alert = options => diff --git a/dist/dialog/index.js b/dist/dialog/index.js index cda31a55..e6696ffd 100644 --- a/dist/dialog/index.js +++ b/dist/dialog/index.js @@ -9,6 +9,7 @@ Component({ useSlot: Boolean, asyncClose: Boolean, showCancelButton: Boolean, + confirmButtonOpenType: String, show: { type: Boolean, observer(show) { diff --git a/dist/dialog/index.wxml b/dist/dialog/index.wxml index 09d6fead..0ee61035 100644 --- a/dist/dialog/index.wxml +++ b/dist/dialog/index.wxml @@ -33,6 +33,7 @@ size="large" loading="{{ loading.confirm }}" custom-class="van-dialog__confirm" + open-type="{{ confirmButtonOpenType }}" bind:click="onConfirm" > {{ confirmButtonText }} diff --git a/packages/dialog/README.md b/packages/dialog/README.md index 23e40c64..546629a7 100644 --- a/packages/dialog/README.md +++ b/packages/dialog/README.md @@ -129,9 +129,10 @@ Page({ | showCancelButton | 是否展示取消按钮 | `Boolean` | `false` | | confirmButtonText | 确认按钮的文案 | `String` | `确认` | | cancelButtonText | 取消按钮的文案 | `String` | `取消` | +| confirmButtonOpenType | 确认按钮的微信开放能力,具体支持可参考 [微信官方文档](https://mp.weixin.qq.com/debug/wxadoc/dev/component/button.html) | `String` | - | | overlay | 是否展示蒙层 | `Boolean` | `true` | | closeOnClickOverlay | 点击蒙层时是否关闭弹窗 | `Boolean` | `false` | -| async-close | 是否异步关闭弹窗,开启后需要手动控制弹窗的关闭 | `Boolean` | `false` | +| asyncClose | 是否异步关闭弹窗,开启后需要手动控制弹窗的关闭 | `Boolean` | `false` | ### API @@ -146,6 +147,7 @@ Page({ | show-cancel-button | 是否展示取消按钮 | `Boolean` | `false` | | confirm-button-text | 确认按钮的文案 | `String` | `确认` | | cancel-button-text | 取消按钮的文案 | `String` | `取消` | +| confirm-button-open-type | 确认按钮的微信开放能力,具体支持可参考 [微信官方文档](https://mp.weixin.qq.com/debug/wxadoc/dev/component/button.html) | `String` | - | | overlay | 是否展示蒙层 | `Boolean` | `true` | | close-on-click-overlay | 点击蒙层时是否关闭弹窗 | `Boolean` | `false` | | use-slot | 是否使用自定义内容的插槽 | `Boolean` | `false` | diff --git a/packages/dialog/dialog.js b/packages/dialog/dialog.js index c47f1c32..0473445c 100644 --- a/packages/dialog/dialog.js +++ b/packages/dialog/dialog.js @@ -30,7 +30,8 @@ Dialog.defaultOptions = { cancelButtonText: '取消', showConfirmButton: true, showCancelButton: false, - closeOnClickOverlay: false + closeOnClickOverlay: false, + confirmButtonOpenType: '' }; Dialog.alert = options => diff --git a/packages/dialog/index.js b/packages/dialog/index.js index cda31a55..e6696ffd 100644 --- a/packages/dialog/index.js +++ b/packages/dialog/index.js @@ -9,6 +9,7 @@ Component({ useSlot: Boolean, asyncClose: Boolean, showCancelButton: Boolean, + confirmButtonOpenType: String, show: { type: Boolean, observer(show) { diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml index 09d6fead..0ee61035 100644 --- a/packages/dialog/index.wxml +++ b/packages/dialog/index.wxml @@ -33,6 +33,7 @@ size="large" loading="{{ loading.confirm }}" custom-class="van-dialog__confirm" + open-type="{{ confirmButtonOpenType }}" bind:click="onConfirm" > {{ confirmButtonText }}