Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(progress): 修复percentage值为100时,会忽略status设置的值问题 #1836

Merged
merged 1 commit into from
Nov 24, 2022
Merged

fix(progress): 修复percentage值为100时,会忽略status设置的值问题 #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
136 changes: 136 additions & 0 deletions src/progress/__tests__/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,31 @@ exports[`Progress > :props > :status > :status is active 1`] = `
</div>
`;

exports[`Progress > :props > :status > :status is active and percentage is 100 1`] = `
<div
class="t-progress"
>
<div
class="t-progress--thin t-progress--status--active"
>
<div
class="t-progress__bar"
style="border-radius: undefinedpx;"
>
<div
class="t-progress__inner"
style="width: 100%;"
/>
</div>
<div
class="t-progress__info"
>
100%
</div>
</div>
</div>
`;

exports[`Progress > :props > :status > :status is error 1`] = `
<div
class="t-progress"
Expand Down Expand Up @@ -410,6 +435,43 @@ exports[`Progress > :props > :status > :status is error 1`] = `
</div>
`;

exports[`Progress > :props > :status > :status is error and percentage is 100 1`] = `
<div
class="t-progress"
>
<div
class="t-progress--thin t-progress--status--error"
>
<div
class="t-progress__bar"
style="border-radius: undefinedpx;"
>
<div
class="t-progress__inner"
style="width: 100%;"
/>
</div>
<div
class="t-progress__info"
>
<svg
class="t-icon t-icon-close-circle-filled t-progress__icon"
fill="none"
height="1em"
viewBox="0 0 16 16"
width="1em"
>
<path
d="M15 8A7 7 0 101 8a7 7 0 0014 0zM5.67 4.95L8 7.29l2.33-2.34.7.7L8.7 8l2.34 2.35-.71.7L8 8.71l-2.33 2.34-.7-.7L7.3 8 4.96 5.65l.71-.7z"
fill="currentColor"
fill-opacity="0.9"
/>
</svg>
</div>
</div>
</div>
`;

exports[`Progress > :props > :status > :status is success 1`] = `
<div
class="t-progress"
Expand Down Expand Up @@ -447,6 +509,43 @@ exports[`Progress > :props > :status > :status is success 1`] = `
</div>
`;

exports[`Progress > :props > :status > :status is success and percentage is 100 1`] = `
<div
class="t-progress"
>
<div
class="t-progress--thin t-progress--status--success"
>
<div
class="t-progress__bar"
style="border-radius: undefinedpx;"
>
<div
class="t-progress__inner"
style="width: 100%;"
/>
</div>
<div
class="t-progress__info"
>
<svg
class="t-icon t-icon-check-circle-filled t-progress__icon"
fill="none"
height="1em"
viewBox="0 0 16 16"
width="1em"
>
<path
d="M8 15A7 7 0 108 1a7 7 0 000 14zM4.5 8.2l.7-.7L7 9.3l3.8-3.8.7.7L7 10.7 4.5 8.2z"
fill="currentColor"
fill-opacity="0.9"
/>
</svg>
</div>
</div>
</div>
`;

exports[`Progress > :props > :status > :status is warning 1`] = `
<div
class="t-progress"
Expand Down Expand Up @@ -484,6 +583,43 @@ exports[`Progress > :props > :status > :status is warning 1`] = `
</div>
`;

exports[`Progress > :props > :status > :status is warning and percentage is 100 1`] = `
<div
class="t-progress"
>
<div
class="t-progress--thin t-progress--status--warning"
>
<div
class="t-progress__bar"
style="border-radius: undefinedpx;"
>
<div
class="t-progress__inner"
style="width: 100%;"
/>
</div>
<div
class="t-progress__info"
>
<svg
class="t-icon t-icon-error-circle-filled t-progress__icon"
fill="none"
height="1em"
viewBox="0 0 16 16"
width="1em"
>
<path
d="M15 8A7 7 0 101 8a7 7 0 0014 0zM8.5 4v5.5h-1V4h1zm-1.1 7h1.2v1.2H7.4V11z"
fill="currentColor"
fill-opacity="0.9"
/>
</svg>
</div>
</div>
</div>
`;

exports[`Progress > :props > :strokeWidth > :strokeWidth is Number, equal to 50 1`] = `
<div
class="t-progress"
Expand Down
11 changes: 11 additions & 0 deletions src/progress/__tests__/index.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,17 @@ describe('Progress', () => {
expect(wrapper.findComponent(Progress).vm.status).toBe(status);
expect(wrapper.element).toMatchSnapshot();
});

it(`:status is ${status} and percentage is 100`, () => {
const wrapper = mount({
render() {
return <Progress status={status} percentage={100}></Progress>;
},
});
expect(wrapper.findComponent(Progress).vm.percentage).toBe(100);
expect(wrapper.findComponent(Progress).vm.status).toBe(status);
expect(wrapper.element).toMatchSnapshot();
});
});
});

Expand Down
2 changes: 1 addition & 1 deletion src/progress/progress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default mixins(classPrefixMixins, getGlobalIconMixins()).extend({

computed: {
statusStyle(): string {
if (this.percentage >= 100) {
if (!this.status && this.percentage >= 100) {
return 'success';
}
return this.status;
Expand Down