Commit Graph

928 Commits

Author SHA1 Message Date
afc163
0f778d2a4a Merge from master 2017-09-05 16:19:34 +08:00
afc163
668cec2f9e Fix FormItem focus behavious, close #7351 2017-09-01 15:17:04 +08:00
LeezQ
6954c3506c docs: add typescript demo (#7330)
* feat: add typescript demo

add form typescript demo code

* Update index.zh-CN.md

* add TypeScript demo code

add TypeScript demo code

* Update index.en-US.md

* Update index.zh-CN.md

* Update index.en-US.md
2017-09-01 10:36:31 +08:00
ddcat1115
b10f7726c3 Merge remote-tracking branch 'origin/master' into antd-3.0 2017-08-23 23:12:38 +08:00
Tao
62b72d6c51 modify 参数 to 方法 (#7294)
* modify `参数` to `方法`

* modify `Property` to `Method`

* dummy copy-paste
2017-08-23 13:25:44 +08:00
Benjy Cui
2268418a97 docs: add docs for validateFields, close: ##7287 2017-08-23 11:13:01 +08:00
afc163
dc7dfd38c6 Merge from master 2017-08-21 21:02:57 +08:00
afc163
fcb935b101 improve form doc 2017-08-19 12:12:57 +08:00
afc163
c28c2f6b1e Merge branch 'master' into antd-3.0 2017-08-18 19:18:26 +08:00
Wei Zhu
145ed77c00 fix: form type (#7245) 2017-08-18 17:21:18 +08:00
afc163
f77c38bddf fix snap 2017-08-18 12:17:07 +08:00
偏右
2dedc5ec7f Upgrade grid break points (#7230)
close #5122
2017-08-16 20:19:41 +08:00
jiang
22ef7d1147 add form explain animate (#7172) 2017-08-11 17:05:25 +08:00
afc163
9bcde59001 Add @form-feedback-icon-size 2017-08-10 11:34:08 +08:00
Randy
df934445c0 add a generic type for FormCreateOption (#7119) 2017-08-09 12:59:31 +08:00
Benjy Cui
87bfe2df87 fix: wrappedComponentRef should work, close: #6545 2017-08-09 10:27:34 +08:00
Benjy Cui
02daedd67b docs: add missing doc for Form, close: #6959 2017-08-08 10:10:47 +08:00
Wei Zhu
bef7db465e Revert "Revert "Revert "feat: upgrade rc-slider, support keyboard accessibility"""
This reverts commit 0b8b0d2deb.
2017-07-30 16:07:41 +08:00
Wei Zhu
0b8b0d2deb Revert "Revert "feat: upgrade rc-slider, support keyboard accessibility""
This reverts commit 551807cd91.
2017-07-30 16:06:53 +08:00
Wei Zhu
551807cd91 Revert "feat: upgrade rc-slider, support keyboard accessibility"
This reverts commit ef339a32ac.
2017-07-30 16:05:37 +08:00
paranoidjk
ef339a32ac feat: upgrade rc-slider, support keyboard accessibility
https://github.com/react-component/slider/pull/282
2017-07-28 14:02:45 +08:00
Benjy Cui
8e496966cf docs: update docs for Form 2017-07-26 09:04:01 +08:00
afc163
896e738fce Fix missing semicolon 2017-07-22 15:25:08 +08:00
偏右
c733f94c33 Merge pull request #6916 from djyde/separate-type
Separate getFieldDecorator options type
2017-07-22 15:16:04 +08:00
afc163
0ad85e2987 Fix #4431 again 2017-07-21 10:07:18 +08:00
Randy
a0dc7d3a72 Separate getFieldDecorator options type
Taking getFieldDecorator options type out of WrappedFormUtils
2017-07-20 13:20:15 +08:00
Benjy Cui
119d498935 chore: replace http with https, close: #6893 2017-07-19 14:00:11 +08:00
Benjy Cui
8cfa61f46b test: update snapshot 2017-07-19 10:15:58 +08:00
afc163
9a85303f79 remove unneccesary size prop 2017-07-16 15:41:51 +08:00
afc163
e6554e7edb update form document 2017-07-16 15:05:48 +08:00
Benjy Cui
2413c6af61 fix: make loading work with icon only button in button group, close: #6822 2017-07-14 15:26:55 +08:00
afc163
ca89227568 test: fix snapshot 2017-07-12 21:44:46 +08:00
afc163
4419d4c94c Fix select extra padding, close #6723 2017-07-11 12:14:35 +08:00
afc163
01bbd5a3d3 update form dynamic demo 2017-07-11 11:59:30 +08:00
afc163
384803528f Fix extra error outline of select in input addon 2017-07-08 16:20:01 +08:00
paranoidjk
ba168b826f refactor: use spread operator replace object-assign (#6677) 2017-07-03 16:57:11 +08:00
newraina
4d002055b5 fix: TypeScript's definition of FormItemColOption (#6611) 2017-06-28 15:03:52 +08:00
afc163
e188036606 remove unused code 2017-06-27 14:33:35 +08:00
afc163
dbd6f29c29 Fix form item extra content line height, close #6618 2017-06-27 12:08:16 +08:00
afc163
6e583325ea Don't impact select inside input group 2017-06-26 21:44:38 +08:00
afc163
e24a8cb5d8 Tweak inline form item margin 2017-06-26 17:05:42 +08:00
afc163
5964e42a9b tweak form label style 2017-06-26 11:51:41 +08:00
afc163
9f78e71c65 Fix select vertical issue inside input addon 2017-06-25 17:22:07 +08:00
afc163
7dafa985c5 remove colon block of vertical form 2017-06-25 16:48:01 +08:00
Benjy Cui
82d1957941 docs: update demo for: #6503 2017-06-19 11:25:30 +08:00
afc163
d7a29f682b upgrade Col span format in demo 2017-06-15 15:34:47 +08:00
afc163
4f874c5065 improve demo code 2017-06-09 21:24:40 +08:00
Benjy Cui
4ee2194b45 deps: upgrade rc-notification 2017-06-09 10:17:30 +08:00
afc163
d086ee253e update snapshots for #6347 2017-06-03 01:38:26 +08:00
afc163
9bb7ec0b87 update form demo snapshot 2017-06-01 17:58:06 +08:00
afc163
becb888f6e Fix form demo, close #6323 2017-06-01 17:56:05 +08:00
slientcloud
e43c8012ad chore: support slider aira (#6301) 2017-06-01 12:08:39 +08:00
Leo
f4312895d6 chore: componentDecorator return specific type instead of any (#6308) 2017-06-01 09:25:32 +08:00
afc163
2cde334cd5 update snapshot 2017-05-28 15:30:43 +08:00
Jordan Hornblow
720a3d30b4 fix: Form and Mention TypeScript definition (#6268)
* Add source and options params to Form.ValidationRule.validator function

As per rules section of async-validation readme: https://github.com/yiminghe/async-validator#rules

* Make prefixCls optional in MentionProps interface
2017-05-26 09:16:53 +08:00
mitchell.demler
64befeda32 Add ValidationRule type for getFieldDecorator validation rules
Copied types from english documentation. (these might need checking?)
2017-05-22 15:57:09 +12:00
Benjy Cui
4b8a291684 fix: broken style of Cascader in Input.Group (#6208)
* fix: broken hover style of Cascader, close: #6202

* test: update snapshot
2017-05-22 10:09:17 +08:00
afc163
8703145d70 Fix prop-types and createClass warning, #5678 2017-05-18 14:22:47 +08:00
afc163
c6ec1ce9bb use create-react-class, ref #5678 2017-05-17 18:01:53 +08:00
Benjy Cui
a9a8f68578 docs: update demo 2017-05-15 17:33:47 +08:00
ddcat1115
0b9ff23661 docs: add dynamic-rule form demo (#6035) 2017-05-15 17:25:50 +08:00
Benjy Cui
11626decfe chore: update docs for Form.Item and fix edge case, close: #6113 2017-05-15 11:31:48 +08:00
afc163
9089674a6f Fix form item layout bug when zoom out, close #6097 2017-05-11 21:10:30 +08:00
Tyler
919cb22eb7 Use the prop-types package from npm instead of React.PropTypes (#6057)
* Use the prop-types package from npm instead of React.PropTypes

* Remove using of PropTypes from React in docs and site
2017-05-09 13:40:33 +08:00
Benjy Cui
0d672d5c2d test: fix CI 2017-05-05 14:47:37 +08:00
kossel
169e0f9762 fix: issue 5834, autocomplete is not being decorated (#6018) 2017-05-05 14:40:57 +08:00
MeiLin
01a75428d6 docs: fix typo (#5980) 2017-05-02 09:29:57 +08:00
乐仪
5dfe86e891 fix snap 2017-04-24 17:08:56 +08:00
Graeme Yeates
297412b57c Add a less variable to opt out of form item colons 2017-04-21 14:34:56 -04:00
afc163
03e9a97e2b typo 2017-04-16 00:03:47 +08:00
Manjit Kumar
4e055ed5d0 use PropTypes from 'prop-types' mdoule instead of React
- as React.PropTypes is being deprecated
 - Warning: Accessing PropTypes via the main React package is deprecated. Use the prop-types package from npm instead.
 - Solution: https://facebook.github.io/react/blog/2017/04/07/react-v15.5.0.html#migrating-from-react.proptypes
2017-04-12 02:22:05 +05:30
Wei Zhu
5ddd7f847f docs: Document customized form control
Related: #5700
2017-04-10 22:42:56 +08:00
afc163
0dc2c1771f fix snapshot 2017-04-05 14:59:56 +08:00
Kenaniah Cerny
ed434c57e9 improves link navigation 2017-04-01 04:06:34 -07:00
Benjy Cui
ce2fe2aa45 test: add test for Modal[footer=null] 2017-03-30 16:06:03 +08:00
Wei Zhu
b8fca87461 Fix some form type definition issues (#5560)
Close #5515
2017-03-30 13:46:38 +08:00
Kyle Rosenberg
84baa310e2 fix: isFieldTouched and isFieldsTouched types to WrappedFormUtils (#5537)
* Added missing getFieldsError in WrappedFormUtils

* Added isFieldTouched and isFieldsTouched types to WrappedFormUtils interface in Form.tsx
2017-03-29 09:36:54 +08:00
afc163
a19845c1bb fix tslint 2017-03-24 11:56:18 +08:00
feng zhi hao
637d9243ea chore: improve Form.create ts definition of Form (#5420)
* improve Form.create ts definition of Form

* use function<T>() instead of arrow function
2017-03-24 11:43:38 +08:00
William Yang
6b8eeb79d1 fix: #5456(Cannot display feed back icon and prefix icon together) (#5457)
* fix #5456

* remove demo and set z-index to 1
2017-03-24 09:59:31 +08:00
偏右
674255bd14 [WIP] upgrade deps (#5455)
* upgrade deps

* autofix some tslint problems

* Fix tslint problems manually
2017-03-23 21:15:49 +08:00
afc163
93ec71ea58 fix whitespace required, close #5418 2017-03-21 15:21:40 +08:00
Benjy Cui
36a7ffc0d6 fix: Switch should not warning with size=large, close: #5368 2017-03-20 16:08:24 +08:00
afc163
240a93cee2 Fix mention active style 2017-03-19 01:29:21 +08:00
Qingrong Ke
8afc2e9e95 Fix 5322 (#5379)
* Input: fix #5322

* Refactor preSuffix to affix

* Update tests and demos

* Refactor preSuffix to affix
2017-03-18 21:26:42 +08:00
Wei Zhu
f6b1e942e3 Jest 19 (#5361)
* Upgeade to jest 19

* Use jest.spyOn
2017-03-17 18:56:30 +08:00
Benjy Cui
be13831d92 Fix upload (#5358)
* docs: add demo to re-produce bug

* fix: dragger should work with form decorator, close: #5334

* test: update snapshot
2017-03-17 11:47:05 +08:00
Benjy Cui
aa4606cd9f feat: make Form.Item work with responsive layout, ref: #5296 (#5306) 2017-03-15 11:25:58 +08:00
afc163
a5b47f9e49 update form docs 2017-03-10 19:26:43 +08:00
afc163
a0cdce4d00 fix test case 2017-03-10 19:22:18 +08:00
Benjy Cui
228e9c0747 fix: remove Form auto-responsive layout (#5253)
* fix: remove Form auto-responsive layout

* test: update snapshot
2017-03-10 19:19:36 +08:00
afc163
6bca3ba87f clean up document 2017-03-07 22:38:01 +08:00
afc163
cd2c027d89 docs: Add API document for Form validation rule
close #5201, ref #5155
2017-03-07 22:35:45 +08:00
afc163
a7a4d672f5 update form login demo, close #5172 2017-03-06 15:15:50 +08:00
Wei Zhu
67bbae9ea8 Merge branch 'feature-2.8' 2017-03-05 21:34:57 +08:00
afc163
06d351f968 fix warning in test case 2017-03-02 14:14:34 +08:00
feng zhi hao
dab5f3547d chore: improve ts definition of Form (#5134) 2017-03-02 10:53:47 +08:00
Benjy Cui
fb8f90c102 feat: form (#5063)
* feat: support Form[layout], close: #5056

* feat: Form should be responsive, close: #5055

* test: update snapshot

* fix: resolve conflict betwen layout defaultValue and inline & vertical
2017-03-02 10:49:06 +08:00
Kyle Rosenberg
aa84b826c1 chore: Added missing getFieldsError in WrappedFormUtils (#5133) 2017-03-02 09:33:46 +08:00
afc163
ea7dc3e56c update docs 2017-03-01 18:44:59 +08:00
afc163
a7a2c54fa8 fix snap 2017-03-01 14:46:44 +08:00
Yogesh
0675acc3ef Typo/grammar change (#5117) 2017-03-01 12:45:24 +08:00
feng zhi hao
4019ef4b0c chore: fix hideRequiredMark ts definition of Form (#5112) 2017-03-01 09:13:26 +08:00
Benjy Cui
758559f718 test: update snapshots 2017-02-28 16:14:53 +08:00
Eden Wang
445c940af4 docs: Change Password Blur from password to confirm (#5076)
* Change Password Blur from password to confirm

If you type check password, then type password, the validation won't be changed

* rename variables and functions name

rename handlePasswordBlur to handleConfirmBlur
rename passwordDirty to confirmDirty
2017-02-28 11:30:04 +08:00
Benjy Cui
8b539c4971 chore: update type definition 2017-02-27 10:20:46 +08:00
afc163
a9599b802c when labelCol is 24, it is a vertical form 2017-02-26 18:09:41 +08:00
afc163
cf4ad5ddb8 fix test case 2017-02-26 00:23:46 +08:00
afc163
511db23fcd Add default title for form item label 2017-02-25 18:48:44 +08:00
afc163
68fde63ef7 refactor renderLabel 2017-02-25 18:47:40 +08:00
afc163
0f46eed370 fix lint 2017-02-23 11:45:48 +08:00
afc163
7181e3c9e8 revert d9ec4bf and ef0b708, close #4997 2017-02-22 16:50:24 +08:00
Benjy Cui
e4d9e5af54 test: update snapshot 2017-02-22 15:52:43 +08:00
feng zhi hao
62e80928d5 docs: rewrite Form demos to ES6 component (#4949) 2017-02-20 11:50:57 +08:00
afc163
3308bce9b9 fix snapshot test 2017-02-20 11:36:57 +08:00
afc163
28dbdd17ed fix for #4920 2017-02-17 14:11:10 +08:00
Benjy Cui
56995e2089 test: update snapshot 2017-02-17 13:59:13 +08:00
Cordaro
168c576d4a docs: fix getFieldDecorator param (#4896)
close #4894
2017-02-15 22:58:24 +08:00
afc163
588dd3033f docs: update for customizing validation 2017-02-15 14:41:16 +08:00
afc163
c86d9f1abc Make form control height follow large input height 2017-02-15 11:19:16 +08:00
zilong
597e020a45 chore: add class ant-form-item-control-wrapper for formItem wrapper (#4856) 2017-02-14 10:46:54 +08:00
zollero
e7cb0aa95d docs: fix typo (#4855)
修改一个错别字:“通” --》 “同”
2017-02-14 10:43:11 +08:00
Benjy Cui
184c4f5af7 docs: update docs for Form, ref: #4093 2017-02-14 10:29:06 +08:00
Benjy Cui
200b88246f docs: update docs format 2017-02-13 10:55:53 +08:00
Benjy Cui
c88cdc60ce docs: update docs for form, close: #4802 2017-02-09 14:50:25 +08:00
zhenzong
fdaf15d16c fix issue #4783 (#4788) 2017-02-09 11:09:22 +08:00
Benjy Cui
9ed06dea8a docs: remove outdated warning, ref: #4783 2017-02-08 09:40:25 +08:00
zerob4wl
a39d435925 Update without-form-create.md (#4781)
typo
2017-02-07 21:38:14 +08:00
afc163
0eb5c689a3 remove type="ghost" from demo 2017-02-04 22:35:33 +08:00
Graeme Yeates
1006015ef0 Add border customization variables (#4734)
* Add border customization variables (#4712)

* Make border styles customizable (fixes #4712)
2017-01-31 16:05:10 +08:00
afc163
f2bb4afd4d Merge from master 2017-01-27 17:23:51 +08:00
Penghan Wang
8a412ae260 doc: improve document for Form validateFields (#4730) 2017-01-27 10:39:09 +08:00
Wei Zhu
77b78a9389 docs: Unify type naming (#4636)
* Unify name of ReactNode type in document

* Lowser all string type name

* Lowercase all number type name

* Lowercase all boolean type name

* Unify array type

* Lowercase all object type name

* Unify mutilple types
2017-01-20 20:10:50 +08:00
afc163
35523be6e9 Merge from master 2017-01-20 18:28:09 +08:00
Benjy Cui
3e17551b7e site: improve build speed 2017-01-19 15:22:53 +08:00
afc163
8f57451d8c fix snap test for cascader upgrade 2017-01-17 13:45:26 +08:00
afc163
abd264ebf0 fix test case name 2017-01-15 14:37:22 +08:00
afc163
fd6fc86b21 improve form validating style 2017-01-14 20:59:37 +08:00
偏右
6e3565b983 Add Form[hideRequiredMark] (#4500)
* Add Form[hideRequiredMark]

* omit hideRequiredMark

* Add test case for Form[hideRequiredMark]
2017-01-13 21:52:48 +08:00
偏右
3423d27493 When form layout is vertical, keep the colon inside label, close #4593 (#4599) 2017-01-13 21:12:31 +08:00
Hans Chan
3d58a3f608 docs: add property colon for Form.Item (#4505)
* docs: 修改错别字

* docs: add property `colon` for Form.Item

`colon` is available since 2.0.0-beta.1
2017-01-13 19:03:59 +08:00
Hans Chan
927581bb84 docs: add property colon for Form.Item (#4505)
* docs: 修改错别字

* docs: add property `colon` for Form.Item

`colon` is available since 2.0.0-beta.1
2017-01-13 18:05:24 +08:00
Benjy Cui
eeae03d681 docs: remove useless code 2017-01-13 15:14:06 +08:00
Tao Zhang
477fde8b7f docs: Updated form description (#4574) 2017-01-12 09:09:59 +08:00
afc163
4654db312f Fix some lesshint problems 2017-01-11 21:45:09 +08:00
Benjy Cui
3fa5d10da3 Merge branch 'master' into feature-2.7 2017-01-10 10:50:40 +08:00
wallverb
a47c200f7c Fix validateTrigger type (#4536)
* Update validateTrigger type

* Update validateTrigger doc for en-US

* Update validateTrigger doc for zh-CN
2017-01-09 21:20:40 +08:00
Benjy Cui
5fd3baaff0 docs: update outdated docs 2017-01-09 18:00:30 +08:00
Benjy Cui
f436b5c2f4 deps: upgrade rc-form, close: #4374 2017-01-09 17:40:01 +08:00
Hans Chan
ef6c19e97b docs: add property colon for Form.Item (#4505)
* docs: 修改错别字

* docs: add property `colon` for Form.Item

`colon` is available since 2.0.0-beta.1
2017-01-09 11:03:35 +08:00
afc163
0187384445 refactor for code style 2017-01-06 01:33:09 +08:00
afc163
e2b8aee202 fix snapshot 2017-01-05 17:24:14 +08:00
afc163
657c707a79 Hide useless prop Form[horizontal] 2017-01-05 16:57:41 +08:00
afc163
53371dfe3e Add plain text form item in demo, close #4465 2017-01-05 16:40:21 +08:00
afc163
9df1eb91db Add form layout demo and fix vertical form style 2017-01-05 16:32:50 +08:00
afc163
fb6858c3cc Fix hasFeedback and Select style detail for #4436 2017-01-01 17:39:27 +08:00
Jesper We
d258ace146 Fix #4431 Overlapping graphics with<Select> in <Form.Item ... hasFeedback={true} (#4436) 2017-01-01 17:20:08 +08:00
偏右
e4bee3425a Upgrade rc form (#4430)
* support nested form item name by upgrade rc-form

react-component/form#48

* Fix dynamic form demo
2016-12-31 23:47:07 +08:00
afc163
d570d03698 improve document for Form setFields, close #4370 2016-12-27 21:14:00 +08:00
Edd Hannay
8382023409 docs: fix typo in Form demo (#4313)
- Rename checkPassowrd function checkPassword
2016-12-20 20:28:44 +08:00
afc163
e1d73eb424 update form documentation 2016-12-18 14:54:12 +08:00
afc163
48de73b721 Fix a FormItem mis-align bug, close #4271 2016-12-16 20:24:50 +08:00
Pierre
827aa2f94c style: remove hardcoded inputs height (#4175)
* remove hardcoded inputs height

* revert pagination input height

* revert pagination input heights bis
2016-12-15 11:17:09 +08:00
Wei Zhu
07103b9fb6 Don't ignore test files. 2016-12-14 14:48:09 +08:00
Wei Zhu
17a0a33283 Restructure tests. 2016-12-14 14:41:39 +08:00
afc163
303fc113c2 Add coordinated form demo 2016-12-13 13:28:16 +08:00
afc163
5815ce514a Add Radio in form demo, close #3910 2016-12-04 16:19:55 +08:00
Benjy Cui
c4d8c4770c Add upgrade warning (#4028)
* chore: add upgrade warning for time related value

* chore: update warning

* chore: update demo url
2016-12-02 15:07:33 +08:00
Benjy Cui
01dbcbe4af css: should not reset fieldset style, close: #4090 2016-12-01 16:46:05 +08:00
Benjy Cui
75c09cb481 css: Form.Item[extra] should be block, close: #4089 2016-12-01 11:25:34 +08:00
Andrey G
a307a7acf7 refactor: remove unnecessary computed props for classNames (#4055)
* remove unnecessary computed props for classNames

* rollback autocomplete optimization for possible css style order issue

* update snapshots

* remove more unnecessary computed props at Input
2016-11-30 10:20:23 +08:00
afc163
7d75f6e3de Fix focus style of Form Controls, close #4035 2016-11-28 19:01:14 +08:00
afc163
2260701865 improve demo detail 2016-11-23 20:17:44 +08:00
Benjy Cui
f250bdcc98 docs: update demo for form 2016-11-21 18:29:36 +08:00
afc163
34f353deb0 update form API doc 2016-11-21 14:28:20 +08:00
afc163
33ad640b0f feedback icon should not affect user operation (#3891) 2016-11-17 17:33:00 +08:00
Bruce Mitchener
36508ffabd Typo fixes. 2016-11-16 20:33:37 +07:00
afc163
4f7eff39fd fix error controls style 2016-11-16 20:13:00 +08:00
afc163
0d63e5f6b5 Fix select[combobox] vertical align, close #3855 2016-11-15 21:54:22 +08:00
afc163
be9ed0388c Fix form controls focused error style 2016-11-11 15:08:02 +08:00
Benjy Cui
e7cf2a4f3f docs: update demos for Form, close: #3558 2016-11-10 16:11:22 +08:00
afc163
88d470220b Fix wrong error style for Form Validation 2016-11-09 22:25:39 +08:00
afc163
51dae474cc fix form demo align 2016-11-09 22:12:21 +08:00
ddcat1115
0baef0627e docs: 调整组件导航结构 (#3758)
- Layout 更名为 Grid
2016-11-09 14:43:32 +08:00
Benjy Cui
4d2bdfd93d docs: update docs for form 2016-11-09 10:16:36 +08:00
afc163
0ec4276eab @font-size-lg (#1752) 2016-11-08 21:07:01 +08:00
afc163
0a48c62dcb use @text-color 2016-11-08 20:50:59 +08:00
afc163
9b81fe86d9 clear less variables and add @text-color-secondary 2016-11-08 20:48:03 +08:00
Benjy Cui
5782253a0f fix: infinite loop, ref: #3759 2016-11-08 16:22:36 +08:00
Benjy Cui
9360c02129 docs: update docs about resetFields, close: #3746 2016-11-07 11:55:58 +08:00
afc163
d0c34380d4 simplify form demo code 2016-11-02 18:08:48 +08:00
Benjy Cui
59805843e5 docs: merge mix demo into validate-other 2016-11-02 12:13:52 +08:00
Benjy Cui
d198c63a68 docs: update demo, close: #3673 2016-11-02 11:42:12 +08:00
Benjy Cui
7372893b8e docs: add demo for without Form.create, ref: #3594 2016-11-02 11:24:52 +08:00
Benjy Cui
1eb3d68656 docs: simplify demo 2016-11-02 10:47:50 +08:00
afc163
f40ba76ba7 Merge branch 'master' of github.com:ant-design/ant-design 2016-11-01 16:11:43 +08:00
afc163
7e73725c68 update form demo 2016-11-01 16:11:06 +08:00
Benjy Cui
29a732e3a9 docs: fix typo, close: #3672 2016-11-01 15:30:02 +08:00
Benjy Cui
60ecb3c628 refactor: each message should warn just once 2016-11-01 11:10:11 +08:00
Benjy Cui
048e3c9246 docs: update demo for time-relate controls 2016-11-01 10:11:02 +08:00
Benjy Cui
4b5353b457 docs: add demo for mapPropsToFields, close: #3493 2016-10-31 16:33:25 +08:00
Benjy Cui
037d739fa4 docs: update demo order 2016-10-31 15:42:57 +08:00
Benjy Cui
49e5bfa7ca docs: add demo for customized form control, close: #3585, ref: #3594 2016-10-31 15:03:48 +08:00
feng zhi hao
edb41f4420 update types in Tabs and FormItem (#3653)
* update types in Tabs and FormItem

* remove children prop in FormItem and Tabs
2016-10-31 13:15:13 +08:00
Benjy Cui
a7d335ec7a docs: update docs detail 2016-10-30 12:43:59 +08:00
Benjy Cui
2cb147f96d docs: should not expose prefixCls to developer 2016-10-30 10:40:33 +08:00
Wei Zhu
f8d2aeefc3 refactor: Replace react-addons-pure-render-mixin with rc-util/lib/PureRenderMixin (#3627) 2016-10-28 13:56:23 +08:00
Benjy Cui
52e3511192 docs: add demo for using time-related in form, close: #3610 2016-10-28 11:30:25 +08:00
Benjy Cui
d57827f87c fix: empty string should be treat as inexisting, close: #3613 2016-10-28 10:50:55 +08:00
Benjy Cui
7860d74725 docs: update advance search form demo, ref: #3558 2016-10-27 17:14:53 +08:00
Benjy Cui
55c22a7232 fix: style bug in slider 2016-10-27 11:57:46 +08:00
Benjy Cui
835dc2fb52 docs: update form in modal demo, ref: #3594 2016-10-27 11:44:45 +08:00
Benjy Cui
6bf99c1819 docs: update advanced search demo, ref: #3594 2016-10-27 10:26:12 +08:00
Benjy Cui
6cd841ef31 docs: add demo for registration, ref: #3594 2016-10-27 09:45:53 +08:00
Benjy Cui
7b76906924 docs: add normal login form, ref: #3594 2016-10-26 17:15:30 +08:00
Benjy Cui
3c49a90980 docs: update demo, ref: #3594 2016-10-26 16:42:57 +08:00
Benjy Cui
f599a24228 docs: update demo style 2016-10-26 15:33:45 +08:00
Benjy Cui
4878258f6c refactor: ref: #3490 2016-10-24 12:04:26 +08:00
Benjy Cui
6343e6b763 docs: update demo 2016-10-21 15:18:13 +08:00
Benjy Cui
1ed434a695 fix: should support Input[addon] in Form[inline], close: #3524 2016-10-21 15:04:55 +08:00
Benjy Cui
0aca663092 fix: should throw warning only once, ref: #3491 2016-10-21 11:17:59 +08:00
Benjy Cui
d5edcb9ef0 feat: support deep-level form control, close: #3212 (#3491) 2016-10-20 16:24:48 +08:00
Benjy Cui
3c99097bc8 fix: allow override fileNameProp, close: #3497 2016-10-20 11:28:05 +08:00
yiminghe
8afe3965c1 upgrade ts 2.0 2016-10-19 17:52:23 +08:00
afc163
9fe859a31f typo #3473 2016-10-19 11:29:14 +08:00
afc163
55c2223366 update form docs, #3473 2016-10-18 21:12:52 +08:00
yiminghe
58e0228e86 optimize getFieldProps warning 2016-10-18 12:22:26 +08:00
Albert Zheng
23dd825afd 【Please review】Fixes for supporting TypeScript 2.0.3 (#3439)
* Fixes for supporting TypeScript 2.0.3

* Fixes for supporting TypeScript 2.0.3. Issue is #3358
2016-10-18 11:55:00 +08:00
偏右
62a53e75b8 refactor: Downsize some style code (#3421)
* remove fieldset disabled style

* improve button style mixins
2016-10-14 09:12:10 +08:00
kvetoslavnovak
c9258fc483 Form controls - Eng. correction (#3381) 2016-10-12 11:04:59 +08:00
kvetoslavnovak
1dad6653c4 Mix - Eng. correction (#3382) 2016-10-12 11:04:52 +08:00
kvetoslavnovak
125331a023 Form validation - Translazion correction (#3387) 2016-10-12 11:03:49 +08:00
afc163
fd76b0cc6c fix long label overflow style 2016-10-07 14:34:25 +08:00
afc163
847e40eac0 Adjust site layout 2016-10-07 14:33:08 +08:00
Shawn Sit
4548b9521f update customized validation demo (#3242) 2016-09-30 12:11:13 +08:00
Benjy Cui
949907231b docs: udpate demo detail, close: #3111 2016-09-22 10:09:22 +08:00
afc163
44372760a1 update form demo style 2016-09-21 22:27:26 +08:00
afc163
1bd39692e9 adjust error message margin style in FormItem 2016-09-21 22:26:53 +08:00
Benjy Cui
bd7e9f00c0 style: update code style 2016-09-21 11:54:53 +08:00
Benjy Cui
3f67fd3f9f docs: update docs details 2016-09-21 11:28:38 +08:00
feng zhi hao
a4be70334d chore: fix some error declaration (#3099) 2016-09-21 09:27:58 +08:00
ddcat1115
3958eb4771 fix #3076 (#3086)
fix demolint
2016-09-20 13:49:38 +08:00
feng zhi hao
2cf5dc0046 chore: improve declaration (#3078) 2016-09-19 17:35:17 +08:00
Shawn Sit
7ce12fe36a doc: demo translation enhancement (#3033)
* doc enhancement

* keep chinese simplified demo
2016-09-18 14:30:37 +08:00
偏右
354759cb17 Redesigned icons (#3041)
* redesigned icons

* change iconfont content

* use same icons

* fix missing icons

* improve icon size
2016-09-18 09:54:47 +08:00
afc163
9e5061acdc Merge branch "1.x-stable" 2016-09-15 01:25:28 +08:00
马斯特
a25ec29fb8 refactor: 保证所有的tsx和less都正确使用prefix (#3024)
* refactor: extract prefix cls as less variable

* refactor: apply ant icon prefix cls in less files

* refactor: all components support prefixCls props
2016-09-14 16:18:33 +08:00
feng zhi hao
7a7395329b chore: 完善Form组件的声明 (#3043) 2016-09-14 16:07:28 +08:00
Benjy Cui
37e8474714 fix: withRef should work, close: #2843 (#2992) 2016-09-14 10:25:44 +08:00
afc163
be81b360fd Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-09-13 18:27:49 +08:00
afc163
0f986c07a2 update form index.md 2016-09-13 18:26:52 +08:00
ddcat1115
e19a0d500c fix: time-picker style, close #2973 (#3028) 2016-09-13 17:06:11 +08:00
Benjy Cui
8db2b79505 chore: fix compile errors 2016-09-13 15:31:29 +08:00
Benjy Cui
1dac1370de deps: replace obejct.omit with omit.js, close: #2988 (#2994) 2016-09-10 17:17:55 +08:00
Benjy Cui
44d5fc6fd2 fix: both of undefined and null means no input, close: #2959 2016-09-10 14:28:40 +08:00
Benjy Cui
090fb16c77 docs: update the doc of Form, ref: #2985 2016-09-10 10:05:26 +08:00
Benjy Cui
14fb2c78ba chore: remove deprecated code (#2920)
* chore: remove deprecated code

* chore: add warning for Breadcrumb
2016-09-09 13:55:46 +08:00
Benjy Cui
4026221d45 deps: hello moment (#2887)
* deps: upgrade TimePicker

* deps: upgrade DatePicker

* deps: upgrade Calendar

* fix: moment should work with LocaleProvider

* feat: update API of TimePicker

* feat: update Calendar's APIs

* feat: update DatePicker's APIs

* doc: update demo

* revert: add dateString and timeString and so on

* feat: add Calendar[defaultValue]

* feat: add defaultPickerValue

* docs: update docs about date picker

* feat: set moment locale to zh-cn automatically
2016-09-09 13:55:21 +08:00
afc163
bab669d17d Merge branch "1.x-stable" 2016-09-08 15:17:39 +08:00
Andrew Murray
0d00c5fb6c docs: Fixed typos (#2921) 2016-09-01 18:12:12 +08:00
afc163
7c99d5fb9e fix selector order, close #2916 2016-09-01 16:48:22 +08:00
Benjy Cui
5a4ebe535f deps: update rc-form and form's docs (#2873) 2016-09-01 11:48:38 +08:00
afc163
b798a228e6 Add less variables about outline 2016-08-31 17:04:24 +08:00
Benjy Cui
50c4367a15 docs: update docs for Form.Item, close: #2835 2016-08-25 13:54:53 +08:00
afc163
363f610d8b Fix tsc errors beside DatePicker 2016-08-24 16:09:55 +08:00
afc163
77949bb9e3 upgrade eslint-config, close #2811 2016-08-23 21:00:35 +08:00
Benjy Cui
5dcce12c2c fix: some tsc errors (#2804) 2016-08-22 17:26:14 +08:00
Benjy Cui
4e0ae95e1e chore: export form's interface 2016-08-19 16:53:27 +08:00
陆离
ff765002fa refactor: rewrite form and dropdown in ts (#2683) 2016-08-19 16:43:32 +08:00
afc163
da6b65f7f0 Merge 1.x-stable 2016-08-12 14:47:01 +08:00
afc163
8ae2936342 Fix nested Forms style 2016-08-10 14:38:35 +08:00
Marius Ileana
725ca31939 docs: Small correction (#2637) 2016-08-08 15:43:21 +08:00
ddcat1115
c9e26ecab9 docs: treeSelect translation (#2582) 2016-08-05 11:47:31 +08:00
Benjy Cui
4cf04c5799 docs: update form demo 2016-08-05 11:28:34 +08:00
Marius Ileana
6bb29a1774 docs: Review of form / demo / advanced-search-form.md (#2574) 2016-08-05 11:25:39 +08:00
Benjy Cui
7d9585377e feat: Form[vertical], close: #2449 2016-08-04 17:45:15 +08:00
afc163
d140108656 Fix typo
close #2602
2016-08-03 19:56:27 +08:00
Benjy Cui
5b5439208c docs: update docs for Form, ref: #2591 2016-08-03 10:55:15 +08:00
Benjy Cui
eaebebf425 docs: fix docs 2016-08-02 09:34:04 +08:00
Marius Ileana
23e5912384 docs: Review (#2573)
Please excuse any mistake. I just discovered this library the other day, I felt in love with it and I really like to contribute. :-)
2016-08-02 09:32:50 +08:00
Marius Ileana
be181a7cc7 docs: review of form / demo / form-in-modal.md (#2575) 2016-08-02 09:25:14 +08:00
Marius Ileana
40498e7f01 chore: small typo to form / Form.tsx (#2576) 2016-08-02 09:24:15 +08:00
Benjy Cui
e5e7a9ac33 docs: update documentation of form 2016-07-31 10:01:58 +08:00
Gray Choi
d07b73fec0 docs: translation of form (#2555) 2016-07-31 09:53:51 +08:00
afc163
57f08259db Merge 1.x-stable 2016-07-30 14:36:49 +08:00
Benjy Cui
1d2111db02 chore: add warning 2016-07-29 14:02:24 +08:00
afc163
71d74c30c1 Merge 1.x-stable 2016-07-29 13:57:54 +08:00
Benjy Cui
d1364ac038 feat: pass this.props.form as context automatically (#2534) 2016-07-29 11:18:31 +08:00
yeliex
14d6bd80da fix: label should align left when it occupy the whole line (#2517) 2016-07-28 08:39:03 +08:00
afc163
b8c64f8b6c Merge branch 'master' of github.com:ant-design/ant-design 2016-07-26 22:30:40 +08:00
afc163
0eeca99f02 Merge 1.x-stable 2016-07-26 22:20:33 +08:00
Benjy Cui
11660c128b docs: update demo, close: #1872 2016-07-25 16:08:18 +08:00
afc163
ca57794ae7 better implement for a2804cb 2016-07-25 14:03:56 +08:00
afc163
32ab285886 Merge branch '1.x-stable' 2016-07-24 13:49:42 +08:00
afc163
a2804cbff5 Make clear icon more clear 2016-07-21 20:57:44 +08:00
afc163
497cc1f65a improve FormItem colon (#2311) 2016-07-21 15:51:37 +08:00
afc163
1138b69c6d Merge branch 'master' of github.com:ant-design/ant-design 2016-07-21 14:40:11 +08:00
afc163
42d34a5db3 Merge branch '1.x-stable' 2016-07-21 14:34:37 +08:00
RaoHai
1ccfad13f7 Mention Component fix
- 现在只输入一个 @ 符号,dropdown 也会弹出。
 - 输入框失去焦点后,dropdown 会消失。
 - 添加受控模式示例
 - 添加 `getMentions(editorState: EditorState): Array<String>` Api,
   可以获取当前提到的人。
 - 添加了校验样式
 - 其他样式修正
2016-07-20 19:01:11 +08:00
afc163
e2cc2838fd Fix lesshint 2016-07-18 22:24:53 +08:00
afc163
2e41e35cc6 Fix more tslint problems 2016-07-13 17:22:23 +08:00
偏右
de359d2cf7 fix tslint problems (#2360) 2016-07-13 11:14:24 +08:00
afc163
6dad2b2987 Merge branch '1.x-stable' 2016-07-11 14:57:38 +08:00
afc163
8e9768fb4a Fix form button align 2016-07-10 17:04:03 +08:00
afc163
5856bb1b30 Fix key warning 2016-07-10 15:16:24 +08:00
afc163
158b594526 Merge branch '1.x-stable' 2016-07-09 17:46:11 +08:00
Benjy Cui
4a6ff6f053 fix: Form.Item should support responsive layout, close: #2305 (#2313) 2016-07-09 17:44:28 +08:00
yeliex
147e06a837 Add colon props to Form (#2311) 2016-07-09 15:10:07 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
afc163
d68d42f69b Merge 1.x-stable 2016-07-07 17:26:16 +08:00
yiminghe
c667144943 fix form warning
Conflicts:
	components/cascader/index.jsx
	components/form/index.jsx
2016-07-07 17:23:51 +08:00
yiminghe
3d9ae9833e fix form warning 2016-07-07 16:59:47 +08:00
afc163
487b40815f Merge 1.x-stable 2016-07-07 15:13:01 +08:00
afc163
e27d6c3097 Form react-unknown-prop (#2258) 2016-07-07 12:06:05 +08:00
afc163
b0c05e3f29 tweak style (#2234) 2016-07-06 17:54:05 +08:00
afc163
d280cba481 Merge 1.x-stable 2016-07-04 15:19:35 +08:00
Benjy Cui
d9b4eb4aa3 fix: add missing ant-row 2016-07-04 15:18:05 +08:00
Benjy Cui
766988735b docs: update demo 2016-07-04 15:17:42 +08:00
afc163
1f0c26b25a Fix label colon with whitespace: label="xx: " 2016-07-04 14:39:20 +08:00
Benjy Cui
0a73886a9c docs: update demo 2016-07-04 12:13:29 +08:00
Benjy Cui
df2f672dd9 fix: add missing ant-row 2016-07-04 11:29:56 +08:00
afc163
21fb73d4f2 Merge branch '1.x-stable' 2016-06-28 18:46:23 +08:00
afc163
4a40399522 fix feedback position 2016-06-28 18:32:03 +08:00
afc163
95351bfffa Merge branch '1.x-stable' 2016-06-27 19:31:38 +08:00
afc163
089f1ae512 update components category name 2016-06-27 18:21:12 +08:00
afc163
ef4c1a4749 Merge branch '1.x-stable' 2016-06-27 17:58:16 +08:00
afc163
0eaf940672 Fix Radio & Checkbox margin again 2016-06-27 17:22:03 +08:00
afc163
cc4cab5b1e Merge 1.x-stable 2016-06-23 23:11:14 +08:00
afc163
e50953390e update docs 2016-06-23 16:17:00 +08:00
yiminghe
9a0d751f94 refactor to typescript 2016-06-22 13:19:48 +08:00
Benjy Cui
5a4805d691 style: update code style to please lint 2016-06-19 10:57:28 +08:00
Benjy Cui
49b944617c style: update code style to please lint 2016-06-19 09:55:03 +08:00
afc163
ff8d855cc6 fix lints 2016-06-17 15:16:45 +08:00
afc163
2be1577b32 Improve demo code style 2016-06-16 22:18:00 +08:00
afc163
81276e43ea upgrade deps 2016-06-16 22:16:17 +08:00
偏右
09db9f2436 Revert "Remove react-addons-pure-render-mixin, use rc-util's PureRenderMixin instead" (#2074) 2016-06-16 22:06:06 +08:00
ddcat1115
fade8d7017 fix #1927 addon support Select (#2070) 2016-06-16 21:15:59 +08:00
afc163
06f472a728 improve auto colon of FormItem 2016-06-15 18:15:47 +08:00
Leon Shi
0f8855dff7 remove react-addons-pure-render-mixin, use rc-util's PureRenderMixin instead (#2055) 2016-06-15 16:57:06 +08:00
Benjy Cui
6c6496fae4 refactor: improve Form re-render performance 2016-06-12 10:15:59 +08:00
Benjy Cui
2144349741 style: enable react/jsx-closing-bracket-location 2016-06-06 13:54:10 +08:00
ddcat1115
4af2731f0c fix #1672 (#1936) 2016-06-06 11:40:54 +08:00
afc163
d4570fd6c3 fix missing ant-advanced-search-form styles 2016-06-06 11:34:38 +08:00
afc163
7d131a3b64 Remove colon and add it via FormItem, close #1877 2016-06-02 20:51:49 +08:00
afc163
7a72f4ad4e update form doc 2016-05-27 14:57:53 +08:00
afc163
9c28420468 Add TimePicker to Form demo (#1515) 2016-05-27 14:47:40 +08:00
ddcat1115
c4454dea04 fix #1771 2016-05-25 18:34:36 +08:00
afc163
15bb865037 Fix form detail style 2016-05-24 20:08:13 +08:00
afc163
dd33cb8f60 Move InputGroup style from Form into Input, close #1812 2016-05-23 20:09:25 +08:00
afc163
41a8c17b2b remove search-input from Form 2016-05-23 19:53:07 +08:00
afc163
b15ae59101 Fix lots of Form style 2016-05-19 15:21:48 +08:00
afc163
05c67d6f01 update input demo 2016-05-19 14:43:10 +08:00
Leon Shi
87e8cb7f5c Merge pull request #1722 from kagawagao/master
fix Form style bug
2016-05-18 21:00:25 +08:00
Benjy Cui
f15110e7c1 fix: Input[size] should be configurable, close: #1732 2016-05-18 11:41:57 +08:00
kagawagao
88d148ac98 fix Form style bug 2016-05-17 15:46:21 +08:00
Benjy Cui
8842d9342a site: update components' type 2016-05-16 15:41:55 +08:00
afc163
5b921b6960 Fix combobox focus style, close #1684 2016-05-13 23:16:59 +08:00
afc163
7b7f846161 Fix search input margin bug 2016-05-12 11:38:49 +08:00
yiminghe
2f81cc8111 update docs 2016-05-11 11:33:46 +08:00
Benjy Cui
ecaa6c56c3 style: enable comma-dangle 2016-05-11 09:32:33 +08:00
afc163
68b06eb688 update docs 2016-05-10 18:41:10 +08:00
afc163
5bcb23dd27 Fix feedback in form control, close #1619 2016-05-10 11:55:58 +08:00
afc163
72a1144c7e Fix input width, close #1559 2016-05-03 11:34:10 +08:00
afc163
c68f95c211 Merge branch master into develop-1.0.0 2016-04-29 17:26:21 +08:00
afc163
e9f083015e fix form demo (#1550) 2016-04-29 15:19:46 +08:00
afc163
03cb74ead5 upgrade eslint-config-airbnb version and fix some problems 2016-04-29 12:13:27 +08:00
afc163
96fd67ded0 remove old compatibility code 2016-04-28 17:18:36 +08:00
afc163
0ca6a1c24a css modularize (#1448)
* css modularize

* Add alert style

* Move more component style

* Move iconfont to common style

* Move layout style

* Move more component style

* Move all components

* Fix lots of mixin deps

* remove css-prefix from less

* fix a button icon style bug

* restructure

* fix index

* add dist

* fix jest

* fix some components style

* clean webpack config

* check more components style

* update tabs

* update scripts

* update scripts

* fix form style

* fix more style

* Fix select width

* Fix form and tabs style
2016-04-27 20:44:36 +08:00
afc163
ba2ef54900 Merge branch master into develop-1.0.0 2016-04-27 17:44:25 +08:00
afc163
0858413691 fix FormItem help and extra render 2016-04-27 17:02:50 +08:00
Leon Shi
baac12d1c4 fix lint (#1513)
* fix lint `prefer-stateless-function`

* fix lint `arrow-body-style`
2016-04-26 14:09:19 +08:00
afc163
c5831310ac Merge branch 'master' into develop-1.0.0 2016-04-25 16:31:46 +08:00
afc163
3789fda6ee fix lint 2016-04-25 16:31:32 +08:00
afc163
7426233425 remove unused code 2016-04-25 16:27:47 +08:00
afc163
5f75a63e8e Merge branch 'master' into develop-1.0.0 2016-04-25 16:26:59 +08:00
afc163
287c45292d fix color of form help text 2016-04-25 16:25:57 +08:00
Benjy Cui
0d7e92c056 docs: remove useless code in demo 2016-04-20 10:31:16 +08:00
afc163
8a9a1d2334 fix checkbox style 2016-04-15 23:34:40 +08:00
Benjy Cui
d0ad1b4b0a docs: update docs for Form 2016-04-12 17:08:01 +08:00
afc163
026d720aaf update form demo format 2016-04-12 16:12:13 +08:00
afc163
d39da4bfb7 Merge branch 'master' into develop-1.0.0 2016-04-12 16:09:13 +08:00
afc163
a9af1b3bc8 rollback for bad commit b3f519a
close #1392
2016-04-12 16:06:34 +08:00
Benjy Cui
10edd74f33 docs: update demos of Form 2016-04-12 15:18:57 +08:00
afc163
0a0d16ff61 Fix form input style 2016-04-12 14:55:02 +08:00
afc163
db0c909ccd Merge branch master into develop-1.0.0 2016-04-11 14:34:18 +08:00
afc163
95fabf0c00 update demo 2016-04-11 14:03:31 +08:00
Benjy Cui
59cb0a8fbb site: fix parse errors.. 2016-04-08 09:33:09 +08:00
afc163
e46d60cc2a Merge branch master into develop-1.0.0 2016-04-06 23:58:14 +08:00
afc163
378ba4b9af update form demo 2016-04-06 19:30:23 +08:00
afc163
fd850b9607 Add Input onPressEnter prop, ref #978 2016-04-06 18:12:41 +08:00
afc163
ba2b08b492 Fix layout responsive 2016-04-06 13:45:36 +08:00
afc163
b3f519ac52 update form style for advanced-search-form demo 2016-04-06 12:08:40 +08:00
afc163
e5c8179189 Merge branch master into develop-1.0.0 2016-04-06 11:57:17 +08:00
afc163
35b6618597 update form demo 2016-04-06 11:29:28 +08:00
afc163
910203a554 update form index.md 2016-04-06 11:29:06 +08:00
Benjy Cui
df3ba36720 docs: remove useless newline in documentation 2016-04-01 10:08:19 +08:00
Benjy Cui
d5a6932c15 docs: update documentation format 2016-03-31 14:17:09 +08:00
Benjy Cui
03d09b66e8 docs: update demo format 2016-03-31 09:40:55 +08:00
Benjy Cui
fd3406bd03 style: enable react/jsx-no-bind 2016-03-30 17:06:19 +08:00
afc163
c47fdeaf8f Merge branch 'master' into develop-1.0.0 2016-03-30 11:17:39 +08:00