Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/components/progress/Progress.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ const Progress = forwardRef<HTMLDivElement, ProgressProps>((props, ref) => {
[`${statusClassName}`]: status,
[`${classPrefix}-progress--over-ten`]: percentage > PLUMP_SEPARATE,
[`${classPrefix}-progress--under-ten`]: percentage <= PLUMP_SEPARATE,
[`${classPrefix}-size-s`]: size === 'small',
})}
style={trackStyle}
>
Expand All @@ -238,6 +239,7 @@ const Progress = forwardRef<HTMLDivElement, ProgressProps>((props, ref) => {
ref={ref}
className={classNames(`${classPrefix}-progress--thin`, {
[`${statusClassName}`]: status,
[`${classPrefix}-size-s`]: size === 'small',
})}
>
<div className={`${classPrefix}-progress__bar`} style={trackStyle}>
Expand Down
19 changes: 19 additions & 0 deletions packages/components/progress/_usage/props.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@
"defaultValue": true,
"options": []
},
{
"name": "size",
"type": "enum",
"defaultValue": "medium",
"options": [
{
"label": "small",
"value": "small"
},
{
"label": "medium",
"value": "medium"
},
{
"label": "large",
"value": "large"
}
]
},
{
"name": "theme",
"type": "enum",
Expand Down
9 changes: 8 additions & 1 deletion packages/components/progress/defaultProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,11 @@

import { TdProgressProps } from './type';

export const progressDefaultProps: TdProgressProps = { label: true, percentage: 0, size: 'medium', theme: 'line' };
export const progressDefaultProps: TdProgressProps = {
color: '',
label: true,
percentage: 0,
size: 'medium',
theme: 'line',
trackColor: '',
};
4 changes: 2 additions & 2 deletions packages/components/progress/progress.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ color | String / Object / Array | '' | Typescript: `string \| Array<string> \| R
label | TNode | true | Typescript: `string \| boolean \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
percentage | Number | 0 | \- | N
size | String / Number | 'medium' | \- | N
status | String | - | optionssuccess/error/warning/active。Typescript: `StatusEnum` `type StatusEnum = 'success' \| 'error' \| 'warning' \| 'active'`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/progress/type.ts) | N
status | String | - | options: success/error/warning/active。Typescript: `ProgressStatus` `type ProgressStatus = 'success' \| 'error' \| 'warning' \| 'active'`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/progress/type.ts) | N
strokeWidth | String / Number | - | \- | N
theme | String | line | optionsline/plump/circle。Typescript: `ThemeEnum` `type ThemeEnum = 'line' \| 'plump' \| 'circle'`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/progress/type.ts) | N
theme | String | line | options: line/plump/circle。Typescript: `ProgressTheme` `type ProgressTheme = 'line' \| 'plump' \| 'circle'`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/progress/type.ts) | N
trackColor | String | '' | \- | N
7 changes: 4 additions & 3 deletions packages/components/progress/progress.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
:: BASE_DOC ::

## API

### Progress Props

名称 | 类型 | 默认值 | 描述 | 必传
Expand All @@ -10,8 +11,8 @@ style | Object | - | 样式,TS 类型:`React.CSSProperties` | N
color | String / Object / Array | '' | 进度条颜色。示例:'#ED7B2F' 或 'orange' 或 `['#f00', '#0ff', '#f0f']` 或 `{ '0%': '#f00', '100%': '#0ff' }` 或 `{ from: '#000', to: '#000' }` 等。TS 类型:`string \| Array<string> \| Record<string, string>` | N
label | TNode | true | 进度百分比,可自定义。TS 类型:`string \| boolean \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
percentage | Number | 0 | 进度条百分比 | N
size | String / Number | 'medium' | 进度条尺寸,示例:small/medium/large/240。small 值为 72; medium 值为 112;large 值为 160 | N
status | String | - | 进度条状态。可选项:success/error/warning/active。TS 类型:`StatusEnum` `type StatusEnum = 'success' \| 'error' \| 'warning' \| 'active'`。[详细类型定义](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/progress/type.ts) | N
size | String / Number | 'medium' | 进度条尺寸,示例:small/medium/large/240。line 和 plump 只支持 small/medium。circle的尺寸值 small 值为 72; medium 值为 112;large 值为 160 | N
status | String | - | 进度条状态。可选项:success/error/warning/active。TS 类型:`ProgressStatus` `type ProgressStatus = 'success' \| 'error' \| 'warning' \| 'active'`。[详细类型定义](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/progress/type.ts) | N
strokeWidth | String / Number | - | 进度条线宽。宽度数值不能超过 size 的一半,否则不能输出环形进度 | N
theme | String | line | 进度条风格。值为 line,标签(label)显示在进度条右侧;值为 plump,标签(label)显示在进度条里面;值为 circle,标签(label)显示在进度条正中间。可选项:line/plump/circle。TS 类型:`ThemeEnum` `type ThemeEnum = 'line' \| 'plump' \| 'circle'`。[详细类型定义](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/progress/type.ts) | N
theme | String | line | 进度条风格。值为 line,标签(label)显示在进度条右侧;值为 plump,标签(label)显示在进度条里面;值为 circle,标签(label)显示在进度条正中间。可选项:line/plump/circle。TS 类型:`ProgressTheme` `type ProgressTheme = 'line' \| 'plump' \| 'circle'`。[详细类型定义](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/progress/type.ts) | N
trackColor | String | '' | 进度条未完成部分颜色 | N
10 changes: 5 additions & 5 deletions packages/components/progress/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ export interface TdProgressProps {
*/
percentage?: number;
/**
* 进度条尺寸,示例:small/medium/large/240。small 值为 72; medium 值为 112;large 值为 160
* 进度条尺寸,示例:small/medium/large/240。line 和 plump 只支持 small/medium。circle的尺寸值 small 值为 72; medium 值为 112;large 值为 160
* @default 'medium'
*/
size?: string | number;
/**
* 进度条状态
*/
status?: StatusEnum;
status?: ProgressStatus;
/**
* 进度条线宽。宽度数值不能超过 size 的一半,否则不能输出环形进度
*/
Expand All @@ -39,14 +39,14 @@ export interface TdProgressProps {
* 进度条风格。值为 line,标签(label)显示在进度条右侧;值为 plump,标签(label)显示在进度条里面;值为 circle,标签(label)显示在进度条正中间
* @default line
*/
theme?: ThemeEnum;
theme?: ProgressTheme;
/**
* 进度条未完成部分颜色
* @default ''
*/
trackColor?: string;
}

export type StatusEnum = 'success' | 'error' | 'warning' | 'active';
export type ProgressStatus = 'success' | 'error' | 'warning' | 'active';

export type ThemeEnum = 'line' | 'plump' | 'circle';
export type ProgressTheme = 'line' | 'plump' | 'circle';