diff --git a/packages/dialog/Dialog.js b/packages/dialog/Dialog.js index 55061e77b..e42c6307b 100644 --- a/packages/dialog/Dialog.js +++ b/packages/dialog/Dialog.js @@ -14,8 +14,10 @@ export default sfc({ callback: Function, beforeClose: Function, messageAlign: String, - confirmButtonText: String, cancelButtonText: String, + cancelButtonColor: String, + confirmButtonText: String, + confirmButtonColor: String, showCancelButton: Boolean, showConfirmButton: { type: Boolean, @@ -102,6 +104,7 @@ export default sfc({ class={bem('cancel')} loading={this.loading.cancel} text={this.cancelButtonText || t('cancel')} + style={{ color: this.cancelButtonColor }} onClick={() => { this.handleAction('cancel'); }} @@ -113,6 +116,7 @@ export default sfc({ class={[bem('confirm'), { 'van-hairline--left': hasButtons }]} loading={this.loading.confirm} text={this.confirmButtonText || t('confirm')} + style={{ color: this.confirmButtonColor }} onClick={() => { this.handleAction('confirm'); }} diff --git a/packages/dialog/en-US.md b/packages/dialog/en-US.md index 33f307189..5292ea2d0 100644 --- a/packages/dialog/en-US.md +++ b/packages/dialog/en-US.md @@ -121,8 +121,10 @@ export default { | className | Custom className | `String | Array | Object` | - | | showConfirmButton | Whether to show confirm button | `Boolean` | `true` | | showCancelButton | Whether to show cancel button | `Boolean` | `false` | +| cancelButtonText | Cancel button text | `String` | `Cancel` | +| cancelButtonColor | Cancel button color | `String` | `#000` | | confirmButtonText | Confirm button text | `String` | `Confirm` | -| cancelButtonText | Cancel button test | `String` | `Cancel` | +| confirmButtonColor | Confirm button color | `String` | `#1989fa` | | overlay | Whether to show overlay | `Boolean` | `true` | | closeOnClickOverlay | Whether to close when click overlay | `Boolean` | `false` | | lockScroll | Whether to lock body scroll | `Boolean` | `true` | @@ -139,8 +141,10 @@ export default { | message-align | Message align,can be set to `left` `right` | `String` | `center` | | show-confirm-button | Whether to show confirm button | `Boolean` | `true` | | show-cancel-button | Whether to show cancel button | `Boolean` | `false` | -| confirm-button-text | Confirm button text | `String` | `Confirm` | -| cancel-button-text | Cancel button test | `String` | `Cancel` | +| cancel-button-text | Cancel button text | `String` | `Cancel` | +| cancel-button-color | Cancel button color | `String` | `#000` | +| confirm-button-text | Confirm button text | `String` | `Confirm` | +| confirm-button-color | Confirm button color | `String` | `#1989fa` | | overlay | Whether to show overlay | `Boolean` | `true` | | close-on-click-overlay | Whether to close when click overlay | `Boolean` | `false` | | lock-scroll | Whether to lock background scroll | `Boolean` | `true` | diff --git a/packages/dialog/index.js b/packages/dialog/index.js index 623aa081f..1cd6c4547 100644 --- a/packages/dialog/index.js +++ b/packages/dialog/index.js @@ -46,8 +46,10 @@ Dialog.defaultOptions = { beforeClose: null, messageAlign: '', getContainer: 'body', - confirmButtonText: '', cancelButtonText: '', + cancelButtonColor: null, + confirmButtonText: '', + confirmButtonColor: null, showConfirmButton: true, showCancelButton: false, closeOnClickOverlay: false, diff --git a/packages/dialog/test/__snapshots__/index.spec.js.snap b/packages/dialog/test/__snapshots__/index.spec.js.snap new file mode 100644 index 000000000..a033091b4 --- /dev/null +++ b/packages/dialog/test/__snapshots__/index.spec.js.snap @@ -0,0 +1,13 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`button color 1`] = ` +