From ccb1d064370b5d86458a68ea374fc7d716315dff Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 14 Aug 2018 20:42:57 +0800 Subject: [PATCH] [Improvement] Button: add square prop (#427) --- packages/button/README.md | 1 + packages/button/index.js | 7 ++++++- packages/button/index.pcss | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/button/README.md b/packages/button/README.md index 273fce1b..b9449ecf 100644 --- a/packages/button/README.md +++ b/packages/button/README.md @@ -63,6 +63,7 @@ | disabled | 是否禁用 | `Boolean` | `false` | | loading | 是否显示为加载状态 | `Boolean` | `false` | | block | 是否为块级元素 | `Boolean` | `false` | +| square | 是否为方形按钮 | `Boolean` | `false` | | open-type | 微信开放能力 | `String` | - | | app-parameter | 打开 APP 时,向 APP 传递的参数 | `String` | - | | hover-start-time | 按住后多久出现点击态,单位毫秒 | `Number` | 20 | diff --git a/packages/button/index.js b/packages/button/index.js index 84f08639..5bbc0e18 100644 --- a/packages/button/index.js +++ b/packages/button/index.js @@ -36,6 +36,10 @@ Component({ block: { type: Boolean, observer + }, + square: { + type: Boolean, + observer } }, @@ -51,11 +55,12 @@ Component({ }, setClasses() { - const { type, size, plain, disabled, loading, block } = this.data; + const { type, size, plain, disabled, loading, square, block } = this.data; this.setData({ classes: classnames(`van-button--${type}`, `van-button--${size}`, { 'van-button--block': block, 'van-button--plain': plain, + 'van-button--square': square, 'van-button--loading': loading, 'van-button--disabled': disabled, 'van-button--unclickable': disabled || loading diff --git a/packages/button/index.pcss b/packages/button/index.pcss index 2d834d70..c0c0eac6 100644 --- a/packages/button/index.pcss +++ b/packages/button/index.pcss @@ -124,6 +124,10 @@ display: block; } + &--square { + border-radius: 0; + } + &--disabled { color: $button-disabled-color; background-color: $button-disabled-background-color;