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: add col flex #2562

Merged
merged 2 commits into from
Jul 17, 2020
Merged

feat: add col flex #2562

merged 2 commits into from
Jul 17, 2020

Conversation

xrkffgg
Copy link
Member

@xrkffgg xrkffgg commented Jul 14, 2020

First of all, thank you for your contribution! 😄

New feature please send pull request to feature branch, and rest to master branch. Pull request will be merged after one of collaborators approve. Please makes sure that these form are filled before submitting your pull request, thank you!

[中文版模板 / Chinese template]

This is a ...

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

What's the background?

close #2558

API Realization (Optional if not new feature)

<a-row type="flex">
      <a-col :flex="2">2 / 5</a-col>
      <a-col :flex="3">3 / 5</a-col>
 </a-row>

 <a-row type="flex">
      <a-col flex="100px">100px</a-col>
      <a-col flex="auto">auto</a-col>
 </a-row>

 <a-row type="flex">
      <a-col flex="1 1 200px">1 1 200px</a-col>
      <a-col flex="0 1 300px">0 1 300px</a-col>
 </a-row>

Changelog description (Optional if not new feature)

Changelog
CN 新增 Grid 中 Col flex 属性。
EN Added Col flex property in Grid.

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

Additional Plan? (Optional if not new feature)

If this PR related with other PR or following info. You can type here.

@xrkffgg xrkffgg requested a review from tangjinzhou July 14, 2020 13:56
@xrkffgg
Copy link
Member Author

xrkffgg commented Jul 16, 2020

@tangjinzhou PTAL

@tangjinzhou tangjinzhou merged commit 745b298 into vueComponent:master Jul 17, 2020
@xrkffgg xrkffgg deleted the add-flex branch July 17, 2020 08:38
@github-actions
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

栅格系统的 Col 组件在将来的版本能否支持 flex 填充
2 participants