Merge branch 'dev' into next

2020-09-05 07:17:49 +08:00
parent 71bae3fcb4 d0eb103cba
commit f19386fe1f
82 changed files with 264 additions and 228 deletions
@@ -105,7 +105,7 @@ Use `badge` 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_ | - |
+| color | Button color, support linear-gradient | _string_ | - |
 | icon `v2.4.4` | Left Icon | _string_ | - |
 | primary | Is primary button (red color) | _boolean_ | `false` |
 | disabled | Whether to disable button | _boolean_ | `false` |
@@ -109,7 +109,7 @@ export default {
 | --- | --- | --- | --- |
 | text | 按钮文字 | _string_ | - |
 | type | 按钮类型，可选值为 `primary` `info` `warning` `danger` | _string_ | `default` |
-| color `v2.1.8` | 按钮颜色，支持传入`linear-gradient`渐变色 | _string_ | - |
+| color | 按钮颜色，支持传入`linear-gradient`渐变色 | _string_ | - |
 | icon `v2.4.4` | 左侧[图标名称](#/zh-CN/icon)或图片链接 | _string_ | - |
 | disabled | 是否禁用按钮 | _boolean_ | `false` | - |
 | loading | 是否显示为加载状态 | _boolean_ | `false` | - |