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 flex #1532 #1549

Merged
merged 5 commits into from
Jul 13, 2017
Merged

fix flex #1532 #1549

merged 5 commits into from
Jul 13, 2017

Conversation

pingan1927
Copy link
Contributor

@pingan1927 pingan1927 commented Jul 10, 2017

close #1532

First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

  • Make sure that you follow antd's code convention.
  • Run npm run lint and fix those errors before submitting in order to keep consistent code style.
  • Rebase before creating a PR to keep commit history clear.
  • Add some descriptions and refer relative issues for you PR.

Extra checklist:

if isBugFix :

  • Make sure that you add at least one unit test for the bug which you had fixed.

elif isNewFeature :

  • Update API docs for the component.
  • Update/Add demo to demonstrate new feature.
  • Update TypeScript definition for the component.
  • Add unit tests for the feature.

This change is Reviewable

@mention-bot
Copy link

@pingan1927, thanks for your PR! By analyzing the history of the files in this pull request, we identified @yiminghe and @paranoidjk to be potential reviewers.

@codecov
Copy link

codecov bot commented Jul 10, 2017

Codecov Report

Merging #1549 into feature-2.0 will increase coverage by 0.73%.
The diff coverage is 73.68%.

Impacted file tree graph

@@              Coverage Diff               @@
##           feature-2.0   #1549      +/-   ##
==============================================
+ Coverage        65.37%   66.1%   +0.73%     
==============================================
  Files              120     226     +106     
  Lines             2166    2269     +103     
  Branches           607     696      +89     
==============================================
+ Hits              1416    1500      +84     
- Misses             749     768      +19     
  Partials             1       1
Flag Coverage Δ
#rn 82.07% <ø> (?)
#web 65.32% <73.68%> (-0.05%) ⬇️
Impacted Files Coverage Δ
components/menu/index.web.tsx 91.66% <ø> (ø) ⬆️
components/search-bar/index.web.tsx 78.57% <ø> (ø) ⬆️
components/pagination/index.tsx 100% <ø> (ø)
components/input-item/index.web.tsx 50.41% <ø> (ø) ⬆️
components/switch/index.tsx 100% <ø> (ø)
components/progress/index.tsx 100% <ø> (ø)
components/textarea-item/index.tsx 100% <ø> (ø)
components/textarea-item/index.web.tsx 45.26% <ø> (ø) ⬆️
components/search-bar/index.tsx 100% <ø> (ø)
components/flex/Flex.web.tsx 100% <ø> (ø) ⬆️
... and 115 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 681161d...1b5486a. Read the comment docs.

@paranoidjk
Copy link
Contributor

@pingan1927 两个问题,

  • ci lint 挂了,本地注意重装依赖跑下保证没问题
  • 同步更新 2.0 的 changlog,避免后面忘记

@paranoidjk paranoidjk self-assigned this Jul 10, 2017
@pingan1927
Copy link
Contributor Author

@paranoidjk 你仔细看看lint内容,目前的几个lint报错都是其他组件引起的。且都不是代码层面的问题。

@paranoidjk
Copy link
Contributor

@pingan1927 rebase master, 我上周已经修复了。

@@ -30,6 +30,7 @@ timeline: true
to `input`(for web) or `TextInput`(for react native) element;
- Progress: `wrapStyle` has been replaced by `style` and `style` has been replaced by `barStyle` property.
- The `style` property now can custom style, eg: tintColor for switch
- `Flex` 清理冗余API. [#1532](https://github.com/ant-design/ant-design-mobile/issues/1532)
Copy link
Contributor

Choose a reason for hiding this comment

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

写明去掉了哪些 api。

changlog 存在的意义是用户升级的时候一个速查表,而不是还要他点进去看 issue,看代码。

附上 issue 只是给有需要的人,不是所有人。

@paranoidjk paranoidjk force-pushed the fix-flex-api branch 2 times, most recently from a3e40c8 to bcf5f9c Compare July 13, 2017 06:52
@paranoidjk
Copy link
Contributor

close #1532 应该写在 PR 描述的开头。

review 的问题我帮你修复了。先合掉

@paranoidjk paranoidjk merged commit 9fed24a into feature-2.0 Jul 13, 2017
@paranoidjk paranoidjk deleted the fix-flex-api branch July 13, 2017 06:54
silentcloud pushed a commit that referenced this pull request Jul 18, 2017
* feat: pagination current start from 1. close #1009

* refactor style for some components, ref #1380

* fix flex #1532

* update snap

* modify CHANGELOG
lixiaoyang1992 pushed a commit to lixiaoyang1992/ant-design-mobile that referenced this pull request Apr 26, 2018
* feat: pagination current start from 1. close ant-design#1009

* refactor style for some components, ref ant-design#1380

* fix flex ant-design#1532

* update snap

* modify CHANGELOG
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