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

feat: Skeleton add round prop #24137

Merged
merged 7 commits into from May 16, 2020
Merged

feat: Skeleton add round prop #24137

merged 7 commits into from May 16, 2020

Conversation

xilihuasi
Copy link
Contributor

@xilihuasi xilihuasi commented May 13, 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

close #24130

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English Skeleton add round prop to enable paragraph and title show radius
🇨🇳 Chinese Skeleton 添加 round 属性,允许段落和标题显示圆角

☑️ 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

View rendered components/skeleton/index.en-US.md
View rendered components/skeleton/index.zh-CN.md
View rendered docs/react/introduce.zh-CN.md

@ant-design-bot
Copy link
Contributor

@ant-design-bot ant-design-bot commented May 13, 2020

@codecov
Copy link

@codecov codecov bot commented May 14, 2020

Codecov Report

Merging #24137 into feature will increase coverage by 0.12%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           feature   #24137      +/-   ##
===========================================
+ Coverage    98.69%   98.82%   +0.12%     
===========================================
  Files          365      364       -1     
  Lines         7424     7297     -127     
  Branches      2013     2032      +19     
===========================================
- Hits          7327     7211     -116     
+ Misses          97       86      -11     
Impacted Files Coverage Δ
components/input/Password.tsx 97.50% <0.00%> (-0.12%) ⬇️
components/form/FormItem.tsx 99.15% <0.00%> (-0.01%) ⬇️
components/tree/Tree.tsx 100.00% <0.00%> (ø)
components/select/index.tsx 97.61% <0.00%> (ø)
components/menu/MenuItem.tsx 96.66% <0.00%> (ø)
components/message/index.tsx 100.00% <0.00%> (ø)
components/transfer/index.tsx 100.00% <0.00%> (ø)
components/typography/Base.tsx 100.00% <0.00%> (ø)
components/typography/index.tsx 100.00% <0.00%> (ø)
components/transfer/ListItem.tsx 100.00% <0.00%> (ø)
... and 11 more

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 b0e528d...b373e1f. Read the comment docs.

@yoyo837
Copy link
Contributor

@yoyo837 yoyo837 commented May 14, 2020

混入了其他东西

@xilihuasi
Copy link
Contributor Author

@xilihuasi xilihuasi commented May 14, 2020

只修改了 Skeleton 模块文件,其他文件是 upstream 之后 pr 混入的,需要重发 pr 吗

@yoyo837
Copy link
Contributor

@yoyo837 yoyo837 commented May 14, 2020

rebase 操作不对

@xilihuasi
Copy link
Contributor Author

@xilihuasi xilihuasi commented May 14, 2020

现在 file change 是对的,本地 run test 通过。但是 push 到线上会报 error。
看了下日志报的是 ellipsis-custom-tooltip.md demo test snapshot 不匹配,但是本地是正常的,请问要怎么解决。

@afc163
Copy link
Member

@afc163 afc163 commented May 15, 2020

rm package-lock.json yarn.lock && npm i && npm test -- -u
git commit -am 'fix snapshot'
git push origin feature

afc163
afc163 approved these changes May 16, 2020
@afc163 afc163 merged commit 5f1da59 into ant-design:feature May 16, 2020
17 of 18 checks passed
@zombieJ zombieJ mentioned this pull request May 31, 2020
13 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

4 participants