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: fix trailColor in line-type progress and add trailColor in docs #21552

Merged
merged 1 commit into from Feb 25, 2020

Conversation

AshoneA
Copy link
Contributor

@AshoneA AshoneA commented Feb 24, 2020

🤔 This is a ...

  • [] New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

#21550

💡 Background and solution

fix trailColor props in type=line progress and add trailColor in docs

📝 Changelog

Language Changelog
🇺🇸 English Fix Progress trailColor not working when type=line.
🇨🇳 Chinese 修复 Progress trailColor属性在 type=line 时无效果的问题。

☑️ Self Check before Merge

  • 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

View rendered components/progress/demo/line.md
View rendered components/progress/index.en-US.md
View rendered components/progress/index.zh-CN.md

@ant-design-bot
Copy link
Contributor

@ant-design-bot ant-design-bot commented Feb 24, 2020

@AshoneA AshoneA requested a review from afc163 Feb 24, 2020
@@ -23,6 +23,7 @@ ReactDOM.render(
<Progress percent={70} status="exception" />
<Progress percent={100} />
<Progress percent={50} showInfo={false} />
<Progress percent={30} trailColor="#1890ff30" />
Copy link
Member

@afc163 afc163 Feb 24, 2020

Choose a reason for hiding this comment

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

演示中可以不展示。

Copy link
Contributor Author

@AshoneA AshoneA Feb 24, 2020

Choose a reason for hiding this comment

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

已去掉

} = props;
let backgroundProps;
let trailStyle;
Copy link
Member

@afc163 afc163 Feb 24, 2020

Choose a reason for hiding this comment

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

定义应靠近使用的地方。

Copy link
Contributor Author

@AshoneA AshoneA Feb 24, 2020

Choose a reason for hiding this comment

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

已定义于到最靠近使用的地方

@AshoneA AshoneA force-pushed the fix/progress-trail-color branch from f3ebb9c to 3dbbe50 Compare Feb 24, 2020
@codecov
Copy link

@codecov codecov bot commented Feb 24, 2020

Codecov Report

Merging #21552 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #21552      +/-   ##
==========================================
+ Coverage   97.79%   97.79%   +<.01%     
==========================================
  Files         304      304              
  Lines        7019     7021       +2     
  Branches     1900     1936      +36     
==========================================
+ Hits         6864     6866       +2     
  Misses        155      155
Impacted Files Coverage Δ
components/progress/Line.tsx 96.87% <100%> (+0.2%) ⬆️

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 3f8d6cd...d0295ab. Read the comment docs.

@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Feb 24, 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 d0295ab:

Sandbox Source
antd reproduction template Configuration

@afc163
Copy link
Member

@afc163 afc163 commented Feb 24, 2020

加个用例把覆盖率提起来。

@AshoneA AshoneA force-pushed the fix/progress-trail-color branch from 3dbbe50 to d0295ab Compare Feb 24, 2020
@AshoneA
Copy link
Contributor Author

@AshoneA AshoneA commented Feb 24, 2020

@afc163 trailColor的测试用例已加上, 写测试用例时候发现line.tsx还有一处测试用例没覆盖到, 然后看了下感觉里面的有段代码有点问题. pr在这里 #21564 , 加上这个pr中的line.tsx覆盖率已经达到100%了

@afc163
Copy link
Member

@afc163 afc163 commented Feb 25, 2020

@AshoneA Well done!

@afc163 afc163 merged commit 778dfe5 into ant-design:master Feb 25, 2020
18 checks passed
@pr-triage pr-triage bot added the PR: merged label Feb 25, 2020
@zombieJ zombieJ mentioned this pull request Feb 27, 2020
10 tasks
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.

None yet

3 participants