diff --git a/src/goods-action-button/index.js b/src/goods-action-button/index.js index 88d769785..764cbeee7 100644 --- a/src/goods-action-button/index.js +++ b/src/goods-action-button/index.js @@ -12,6 +12,7 @@ export default createComponent({ ...routeProps, type: String, text: String, + icon: String, color: String, loading: Boolean, disabled: Boolean, @@ -49,6 +50,7 @@ export default createComponent({ square size="large" type={this.type} + icon={this.icon} color={this.color} loading={this.loading} disabled={this.disabled} diff --git a/src/goods-action-button/index.less b/src/goods-action-button/index.less index dee599830..1bcc97fa3 100644 --- a/src/goods-action-button/index.less +++ b/src/goods-action-button/index.less @@ -5,7 +5,7 @@ height: @goods-action-button-height; font-weight: @font-weight-bold; font-size: @font-size-md; - line-height: normal; + line-height: @goods-action-button-height; border: none; &--first { diff --git a/src/goods-action/README.md b/src/goods-action/README.md index bc017f0ff..56ae772b6 100644 --- a/src/goods-action/README.md +++ b/src/goods-action/README.md @@ -104,6 +104,7 @@ Use `info` prop to show badge in icon | text | Button text | *string* | - | | type | Button type, Can be set to `primary` `info` `warning` `danger` | *string* | `default` | | color `v2.1.8` | Button color, support linear-gradient | *string* | - | +| icon `2.4.4` | Left Icon | *string* | - | | primary | Is primary button (red color) | *boolean* | `false` | | disabled | Whether to disable button | *boolean* | `false` | | loading | Whether show loading status | *boolean* | `false` | diff --git a/src/goods-action/README.zh-CN.md b/src/goods-action/README.zh-CN.md index 9362eeb8a..ab08c8f72 100644 --- a/src/goods-action/README.zh-CN.md +++ b/src/goods-action/README.zh-CN.md @@ -108,6 +108,7 @@ export default { | text | 按钮文字 | *string* | - | | type | 按钮类型,可选值为 `primary` `info` `warning` `danger` | *string* | `default` | | color `v2.1.8` | 按钮颜色,支持传入`linear-gradient`渐变色 | *string* | - | +| icon `2.4.4` | 左侧图标名称或图片链接,可选值见 [Icon 组件](#/zh-CN/icon) | *string* | - | | disabled | 是否禁用按钮 | *boolean* | `false` | - | | loading | 是否显示为加载状态 | *boolean* | `false` | - | | url | 点击后跳转的链接地址 | *string* | - |