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.

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: change progress to percent in success props & warning in Progress #25356

Merged
merged 7 commits into from Jul 1, 2020

Conversation

fireairforce
Copy link
Member

@fireairforce fireairforce commented Jul 1, 2020

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Perfermance optimization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

close: #25353

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English Fix Progress success.progress to success.percent.
🇨🇳 Chinese 修正 Progress success.progresssuccess.percent

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

@fireairforce
Copy link
Member Author

fireairforce commented Jul 1, 2020

这个地方之前写错 devWarnning 的条件了😅

@fireairforce
Copy link
Member Author

fireairforce commented Jul 1, 2020

那个 api 如果也要调整的话,应该放在feature分支还是?
@afc163

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Jul 1, 2020

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Jul 1, 2020

@afc163
Copy link
Member

afc163 commented Jul 1, 2020

顺便把 success.progress 修正为 success.percent 吧。

  1. success.progress 依旧有效,加个相应的警告。
  2. 支持 success.percent
  3. 修正一下文档。

@codesandbox-ci
Copy link

codesandbox-ci bot commented Jul 1, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 5bfd314:

Sandbox Source
antd reproduction template Configuration

@codecov
Copy link

codecov bot commented Jul 1, 2020

Codecov Report

Merging #25356 into master will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #25356   +/-   ##
=======================================
  Coverage   99.49%   99.49%           
=======================================
  Files         368      368           
  Lines        7292     7303   +11     
  Branches     2042     2049    +7     
=======================================
+ Hits         7255     7266   +11     
  Misses         37       37           
Impacted Files Coverage Δ
components/progress/Circle.tsx 100.00% <100.00%> (ø)
components/progress/Line.tsx 100.00% <100.00%> (ø)
components/progress/progress.tsx 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e494c95...5bfd314. Read the comment docs.

@afc163
Copy link
Member

afc163 commented Jul 1, 2020

changelog 写一下。

@fireairforce fireairforce changed the title fix: warning in Progress fix: change progress to percent in success props & warning in Progress Jul 1, 2020
<div
class="ant-progress-success-bg"
style="width: 30%; height: 8px; background-color: rgb(255, 255, 255);"
/>
Copy link
Member

@afc163 afc163 Jul 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为啥这个会变?

Copy link
Member Author

@fireairforce fireairforce Jul 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

还在修改,稍等~😂

@fireairforce

This comment has been minimized.

@fireairforce
Copy link
Member Author

fireairforce commented Jul 1, 2020

还得补下测试。。。QuQ

<Progress percent={60} success={{ progress: 30 }} />,
);
expect(errorSpy).toHaveBeenCalledWith(
'Warning: [antd: Progress] `progress` is deprecated. Please use `percent` instead.',
Copy link
Member

@afc163 afc163 Jul 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'Warning: [antd: Progress] `progress` is deprecated. Please use `percent` instead.',
'Warning: [antd: Progress] `success.progress` is deprecated. Please use `success.percent` instead.',

Copy link
Member Author

@fireairforce fireairforce Jul 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done~

@afc163 afc163 merged commit 2ad8fec into ant-design:master Jul 1, 2020
27 checks passed
@fireairforce fireairforce deleted the fix-successProgress branch Jul 1, 2020
@zombieJ zombieJ mentioned this pull request Jul 6, 2020
13 tasks
@zombieJ zombieJ mentioned this pull request Jul 6, 2020
13 tasks
@zjscy666
Copy link

zjscy666 commented Jul 17, 2020

如何让这个警告消失,我用了customRequest

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants