From e450e9272f558bbfb70068fe052211a7ccb5fe94 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 10 Nov 2018 22:27:12 +0800 Subject: [PATCH] feat: progress status add `normal` type #254 --- components/progress/index.en-US.md | 2 +- components/progress/index.zh-CN.md | 2 +- components/progress/progress.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/progress/index.en-US.md b/components/progress/index.en-US.md index b73dd67a3..243a18bff 100644 --- a/components/progress/index.en-US.md +++ b/components/progress/index.en-US.md @@ -7,7 +7,7 @@ | gapPosition `(type=circle)` | the gap position, options: `top` `bottom` `left` `right` | string | `top` | | percent | to set the completion percentage | number | 0 | | showInfo | whether to display the progress value and the status icon | boolean | true | -| status | to set the status of the Progress, options: `success` `exception` `active` | string | - | +| status | to set the status of the Progress, options: `normal` `success` `exception` `active` | string | `normal` | | strokeWidth `(type=line)` | to set the width of the progress bar, unit: `px` | number | 10 | | strokeWidth `(type=circle)` | to set the width of the circular progress bar, unit: percentage of the canvas width | number | 6 | | strokeLinecap | to set the style of the progress linecap | Enum{ 'round', 'square' } | `round` | diff --git a/components/progress/index.zh-CN.md b/components/progress/index.zh-CN.md index 804d67b66..d70ef5a0d 100644 --- a/components/progress/index.zh-CN.md +++ b/components/progress/index.zh-CN.md @@ -7,7 +7,7 @@ | gapPosition `(type=circle)` | 圆形进度条缺口位置 | Enum{ 'top', 'bottom', 'left', 'right' } | `top` | | percent | 百分比 | number | 0 | | showInfo | 是否显示进度数值或状态图标 | boolean | true | -| status | 状态,可选:`success` `exception` `active` | string | - | +| status | 状态,可选:`normal` `success` `exception` `active` | string | `normal` | | strokeWidth `(type=line)` | 进度条线的宽度,单位 px | number | 10 | | strokeWidth `(type=circle)` | 圆形进度条线的宽度,单位是进度条画布宽度的百分比 | number | 6 | | strokeLinecap | | Enum{ 'round', 'square' } | `round` | diff --git a/components/progress/progress.jsx b/components/progress/progress.jsx index de0b218d3..df11a1e51 100644 --- a/components/progress/progress.jsx +++ b/components/progress/progress.jsx @@ -23,7 +23,7 @@ export const ProgressProps = { percent: PropTypes.number, successPercent: PropTypes.number, format: PropTypes.func, - status: PropTypes.oneOf(['success', 'active', 'exception']), + status: PropTypes.oneOf(['normal', 'success', 'active', 'exception']), showInfo: PropTypes.bool, strokeWidth: PropTypes.number, strokeLinecap: PropTypes.oneOf(['round', 'square']),