Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wanjj_1210
ant-design
提交
2604623b
A
ant-design
项目概览
wanjj_1210
/
ant-design
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
ant-design
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2604623b
编写于
4月 18, 2018
作者:
A
afc163
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix showInfo when precent is out of range
上级
0eb83577
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
4 deletion
+37
-4
components/progress/__tests__/__snapshots__/index.test.js.snap
...nents/progress/__tests__/__snapshots__/index.test.js.snap
+29
-1
components/progress/__tests__/index.test.js
components/progress/__tests__/index.test.js
+5
-0
components/progress/progress.tsx
components/progress/progress.tsx
+3
-3
未找到文件。
components/progress/__tests__/__snapshots__/index.test.js.snap
浏览文件 @
2604623b
...
...
@@ -20,7 +20,7 @@ exports[`Progress render negetive progress 1`] = `
<span
class="ant-progress-text"
>
-2
0%
0%
</span>
</div>
</div>
...
...
@@ -83,3 +83,31 @@ exports[`Progress render out-of-range progress 1`] = `
</div>
</div>
`;
exports[`Progress render out-of-range progress with info 1`] = `
<div
class="ant-progress ant-progress-line ant-progress-status-success ant-progress-show-info ant-progress-default"
>
<div>
<div
class="ant-progress-outer"
>
<div
class="ant-progress-inner"
>
<div
class="ant-progress-bg"
style="width: 100%; height: 8px;"
/>
</div>
</div>
<span
class="ant-progress-text"
>
<i
class="anticon anticon-check-circle"
/>
</span>
</div>
</div>
`;
components/progress/__tests__/index.test.js
浏览文件 @
2604623b
...
...
@@ -16,6 +16,11 @@ describe('Progress', () => {
expect
(
wrapper
.
render
()).
toMatchSnapshot
();
});
it
(
'
render out-of-range progress with info
'
,
async
()
=>
{
const
wrapper
=
mount
(
<
Progress
percent
=
{
120
}
showInfo
/>
);
expect
(
wrapper
.
render
()).
toMatchSnapshot
();
});
it
(
'
render negetive progress
'
,
async
()
=>
{
const
wrapper
=
mount
(
<
Progress
percent
=
{
-
20
}
/>
)
;
expect
(
wrapper
.
render
()).
toMatchSnapshot
();
...
...
components/progress/progress.tsx
浏览文件 @
2604623b
...
...
@@ -82,11 +82,11 @@ export default class Progress extends React.Component<ProgressProps, {}> {
let
text
;
const
iconType
=
(
type
===
'
circle
'
||
type
===
'
dashboard
'
)
?
''
:
'
-circle
'
;
if
(
progressStatus
===
'
exception
'
)
{
text
=
format
?
textFormatter
(
percent
)
:
<
Icon
type
=
{
`cross
${
iconType
}
`
}
/>;
text
=
format
?
textFormatter
(
validProgress
(
percent
)
)
:
<
Icon
type
=
{
`cross
${
iconType
}
`
}
/>;
}
else
if
(
progressStatus
===
'
success
'
)
{
text
=
format
?
textFormatter
(
percent
)
:
<
Icon
type
=
{
`check
${
iconType
}
`
}
/>;
text
=
format
?
textFormatter
(
validProgress
(
percent
)
)
:
<
Icon
type
=
{
`check
${
iconType
}
`
}
/>;
}
else
{
text
=
textFormatter
(
percent
);
text
=
textFormatter
(
validProgress
(
percent
)
);
}
progressInfo
=
<
span
className
=
{
`
${
prefixCls
}
-text`
}
>
{
text
}
</
span
>;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录