mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-26 20:20:00 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity
11,047 Commits 18 Branches 731 Tags 417 MiB
1abe1517d8
Commit Graph

6460 Commits

Author SHA1 Message Date
D & R
10ab3f5187 fix flattenTree in Cascader (#8130) (#8136) 2017-11-08 15:56:58 +08:00
afc163
4790f84657 Fix AutoComplete and Input affix style conflict, close #8081 2017-11-08 15:11:57 +08:00
afc163
2d17d8a768 refactor edit-row demo, close #8026 2017-11-07 21:03:14 +08:00
Wei Zhu
e5a57ff60a Improve Select type definition 
Close #8128
 2017-11-07 17:33:09 +08:00
afc163
a99c8c7175 Fix snapshot 2017-11-07 11:12:10 +08:00
Wei Zhu
67fee48c6a Run test against multiple react versions 2017-11-07 10:51:25 +08:00
afc163
42e219389d Fix key warning 2017-11-07 10:48:05 +08:00
afc163
5e7c735935 Fix ts compile error 2017-11-06 22:20:54 +08:00
偏右
bdceb5f083
Review fix (#8125) 
* Fix style

* Fix style

* fix lint

* Fix more styles

* Fix more styles

* update snap
 2017-11-06 21:28:51 +08:00
afc163
2f0197599f Merge branch 'master' into antd-3.0 2017-11-06 21:19:44 +08:00
afc163
ac96bad478 Improve demo details and update snapshot 2017-11-06 21:14:40 +08:00
Wei Zhu
d6ace6663b Update snapshot 2017-11-06 19:00:36 +08:00
afc163
714b4ae06a Merge branch 'master' into antd-3.0 2017-11-06 10:35:41 +08:00
Benjy Cui
ffe36725d6 docs: remove duplicated APIs 2017-11-06 10:01:39 +08:00
kossel
92aa34c1b5 Feature antd 3.0/spinning indicator (#7977) 
* Added indicator props to Spin component

* Added indicator props to Spin component

* update snapshots

* fix defautl props

* revert some snapshot files
 2017-11-04 12:05:25 +08:00
Benjy Cui
de0493d82b docs: translate, ref: #8100 2017-11-03 15:02:26 +08:00
Josué
c00a2aabe2 docs: add missed time picker props (#8100) 
* Add missed time-picker props

* Update time picker docs for missed props
 2017-11-03 01:55:06 -05:00
afc163
59db56e953 Fix popupVisible of Cascader not working, close #8088 2017-11-03 13:03:54 +08:00
afc163
ca1b79ad34 Add Badge[offset] 2017-11-03 11:37:35 +08:00
Kyle Kelley
43864988e3 correct spelling of progress (#8101) 
`@process-default-color` --> `@progress-default-color`
 2017-11-03 09:43:02 +08:00
David Schneider
a5c3a6c930 In SliderProps type definition, replace void types with null. (#8102) 
With TypeScript compiler option ‘strictNullChecks’ enabled, the value `null` cannot be assigned to type `void`. This means, for instance, that it’s impossible to pass a `null` value for prop `step`. I don’t expect that substituting `null` for `void` in these type definitions should cause anyone difficulty; because these are optional props, a consumer of this component should be able to pass `null` or `undefined` safely, whether or not the compiler is using strict null checks.
 2017-11-03 09:40:56 +08:00
afc163
9b2c40cdd7 avoid triggering unmatch when unregister 2017-11-01 22:10:11 +08:00
afc163
05c56553a2 Fix gutter PropTypes 2017-11-01 21:40:47 +08:00
afc163
b4bd906bf0 Fix responsive grid gutter 2017-11-01 20:31:26 +08:00
afc163
dd8b6347c7 Fix enquire in server render 2017-11-01 19:08:16 +08:00
afc163
09c2df4093 Fix test case 2017-11-01 18:51:55 +08:00
afc163
692efefe31 Support responsively grid gutter 2017-11-01 18:33:41 +08:00
afc163
1c8fbb8899 update code style 2017-11-01 15:46:41 +08:00
afc163
bf82b4c49b Fix suffix of Input.Search 
close #7970
 2017-11-01 12:12:16 +08:00
Benjy Cui
51785aa6eb deps: upgrade TypeScript to 2.6, close #8018 2017-11-01 11:47:22 +08:00
afc163
81cf43905d Fix Alert backgroun and border color 2017-10-31 19:39:55 +08:00
afc163
3072aff31f Merge branch 'master' into antd-3.0 2017-10-31 18:47:39 +08:00
afc163
296dfc7375 vertical progressDot Steps style 2017-10-31 15:15:51 +08:00
Benjy Cui
b38c9c11a8 test: simplify snapshots for LocaleProvider 2017-10-31 14:55:53 +08:00
Wei Zhu
8c904de7d4 Add form wrappedComponentRef test 2017-10-31 01:33:56 -05:00
Benjy Cui
7ff7519207 fix: upgrade rc-form and refactor to be compatible with react@16 2017-10-31 01:33:56 -05:00
afc163
2a14b4667d Fix progress dot step style 2017-10-31 14:04:07 +08:00
afc163
7cc3e2c1cd Fix input checkbox or radio disappeared, ref #7974 2017-10-31 13:57:45 +08:00
翁润雨
58fe3277d8 add the 'selectable' attribute (#8048) 2017-10-31 13:57:45 +08:00
afc163
7c3a483190 Fix input checkbox or radio disappeared, ref #7974 2017-10-30 13:19:53 +08:00
Benjy Cui
70291d5514 chore: update size props order, ref: d12f247 2017-10-30 10:52:05 +08:00
afc163
d12f247e63 Fix api order 2017-10-29 15:40:50 +08:00
afc163
b61cb8f99e update select group title style 2017-10-29 14:21:00 +08:00
翁润雨
f64e24af8c add the 'selectable' attribute (#8048) 2017-10-28 19:39:33 +08:00
afc163
25a013a84b Fix snapshot 2017-10-28 15:23:46 +08:00
afc163
7537aa11d0 Fix input shadow in iOS safari, ref #7974 2017-10-28 15:08:39 +08:00
afc163
0908293c42 update TimePicker demo snapshot 2017-10-28 15:02:33 +08:00
afc163
23caba1b65 Upgrade rc-time-picker to 3.0.0 
Add `hourStep` `minuteStep` `secondStep`
 2017-10-28 15:01:54 +08:00
afc163
d96284c798 Merge branch 'master' into antd-3.0 2017-10-27 20:22:17 +08:00
vgeyi
8bde0c0fee Rewrite the MenuItem to handle ref for react 16 (#8037) 
* ReWrite MenuItem to remove ref warning for react 16

* unified coding style

* add removing semicolon
 2017-10-27 07:21:34 -05:00
nikogu
9696739a36 update Menu snapshots 2017-10-27 18:24:07 +08:00
nikogu
c664d843fb fixed: https://github.com/ant-design/ant-design/issues/8040 2017-10-27 17:40:31 +08:00
ddcat1115
b7a7758f37 try to fix ci 2017-10-27 16:33:24 +08:00
nikogu
5db04b6d4b update list grid padding bottom 2017-10-27 15:24:11 +08:00
ddcat1115
7acf29bc9c tweak Card style 2017-10-27 15:08:10 +08:00
afc163
fce4860243 Add Divider[dashed] prop 2017-10-26 21:00:20 +08:00
afc163
091b84008f update demo 2017-10-26 20:39:58 +08:00
afc163
099d5a0822 Tweak select arrow style 2017-10-26 19:39:04 +08:00
afc163
8f50324a94 Merge branch 'master' into antd-3.0 2017-10-26 19:34:11 +08:00
afc163
ad9809ec2e Fix extra padding of loading Card when it is too wide 2017-10-26 19:20:12 +08:00
afc163
11c3abb3aa Fix list border 2017-10-26 15:36:48 +08:00
afc163
c44f9528be Tweak list style 2017-10-26 15:07:01 +08:00
afc163
cbcc073aca Fix menu style 2017-10-26 13:38:18 +08:00
afc163
0e5155567c Fix menu active border 2017-10-26 11:59:18 +08:00
afc163
e2bff100bd Fix upload style 2017-10-26 11:59:18 +08:00
Benjy Cui
e5699aff68 fix: should not import moment while useless, close: #8013 2017-10-26 10:50:18 +08:00
Wei Zhu
bbb1a3a828 Merge branch 'master' into antd-3.0 2017-10-25 10:27:38 +08:00
Wei Zhu
36227a10db docs: sort api table 2017-10-25 10:25:44 +08:00
Wei Zhu
7776cf62a7 Merge branch 'master' into antd-3.0 2017-10-25 10:25:02 +08:00
Wei Zhu
f28d0d4d82 docs: Document onRowContextMenu 
close #7820
 2017-10-25 10:00:44 +08:00
afc163
35f1bf5f94 Fix mini size pagination style 2017-10-24 20:39:38 +08:00
For177
6d68d5d8fc Update index.zh-CN.md (#8002) 2017-10-24 04:31:12 -05:00
afc163
89a3b22791 Fix menu style 2017-10-24 15:56:28 +08:00
afc163
d8c9b77468 fix snapshot 2017-10-24 15:44:11 +08:00
afc163
2ef2925c8e update card and tabs style 2017-10-24 15:29:10 +08:00
Benjy Cui
67be1eafa9 test: fix CI 2017-10-24 14:08:39 +08:00
afc163
3c1b4da51e Fix autoprefix warning 2017-10-23 20:53:59 +08:00
afc163
9181db8a01 Fix autoprefix warning 2017-10-23 20:52:41 +08:00
afc163
43f5ed30ac Fix snapshot 2017-10-23 20:43:31 +08:00
afc163
c472ed27f8 Merge branch 'master' into antd-3.0 2017-10-23 19:40:14 +08:00
Wei Zhu
d829f6c008 docs: expandedRowRender can not be boolean 2017-10-23 11:21:05 +08:00
afc163
3f57d5f56d Merge branch 'master' into antd-3.0 2017-10-23 10:41:51 +08:00
Benjy Cui
ff5d05129f docs: translate 1599686 2017-10-23 10:37:31 +08:00
kossel
1599686fc2 docs: update docs for Modal, close #7840 (#7952) 2017-10-22 21:35:47 -05:00
朮厃
8e1cb081db Remove the inner shadow on iOS inputs. (#7974) 2017-10-23 10:05:53 +08:00
ddcat1115
c9bc8d7095 fix Upload ci 2017-10-22 23:36:27 +08:00
ddcat1115
12819130ec fix Table filter can't show after remove fixed setting. (#7962) 
* fix Table filter can't show after remove fixed setting.
close #7909

* improve
 2017-10-22 02:54:12 -05:00
afc163
8e09745def Fix #7969 2017-10-22 15:23:34 +08:00
afc163
86da4a95ce Fix lint 2017-10-21 20:06:12 +08:00
afc163
7286e6d0d0 Fix extra margin in sider Layout 
which is a margin collaspe problem

close #7967

ref: https://stackoverflow.com/a/33132624/3040605
 2017-10-21 15:12:56 +08:00
afc163
529f9fa933 use @heading-color again 2017-10-20 15:49:28 +08:00
afc163
ef443ad047 Merge branch 'master' into antd-3.0 2017-10-20 15:47:42 +08:00
syssam
f8b7aad53d less variable @form-vertical-label-padding, @form-vertical-label-margin, @input-padding-horizontal-base, @input-padding-horizontal-sm, @input-padding-horizontal-lg (#7886) (#7919) 2017-10-20 15:11:44 +08:00
afc163
3d6b142621 fix notification ci 2017-10-20 15:10:53 +08:00
Stephen Esser
88ed97b63d doc: Fix spelling mistake in Select demo (#7932) 2017-10-20 14:54:57 +08:00
Benjy Cui
7ea572bfc8 refactor: extract common locale logic (#7915) 2017-10-20 14:54:38 +08:00
afc163
3bc8f1ce5a Tweak form nested form style 2017-10-20 11:35:05 +08:00
vgeyi
d64ab68adb Cascade add prefixCls for child Input (#7945) 2017-10-19 21:55:06 -05:00
Zhang Zhi
7bc6aad1fd Update button code to make it more clearer (#7929) 
* remove unnecessary default value of 'size' prop

* `clicked` should be a state
 2017-10-19 21:52:06 -05:00
memoryza
cf397a27f0 update Breadcrumb readme (#7947) 
* update Breadcrumb readme

* update english
 2017-10-19 22:36:49 +08:00
afc163
a5aba1fc51 Tweak style 2017-10-19 20:58:16 +08:00
afc163
3bf9c8c4c5 fix tabs style 2017-10-19 20:33:22 +08:00
afc163
7ef4771ddf update style 2017-10-19 16:38:12 +08:00
afc163
43bf7c5595 update dark menu color 2017-10-19 16:07:39 +08:00
afc163
7c8702ec61 Tweak popover arrow style 2017-10-19 16:00:24 +08:00
afc163
ca3835bf58 Tweak progress dot step style 2017-10-19 14:52:11 +08:00
afc163
b2e2a83662 rollback popconfirm padding 2017-10-19 11:45:56 +08:00
afc163
a68dd71cff Tweak card background 2017-10-19 10:01:59 +08:00
ddcat1115
712637907d fix #7930 2017-10-18 23:52:54 +08:00
afc163
4ab7c648ce Fix upload loading 2017-10-18 21:30:48 +08:00
afc163
b51bc4a63a update card demo 2017-10-18 21:20:11 +08:00
afc163
ca0504da35 Add size="large" Tabs 2017-10-18 21:17:18 +08:00
afc163
91ffaea060 fix tag radius 2017-10-18 21:01:09 +08:00
afc163
009ba523d7 update @layout-body-background 2017-10-18 20:59:48 +08:00
afc163
f33b1a279a update style 2017-10-18 19:45:41 +08:00
afc163
f87a64316a update style 2017-10-18 19:41:44 +08:00
afc163
90e82f1cff Tweak timeline style 2017-10-18 17:42:00 +08:00
afc163
914fec9ac4 Tweak badge padding 2017-10-18 17:19:42 +08:00
偏右
ffffd0f4c5 Fix styles (#7924) 
* update demo

* Fix styles

* fix snap

* Fix back-top ci
 2017-10-18 17:16:14 +08:00
Benjy Cui
d0b08cd2ea test: fix CI 2017-10-18 16:55:12 +08:00
afc163
a9073988ec Merge branch 'master' into antd-3.0 2017-10-18 14:07:53 +08:00
Nekron
5017234381 doc: fix spelling mistakes in dropdown demo (#7912) 2017-10-17 11:20:33 -05:00
niko
70491fe4ad fixed https://github.com/ant-design/ant-design/pull/7733 (#7914) 2017-10-18 00:05:10 +08:00
afc163
e7eb8693b6 Fix snap 2017-10-17 21:32:01 +08:00
afc163
c2e91d3b22 update some demo 2017-10-17 21:03:23 +08:00
afc163
ad4d5ce18a Fix dragger background 2017-10-17 20:56:29 +08:00
afc163
0b5f770fec fix card loading margin style 2017-10-17 17:01:26 +08:00
afc163
825e088d45 Fix switch text font size 2017-10-17 15:22:53 +08:00
afc163
f74252b9de Fix input height in AutoComplete 2017-10-17 15:21:35 +08:00
afc163
43d8c6ad37 Fix input height in AutoComplete 2017-10-17 15:19:38 +08:00
afc163
c5ffc3b4f0 Fix upload and badge styles 2017-10-17 15:01:21 +08:00
afc163
274985d320 fix button margin inside 2017-10-17 15:01:21 +08:00
afc163
31132d1b5b Tweak checkbox margin 2017-10-17 15:01:21 +08:00
afc163
5f37d9df24 doc: fix expandedRowRender type, close #7901 2017-10-17 15:01:21 +08:00
nikogu
f8f3e0f936 list update pagination margin top 2017-10-17 14:17:20 +08:00
Benjy Cui
7841386fcd fix: should close panel when click presetted ranges, close: #7747 2017-10-17 13:57:39 +08:00
afc163
f26217b36f Tweak checkbox margin 2017-10-17 11:06:25 +08:00
afc163
b80d705a2d Add @timepicker-item-height 2017-10-16 21:52:15 +08:00
afc163
161f0800d3 fix ci 2017-10-16 21:38:14 +08:00
afc163
fda3f6ddcd doc: fix expandedRowRender type, close #7901 2017-10-16 21:22:16 +08:00
afc163
dfb3b4136b Fix snap 2017-10-16 21:15:53 +08:00
afc163
91a64d0567 Tweak styles 2017-10-16 21:12:49 +08:00
afc163
00bfa49031 Merge branch 'master' into antd-3.0 2017-10-16 20:45:25 +08:00
afc163
2a34866e83 update layout demo 2017-10-16 20:39:53 +08:00
afc163
9dfde961f3 Fix time-picker demo 2017-10-16 20:29:49 +08:00
afc163
19324e3360 update calendar demo 2017-10-16 20:12:21 +08:00
afc163
26e416c364 Tweak style 2017-10-16 19:56:04 +08:00
afc163
fe44e33689 Tweak tag styles 2017-10-16 16:13:35 +08:00
afc163
e2c4ad3ba7 More preseted colors of tag 2017-10-16 15:38:34 +08:00
afc163
14a58c9960 Tweak input addon background 2017-10-16 14:49:32 +08:00
Wei Zhu
e6b1ba6a28 Mock requests 2017-10-15 17:34:03 +08:00
afc163
11ff9e0d6a Add snapshot for new locale 2017-10-14 14:49:44 +08:00
Mohamed Seada
fa315e9f6d Add new locale (ar-EG: Arabic Egypt) #3 (#7888) 
* Add new locale (ar-EG: Arabic Egypt)

* resolve snapshot testing problem

* Add new locale (ar-EG: Arabic Egypt) to docs
 2017-10-14 14:30:54 +08:00
vgeyi
0a6475cb0d Badge add scrollNumberPrefixCls (#7882) 
* badge add scrollNumberPrefixCls

* badge add scrollNumberPrefixCls
 2017-10-14 14:29:18 +08:00
Kiho · Cham
31d1ce91f7 feat: duration argument is optional (#7874) 2017-10-14 14:28:57 +08:00
niko
58089c7832 [WIP] List: update english docs (#7880) 
List: update english docs
 2017-10-12 22:40:49 -05:00
afc163
94c6c910ff Merge branch 'master' into antd-3.0 2017-10-12 20:07:31 +08:00
afc163
9ddbad1088 Unify menu item height 2017-10-12 18:14:23 +08:00
niko
57d5038d1c fixed: https://github.com/ant-design/ant-design/issues/4905#issuecomment-335710078 (#7875) 2017-10-12 05:09:37 -05:00
偏右
43362de756 Fix beforeUpload will stop uploading when return (#7870) 
value is undefined

it should be same as rc-upload
 2017-10-12 14:48:35 +08:00
niko
48847e14e0 fixed react-virtualized demo scroll position when other demo element has changed (#7866) 2017-10-12 14:09:38 +08:00
偏右
b77cc6392e Improve upload status test case (#7869) 
* Add some companies

* test: generate snapshot in upload onChange

* change action

* upgrade travis node version

* fix ci
 2017-10-12 14:09:17 +08:00
Alexander Suevalov
35b2c5e58f Adding missing optional Upload property to LocaleProviderProps (#7862) 2017-10-11 07:13:39 -05:00
afc163
efe0f3480a Merge branch 'master' into antd-3.0 2017-10-11 18:13:39 +08:00
afc163
3f54dbd3d2 document dropdown menu 2017-10-11 17:42:36 +08:00
afc163
1ef4cc277b Fix select item padding 2017-10-11 16:56:52 +08:00
Benjy Cui
0bce5c83f9 deps: upgrade rc-notification to support react@16 (#7844) 2017-10-11 12:03:19 +08:00
偏右
9053192ae9 Fix component style (#7848) 
* fix components style

* fix snapshot

* update travis node version

* change upload action in ci
 2017-10-11 12:01:27 +08:00
afc163
b0381a6ce4 fix icons, ref #7854 2017-10-11 10:44:26 +08:00
afc163
b174331be4 Fix hasFeedback icon overlap 
close #7854
 2017-10-11 10:44:26 +08:00
afc163
43659752d2 Fix hasFeedback icon overlap 
close #7854
 2017-10-11 10:37:45 +08:00
niko
b4ed4e6d3f Improve List Component 
fixed: https://github.com/ant-design/ant-design/issues/4905#issuecomment-332442843
 (#7853)
 2017-10-11 10:29:45 +08:00
afc163
278ae9b9c7 Fix upload ci 2017-10-11 10:18:02 +08:00
afc163
064afd9b85 fix upload ci 2017-10-11 09:54:13 +08:00
afc163
163366deeb Merge branch 'master' into antd-3.0 2017-10-10 21:52:48 +08:00
偏右
2b7a60224b Fix upload ci (#7849) 
* Fix upload test case

* update delay time for uploading status
 2017-10-10 21:48:21 +08:00
afc163
244a2fd2da update locale-provider snap 2017-10-10 20:15:41 +08:00
afc163
fd7c90fb5a update upload snap file 2017-10-10 20:02:35 +08:00
afc163
6aa4138c00 Fix test warning 2017-10-10 20:01:23 +08:00
afc163
8feaf83003 fix upload test 2017-10-10 19:54:52 +08:00
afc163
190bebd65f Fix upload snapshot 2017-10-10 19:54:38 +08:00
afc163
5a5bb9c3a0 Fix upload snapshot 2017-10-10 19:54:05 +08:00
afc163
87ec78ce2e Merge branch 'master' into antd-3.0 2017-10-10 17:11:26 +08:00
afc163
b437233467 Fix upload picture loading style 2017-10-10 16:23:25 +08:00
Benjy Cui
e5edb4ac0f test: update snapshot 2017-10-10 16:06:49 +08:00
afc163
c3f1d0bba6 Add test case for upload 2017-10-10 15:59:13 +08:00
Wei Zhu
0d572c72a9 Add test for 9a5894c 
9a5894c46e
 2017-10-10 14:45:18 +08:00
afc163
d3b98d311a Merge branch 'master' into antd-3.0 2017-10-10 14:09:03 +08:00
Wei Zhu
9f0091dcd3 Expose slick methods (#7759) 
https://github.com/ant-design/ant-design/issues/7484
 2017-10-10 13:41:04 +08:00
afc163
712451acf7 Fix codepen demo 2017-10-10 11:35:50 +08:00
Benjy Cui
91fc781b6c chore: update docs and code style, ref: #7553#issuecomment-335009581 2017-10-10 10:04:03 +08:00
Wei Zhu
a3c3ec8070 Fix types and lint 2017-10-09 21:03:00 +08:00
Bastian Sieker
d4c75d43a1 Fix notification ArgsProps typing (#7834) 
* Fix notification ArgsProps typing

close #7832

* Improve notification ArgsProps typing

see #7832

* Improve notification ArgsProps typing

see #7832
 2017-10-09 19:58:30 +08:00
afc163
9a5894c46e data should be call when beforeUpload promise resolved, close #7833 2017-10-09 19:41:52 +08:00
Wei Zhu
c5487ad1eb React 16 + Enzyme 3 2017-10-09 19:18:04 +08:00
afc163
89c507c4ba pink => magenta 2017-10-09 18:26:11 +08:00
afc163
934c4c0de1 finish whole color pallate 2017-10-09 18:24:12 +08:00
afc163
a1c17f3006 update colors 2017-10-09 16:17:30 +08:00
afc163
9c3c88d3cc Fix focused cascader error style 2017-10-09 13:47:24 +08:00
afc163
73a4873e78 Fix focused cascader error style 2017-10-09 13:46:56 +08:00
afc163
b544e3aef8 update snapshot 2017-10-09 13:37:45 +08:00
afc163
4eb9d5ef56 Merge branch 'master' into antd-3.0 2017-10-09 13:33:59 +08:00
afc163
942ea41b02 update snapshot for new jest 2017-10-09 13:32:11 +08:00
afc163
475e4ff23d upgrade eslint-config-airbnb 2017-10-09 13:27:35 +08:00
afc163
8c0875239e update form demo 2017-10-09 11:13:03 +08:00
afc163
c9768e1099 tweak form item margin 2017-10-09 11:09:25 +08:00
ravirambles
8ccd02139c update row to remove implicit any (#7803) 2017-10-08 22:14:31 +08:00
afc163
a4a0816e5a code indent 2017-10-08 17:58:42 +08:00
afc163
cf788d7b4d Fix TransferProps targetKeys inside Form decorator, close #7807 2017-10-08 15:25:13 +08:00
afc163
95c72958ca Fix AutoCompelete layout, close #7800 2017-10-08 15:22:24 +08:00
afc163
054444f619 Merge branch 'master' into antd-3.0 2017-10-07 15:34:19 +08:00
afc163
31d0c3a49d Fix @link-hover-decoration, close #7821 & #7531 2017-10-07 15:31:25 +08:00
Graeme Yeates
2e2acb5be9 Support customizing layout footer background (#7818) 2017-10-06 16:09:33 +08:00
Ffloriel
873c85cec8 Add missing disabled property (#7805) 
- add missing disabled property on the switch documentation page
 2017-10-06 16:09:19 +08:00
Remo Zumsteg
40b18343c7 Add missing forceRender to TabPaneProps (#7801) 2017-10-03 11:02:45 +08:00
OuYancey
88220df0fb docs: update render result in Button (#7802) 2017-10-03 11:02:35 +08:00
Ffloriel
6d4e531775 form typo (#7794) 
- remove to from 'shouldn't to use' and 'shouldn't to call'
 2017-10-01 19:37:37 +08:00
afc163
185b3b1e9a Fix FormItem error with react-hot-loader, close #7775 2017-10-01 13:29:17 +08:00
afc163
7a8a1a8ee3 Merge branch 'master' into antd-3.0 2017-09-30 21:31:29 +08:00
afc163
76a972e062 Fix AutoComplete snapshot 2017-09-30 21:22:11 +08:00
afc163
76a30a7686 Fix props passing of AutoComplete, ref #7742 2017-09-30 21:17:49 +08:00
afc163
1a505e8fb0 Merge branch 'master' of github.com:ant-design/ant-design 2017-09-30 00:04:50 +08:00
Jeffrey Carl Faden
9ab9e62308 Add inputPrefixCls for Search component (#7770) 2017-09-30 00:04:19 +08:00
afc163
819e55e968 update snap 2017-09-29 23:10:27 +08:00
niko
9dc4102cdd fix: should trigger onChange before beforeUpload 2017-09-29 03:52:16 -05:00
afc163
25771bed77 Tweak radio style 2017-09-29 11:45:01 +08:00
Graeme Yeates
47e3cedf86 Minor fixes for select and form en docs (#7769) 
* Fix headers on form validateFields [ci skip]

* Include default as an option for select sizes [ci skip]
 2017-09-29 10:54:37 +08:00
nikogu
09addde73c Merge branch 'master' into antd-3.0 2017-09-28 17:56:36 +08:00
ddcat1115
3b6dc3f3c4 revert wrong code removing fd40643c2d 2017-09-28 17:28:49 +08:00
ddcat1115
70ff604b81 swap unicode of menu-fold and menu-unfold 2017-09-28 15:00:37 +08:00
Wei Zhu
9b68ce020c docs: fix table 2017-09-28 14:26:01 +08:00
nikogu
901ceb2507 Merge branch 'master' into antd-3.0 2017-09-28 09:54:29 +08:00
偏右
2bced36f0c New component styles (#7731) 
* Tweak button padding

* upgrade input and button size

* update form controls size

* update components size

* Add lemon color and update rate color

* Add new icons

* update layout style

* breadcrumb and dropdown

* update menu arrow width

* update layout and menu

* update steps

* fix var name

* update cascasder style

* Update DatePicker

* update InputNumber and Mention

* radio and switch

* select and transfer

* TimePicker & Upload

* more components

* calendar and list

* Tree Timeline Popover Tag

* divider modal popover

* update search input

* update card style

* update switch disabled opacity

* update shoadow and mask

* Add v2-compatible-reset.less

* Fix undefined className

* update snahshotssssssssssssssssss 👻
 2017-09-27 22:32:49 +08:00
afc163
b4bf7198e7 Card noHovering => hoverable 2017-09-27 21:57:55 +08:00
Amorites
e17c8e093e Update index.zh-CN.md (#7755) 2017-09-27 21:15:05 +08:00
afc163
caec11c03a Fix snapshot 2017-09-27 20:21:28 +08:00
afc163
a3c7d6611c Merge branch 'master' into antd-3.0 2017-09-27 20:13:44 +08:00
afc163
ca255cc547 Tweak AutoComplete input line height 2017-09-27 20:13:01 +08:00
jayberg
4acadc47b5 Avoid circular reference with infinite children (#7742) 
Because {element} is a child of <InputElement>, we get a circular reference when also adding "element.props" to <InputElement>, as <InputElement> will be cloned to <{element}> within InputElement.tsx. As a consequence, we get an infinitive circular loop of Element->Props->Children->Element->Props->Children->Element->Props->Children->…

React seems to detect and automatically fix this infinitive loop. But when using the smaller and faster Inferno as a replacement library of React, we get a "RangeError: Maximum call stack size exceeded".

This commit fixes this bug by not attaching {...element.props} to <InputElement>.

All tests did pass and I did not notice any changes in the behaviour of the AutoComplete component. But now, AutoComplete works also with Inferno and not only with React.
 2017-09-27 20:09:04 +08:00
afc163
d7eca4e151 Fix table's filter dropdown style 2017-09-27 20:03:26 +08:00
nikogu
7899dcf299 update snapshots 2017-09-27 15:03:22 +08:00
delesseps
a8cab96c13 Add maxLength attribute to Input (#7744) 2017-09-27 09:57:23 +08:00
delesseps
2730344ff7 Add maxLength attribute to Input (#7744) 2017-09-27 09:56:30 +08:00
afc163
7bfe6878dd fix snapshot 2017-09-27 09:56:03 +08:00
Benjy Cui
829b5f87bf feat: make default locale to enUS (#7553) 
* feat: make default locale to enUS

* test: fix CI

* docs: update getting started
 2017-09-26 23:12:47 +08:00
afc163
4719309bd7 Merge branch 'master' into antd-3.0 2017-09-26 16:29:57 +08:00
niko
c64f46c217 List optimize (#7736) 
* add split props
* add size props
* add footer & header props
 2017-09-26 16:11:35 +08:00
778758944
4e726fdfd7 修复disabledTime interface定义错误 (#7740) 2017-09-26 16:11:28 +08:00
转二
73000a226b Merge branch 'antd-3.0' of github.com:ant-design/ant-design into antd-3.0 2017-09-25 23:42:47 +08:00
转二
60feaebd54 docs: Update 's document. 2017-09-25 23:42:31 +08:00
afc163
8127d3b579 Fix Duplicated Animate 2017-09-25 23:12:16 +08:00
afc163
f9754c8a25 Merge branch 'master' into antd-3.0 2017-09-25 23:10:42 +08:00
afc163
9f017bc5ae Fix mention error style 2017-09-25 22:53:11 +08:00
afc163
ccf507b603 update mention demos 2017-09-25 22:42:07 +08:00
afc163
420c2666a9 docs: add chinese description for dateRender 2017-09-25 22:16:30 +08:00
ChaXinyu
14e2a56b75 export components interface (#7654) 
* export components interface

* export specific props

* fix formItem missed import
 2017-09-25 22:14:49 +08:00
Henri Normak
36a54a8a8c Expose renderDate function for DatePicker (#7710) 
* Expose renderDate function for Calendar dates

* Use the original prop name
 2017-09-25 22:10:26 +08:00
afc163
b7aee09758 Fix dropdown menu group title style 2017-09-25 21:35:56 +08:00
afc163
ca8ff1c27a Fix column sorter icons style 2017-09-25 21:35:56 +08:00
afc163
f545e52ec5 Fix dropdown menu group title style 2017-09-25 21:28:00 +08:00
afc163
8026020dd4 Fix column sorter icons style 2017-09-25 21:24:43 +08:00
转二
42fc8bc2a5 Merge branch 'antd-3.0' of github.com:ant-design/ant-design into antd-3.0 2017-09-25 21:13:35 +08:00
转二
20dae8f33e feat: Add option for component: 'mention' 2017-09-25 21:12:43 +08:00
afc163
2ebf70013b Merge branch 'master' into antd-3.0 2017-09-25 20:03:40 +08:00
afc163
463a5db9ba Fix transfer checkbox padding 2017-09-25 20:03:04 +08:00
thegatheringstorm
10f6907da4 Fix: Upload Use object destructuring instead of creating temporary references for onRemove. (#7726) 2017-09-25 18:15:36 +08:00
afc163
7cc386df52 Merge branch 'master' into antd-3.0 2017-09-25 17:01:02 +08:00
afc163
3118e2898e Fix broken small pagination via #7634's fix 2017-09-25 16:59:56 +08:00
niko
91b97d7b25 List virtualized (#7692) 
* add virtualized & infinite demo
* change `children render` to `renderItem`
 2017-09-25 15:24:16 +08:00
afc163
ca06211494 Fix small steps font size 2017-09-25 11:27:49 +08:00
afc163
306a5699a7 Better responsive Steps 2017-09-25 11:25:57 +08:00
afc163
7a7b18032c use @screen-md 2017-09-25 11:18:26 +08:00
afc163
fd40643c2d Remove unused code 2017-09-25 11:12:59 +08:00
afc163
3eb4937fd4 Remove unused code 2017-09-25 11:12:38 +08:00
afc163
6507aefd8e Merge branch 'master' into antd-3.0 2017-09-25 10:54:49 +08:00
Zheeeng
d8c1bdb3ab Fix: setting 'heigh: 100%' on Sider and the wrapped element can't take the desired effects (#7716) 2017-09-23 18:33:26 +08:00
afc163
89a6aa96ed Tweak input placeholder color, close #7365 2017-09-23 18:21:33 +08:00
afc163
df1b1f5a47 Add @checkbox-size, close #7368 2017-09-23 18:18:47 +08:00
afc163
c9069dfdf6 Merge branch 'master' into antd-3.0 2017-09-23 16:50:14 +08:00
afc163
dd22bae0fc Fix button loading style with icon, close #7709 2017-09-23 16:08:30 +08:00
afc163
f111855b8c fix tslint 2017-09-23 15:21:11 +08:00
afc163
6ad3fe5200 fix rc-animate 2017-09-23 15:11:02 +08:00
Sanjay Kumar
1dc4e45bce Bugfix: Handle defaultSearchChange when suggestions contain ‘Nav’ items (#7701) 2017-09-22 23:51:59 -05:00
afc163
8b1a4f80a9 Fix TreeSelect extra input text, close #7703 2017-09-23 12:11:17 +08:00
afc163
91bbcd6f2c Fix broken anchor, close #7712 2017-09-23 12:06:23 +08:00
Aske Ertmann
27b8e39666 Make iconfont usable standalone (#7713) 
Similar to motion.less, import all dependencies needed to generate iconfont.less by itself.
 2017-09-23 12:01:21 +08:00
afc163
3bd0b94228 Merge branch 'master' into antd-3.0 2017-09-22 21:53:39 +08:00
afc163
2170b401bf fix form animation 2017-09-22 21:50:14 +08:00
afc163
31ca08c2b4 Remove extra update 2017-09-22 21:48:31 +08:00
afc163
7cfd9b2bcb Remove extra update 2017-09-22 21:47:28 +08:00
afc163
af7f0c3777 Merge branch 'master' into antd-3.0 2017-09-22 20:36:13 +08:00
afc163
c66062edb4 Fix input compact style 2017-09-22 20:35:30 +08:00
afc163
776beaee05 Fix cursor height in safari 2017-09-22 20:17:04 +08:00
afc163
412d7eebba Merge branch 'master' into antd-3.0 2017-09-22 18:37:08 +08:00
afc163
e7ccdfef74 Improve card variables 2017-09-22 18:34:31 +08:00
偏右
8b3ef51c4f New colors (#7661) 
* New colors

* use yellow color for rate

* change font colors

* use non-transparent color
 2017-09-22 18:33:43 +08:00
偏右
759b0bb821 seperate reset styles (#7682) 
* seperate reset styles

* not reset ul/ol/p/heading

* revert reset.less idea

* move label style into ant-form-item, #5851

* revert reset.less idea

* update base.less

* Better typography from bootstrap@4

use reboot replace normalize

ref:
b4d84b9cdf/scss/_reboot.scss

close #6162
 2017-09-22 18:33:29 +08:00
afc163
c2e9abddc7 Fix Card extra postion when no title 2017-09-22 15:28:27 +08:00
delesseps
c419a1ddef Remove autoComplete restriction to allow more complex auto-filling behaviour (#7699) 2017-09-22 13:35:26 +08:00
delesseps
bb411517cf Remove autoComplete restriction to allow more complex auto-filling behaviour (#7699) 2017-09-22 13:31:48 +08:00
Marco Afonso
81435e2798 feat: add Portuguese locale (#7449) 
* Add pt_PT Locale

* Adding pt_PT Locale (fix comma)

* Adding pt_PT Locale to docs

* Add pt_PT locale to tests

* Update imports for rc-pagination and rc-calendar

* Add pt_PT Locale

* Adding pt_PT Locale (fix comma)

* Adding pt_PT Locale to docs

* Add pt_PT locale to tests

* Update imports for rc-pagination and rc-calendar

* Add pt_PT to tests
 2017-09-21 21:02:01 -05:00
Kirill Stiopin
49080aa01d fix: update for Dutch locale-provider: added missing translations (#7694) 2017-09-21 20:57:52 -05:00
afc163
3d1914f45b Fix valid selector error of form, close #7693 2017-09-21 21:07:21 +08:00
afc163
df69320fc2 Fix arrow position 2017-09-21 20:43:13 +08:00
afc163
3cdb06fe70 Fix Tree showLine style 2017-09-21 18:16:53 +08:00
afc163
27e4f1b658 Fix Tree showLine style 2017-09-21 18:15:10 +08:00
afc163
acc4061eeb Tweak align problems 2017-09-21 18:13:36 +08:00
afc163
f8c5849bfa update snapshot 2017-09-21 14:57:50 +08:00
afc163
b7632c3ee7 Merge branch 'master' into antd-3.0 2017-09-21 14:18:53 +08:00
afc163
afce275d25 refactor code style 2017-09-21 14:16:01 +08:00
Yang Bin
39993fc749 docs: modify "tar bar" to "tab bar" in table Tab API (#7683) 2017-09-20 21:06:53 -05:00
Meow-z
e165b8a705 fix: model (#7675) 
add confirmLoading in async model state.
 2017-09-20 09:22:53 -05:00
afc163
00973fdb72 Fix card tabs wrap bug 2017-09-20 21:56:56 +08:00
afc163
2f7b75562c Merge branch 'master' into antd-3.0 2017-09-20 17:13:32 +08:00
afc163
635a0548de Tweak input compact layout, close #7662 2017-09-20 16:46:37 +08:00
afc163
30abcdf992 Fix table head height, close #7663 2017-09-20 15:42:31 +08:00
afc163
1b7b172f44 Tweak button font-weight and text size 2017-09-19 20:24:47 +08:00
Benjy Cui
f46a87d3e0 fix: should use fixedNode's height to reset placeholder, close: #2349 2017-09-19 16:31:37 +08:00
afc163
fe7c85fece Merge branch 'master' into antd-3.0 2017-09-19 16:12:18 +08:00
feng zhi hao
58fd54e978 fix: Table not trigger custom selection onSelect when hideDefaultSelections is true (#7653) 2017-09-18 20:56:19 -05:00
hauwa123
acd3a8f4d2 docs: update Timeline english doc (#7652) 
Fixed typos
 2017-09-19 00:46:09 +08:00
nikogu
d1bb0b3634 Change List Spin size. 2017-09-18 17:37:13 +08:00
Kaien Liao
b2aea45b4f fix: Checkbox props definition (#7649), close: #7650 2017-09-18 15:40:25 +08:00
Benjy Cui
bd19b0892c docs: add missing Tabs.TabPane[forceRender], ref: #6459 2017-09-18 11:05:43 +08:00
Khalifa Lame
5a8bd0f6d8 docs: update Tooltip english doc (#7642) 
Fixed typos.
 2017-09-18 10:28:22 +08:00
Khalifa Lame
f3c35941ec docs: update Table english doc (#7643) 
Fixed typos.
 2017-09-18 10:28:05 +08:00
Khalifa Lame
a3d4b753b9 docs: update Tab english doc (#7644) 
Fixed typos.
 2017-09-18 10:27:49 +08:00
Khalifa Lame
fab83990c2 docs: update Tag english doc (#7645) 
Fixed typos.
 2017-09-18 10:27:35 +08:00
nikogu
abf18b9ec4 merge master 2017-09-18 10:13:48 +08:00
afc163
43d14f8517 upgrade rc-slider, improve accessibility 2017-09-17 17:42:24 +08:00
Wei Zhu
047f62e9b4 Mark refs to private (#7600) 2017-09-17 15:48:44 +08:00
爱but的苍蝇
644891f8f6 add Table scroll typings (#7640) 2017-09-17 15:44:01 +08:00
afc163
c5f56b9db3 optimize TextArea autosize animation 2017-09-17 13:48:16 +08:00
afc163
30c437c83e Fix simple pagination style, close #7634 2017-09-16 13:20:35 +08:00
Khalifa Lame
429a9714d5 Update Avatar English doc (#7627) 
fixed typos.
 2017-09-16 11:29:51 +08:00
Khalifa Lame
81e3429955 Update Badge English doc (#7628) 
* Update Badge English doc

Fixed typos.

* Update index.en-US.md

Reverted some changes after studying the component.
 2017-09-16 11:29:38 +08:00
Khalifa Lame
05fbdd0959 Update Calendar English doc (#7629) 
Fixed typos.
 2017-09-16 11:29:05 +08:00
Khalifa Lame
a4637526b9 Update Card English doc (#7630) 
Fixed typos.
 2017-09-16 11:28:18 +08:00
Khalifa Lame
11c0683baa Update Carousel English doc (#7631) 
Fixed typos.
 2017-09-16 11:27:46 +08:00
Khalifa Lame
eb663f0084 Update Collapse English doc (#7632) 
Fixed typos.
 2017-09-16 11:27:15 +08:00
Khalifa Lame
fdfb4ba843 Update Popover English doc (#7633) 
Fixed typos.
 2017-09-16 11:26:22 +08:00
afc163
b59d776554 Merge branch 'antd-3.0' of github.com:ant-design/ant-design into antd-3.0 2017-09-15 22:53:43 +08:00
afc163
0a3f6822f6 Fix zIndex types, ref #7624 2017-09-15 22:51:55 +08:00
afc163
ea2c113530 Fix zIndex types, ref #7624 2017-09-15 22:51:03 +08:00
afc163
823e07bc75 Merge branch 'master' into antd-3.0 2017-09-15 21:44:39 +08:00
afc163
11a6cd51a2 Fix zIndex types, close #7622 2017-09-15 21:41:32 +08:00
afc163
641f1ddeeb Add link 2017-09-15 21:37:17 +08:00
afc163
6236641c74 Fix broken collapsed MenuGroup, close #7109 2017-09-15 20:37:11 +08:00
偏右
dab6f43c02 Feat search enter button (#7620) 
* Add enterButton for Input.Search

close #7596

* update snapshot
 2017-09-15 17:03:43 +08:00
Wei Zhu
250c7a9c68 Revert "Mock rc-trigger" 
This reverts commit 9d2c91598b.
 2017-09-15 16:42:25 +08:00
Wei Zhu
9d2c91598b Mock rc-trigger 
Ref #5522
 2017-09-15 16:14:26 +08:00
delesseps
174c98cdca Add focus and blur support to InputNumber (#7615) 
* Add focus support to InputNumber

* Convert string ref to private ref

* Added blur method and fixed linting
 2017-09-15 15:47:06 +08:00
afc163
ea5ccce90d Merge branch 'master' into antd-3.0 2017-09-15 11:16:19 +08:00
afc163
9df6e06d70 fix lint 2017-09-15 11:14:22 +08:00
afc163
5ac468167d Fix title and extra content position of narrow card 
close #7604
 2017-09-15 10:57:08 +08:00
afc163
b36df9da2b update tree controlled demo 2017-09-15 10:57:07 +08:00
Wei Zhu
6acf6fc643 Use snapshot test for grid 2017-09-15 10:56:00 +08:00
Wei Zhu
2437ca419e Use snapshot test 2017-09-15 10:50:45 +08:00
Wei Zhu
579becd894 Update snapshot 2017-09-15 10:03:46 +08:00
afc163
eb62c44564 Fix #7587 2017-09-15 09:55:00 +08:00
afc163
9e319990d2 update snapshot 2017-09-14 18:09:30 +08:00
afc163
ae87b663bf Tweak tree demo 2017-09-13 22:18:44 +08:00
afc163
89ce2254af Improve tree node loading icon position, close #7584 2017-09-13 22:17:13 +08:00
afc163
77d64971e5 Refactor tree loadData demo 2017-09-13 22:06:53 +08:00
afc163
461470ebc6 fix demo snapshot 2017-09-13 19:43:05 +08:00
afc163
9b715f0b90 Fix form demo, close #7547 2017-09-13 18:03:56 +08:00
Mitchell Demler
298a60f13b chore: add validateFirst to fieldDecorator options (#7573) 2017-09-13 14:49:59 +08:00
afc163
2e8e9ccf61 Merge branch 'master' into antd-3.0 2017-09-13 14:29:01 +08:00
afc163
f321596e04 Revert empty style of table 
ref #7142

close https://github.com/react-component/table/issues/163
 2017-09-13 14:26:02 +08:00
jljsj
aea18c3627 add padding !important, restore menu retraction animate 
Conflicts:
	components/menu/style/index.less
 2017-09-12 16:51:17 +08:00
jiang
2570ba8fe6 Menu anim (#7567) 
* update menu icon animate

* add padding !important, restore menu retraction animate

* update dropdown arrow
 2017-09-12 16:46:33 +08:00
afc163
b24483545c Merge branch 'master' into antd-3.0 2017-09-12 09:41:51 +08:00
Stefan Paunovic
0ac7ccaa8f feat: add is_IS locale (#7561) 2017-09-12 09:10:42 +08:00
Bilal Sirazitdinov
5bb45279bb chore: GetFieldDecoratorOptions missing property - normalize (#7562) 2017-09-12 09:08:47 +08:00
afc163
bb2c2036ba update button size demo 2017-09-11 15:29:23 +08:00
Wei Zhu
c2031f701c Document Select[firstActiveValue] 2017-09-11 12:00:15 +08:00
Wei Zhu
8369557322 Add remove warning comment (#7510) 2017-09-11 11:58:38 +08:00
afc163
33a71eb8fb Fix #7555 2017-09-11 11:46:09 +08:00
Khalifa Lame
ed84626f01 docs: update Popconfirm English doc (#7541) 
Fixed typos.
 2017-09-11 11:08:53 +08:00
Khalifa Lame
aa3458deb6 docs: update Notification English doc (#7539) 
Fixed numerous typos and inconsistencies.
 2017-09-11 11:08:34 +08:00
Khalifa Lame
b381f1f5ec docs: update Modal English doc (#7537) 
Fixed several typos.
 2017-09-11 11:08:18 +08:00
Khalifa Lame
643b32d0d3 Update Progress English doc (#7540) 
Fixed minor typos.
 2017-09-11 10:13:21 +08:00
Khalifa Lame
b475ac55f6 Update Spin English doc (#7542) 
Fixed some typos.
 2017-09-10 21:49:37 +08:00
Khalifa Lame
594dce8f87 Update Message English doc (#7538) 
Fixed typos.
 2017-09-10 21:47:02 +08:00
Khalifa Lame
ac95d1aea4 Update Alert English doc (#7536) 
Minor edits.
 2017-09-10 21:40:07 +08:00
Xiaohan Lee
d490a027bb Docs: update docs for Table's undocumented apis (#7525) 
* onRowMouseEnter
* onRowMouseLeave
 2017-09-10 21:38:25 +08:00
ddcat1115
66a89df91f fix #7475 (#7535) 2017-09-10 13:50:21 +08:00
afc163
b216a44b28 Fix Slider typings, close #7532 2017-09-10 02:32:00 +08:00
afc163
37c8c4ed30 Fix @link-hover-decoration not working, close #7531 2017-09-09 13:58:18 +08:00
afc163
35fc427630 Fix inlineCollapsed menu when submenu is opened 
close #7524

close #7514

ref #7063
 2017-09-09 00:58:15 +08:00
afc163
2feef3358c Fix transfer lazy doc, close #7520 2017-09-09 00:00:24 +08:00
afc163
7bee69a9df Merge from master 2017-09-08 16:49:58 +08:00
afc163
dbc4e684df Make popover title height more flexible 2017-09-08 16:47:04 +08:00
afc163
f7cc779c5d Hide pagination options when screen is small 2017-09-08 15:32:10 +08:00
afc163
13a11d6fc3 update default font-size 2017-09-08 15:32:10 +08:00
Benjy Cui
070b2696ba chore: remove hacks for IE8-, close: #7447 (#7512) 2017-09-08 13:08:46 +08:00
Benjy Cui
30745da52e docs: update typo, close: #7427 2017-09-08 10:12:34 +08:00
Khalifa Lame
a2eb54b1ae docs: update Dropdown English doc (#7442) 
Fixed typos
 2017-09-08 10:09:11 +08:00
Wei Zhu
8c0c6ecf6e refactor: upload string refs to callback (#7496) 2017-09-08 09:46:22 +08:00
Khalifa Lame
421feb1c84 docs: update Pagination English doc (#7494) 
Fixed typos.
 2017-09-08 09:45:56 +08:00
Wei Zhu
5a474709ff refactor: tooltip string refs to callback (#7493) 2017-09-08 09:45:34 +08:00
Khalifa Lame
fa1547df84 docs: update Menu English doc (#7465) 
* Update Menu English doc

Fixed typos.

* Update Menu English doc

Accidentally replaced noop with none in previous commit. Now reverted.
 2017-09-08 09:45:01 +08:00
Wei Zhu
a85447f993 refactor: popover string refs to callback (#7492) 2017-09-08 09:44:29 +08:00
Wei Zhu
5c766b1f99 refactor: popconfirm string refs to callback (#7491) 2017-09-08 09:44:05 +08:00
Khalifa Lame
224e65fc27 docs: update Breadcrumb English doc (#7490) 
Fixed minor typos.
 2017-09-08 09:43:43 +08:00
Wei Zhu
4664e36fa4 refactor: input string refs to callback (#7489) 2017-09-08 09:43:21 +08:00
Khalifa Lame
1746e1f0d7 docs: update Grid English doc (#7487) 
Fixed several typos.
 2017-09-08 09:42:08 +08:00
Wei Zhu
32b7a3f752 refactor: carousel ref strings to callback (#7486) 2017-09-08 09:41:14 +08:00
Khalifa Lame
0a583afc5c docs: update Affix English doc (#7488) 
Fixed minor typos.
 2017-09-08 09:40:40 +08:00
Wei Zhu
825a3d5e95 refactor: anchor string refs to callback (#7483) 2017-09-08 09:37:20 +08:00
Wei Zhu
581ddb2b49 refactor: affix string refs to callback (#7482) 2017-09-08 09:31:07 +08:00
afc163
072d860f8a Fix empty style of small table with fixed columns 
close #7509
 2017-09-07 21:08:05 +08:00
WingGao
ace985afce Update upload/interface.tsx (#7507) 
`response` should be `any`
 2017-09-07 15:12:13 +08:00
afc163
3195cc182c Fix steps styles 2017-09-07 11:00:36 +08:00
afc163
fe12d8d579 Merge branch 'master' into antd-3.0 2017-09-06 21:44:47 +08:00
afc163
b8f6185abc Fix simple pagination style, close #7500 2017-09-06 21:44:26 +08:00
afc163
c7d6ce5d3f Fix Card.Grid broken style 
https://gw.alipayobjects.com/zos/rmsportal/ZHuiCHkDSxOZZmZSbmXD.png
 2017-09-06 21:14:16 +08:00
afc163
5724a55c7b Merge branch 'master' into antd-3.0 2017-09-06 20:22:55 +08:00
afc163
bceed31da4 update form demo snap 2017-09-06 20:18:48 +08:00
afc163
94283b730f Fix validateStatus styles of some Form Controls, close #7498 2017-09-06 20:17:20 +08:00
afc163
16b2cc044e validating status should has feedback icon always, #7498 2017-09-06 19:58:04 +08:00
afc163
7d619dfbd7 update snapshot for #7495 2017-09-06 19:39:46 +08:00
niko
bceb15c4e6 List:add infinite & detail optimize (#7445) 
* List:add infinite & detail optimize

* React.children.map -> context

* update snapshots & demo order

* remove Item.Action _id

* update List demo

* List:add infinite & detail optimize

* React.children.map -> context

* 更新 snap

* update snapshots
 2017-09-06 15:53:25 +08:00
afc163
78f2b0aa5d update snapshot 2017-09-06 14:29:10 +08:00
afc163
121898001d update snapshot 2017-09-06 14:28:20 +08:00
afc163
dac447a57d Merge branch 'master' into antd-3.0 2017-09-06 14:15:09 +08:00
afc163
e9a592a9c8 Fix inlineCollpasd and openKeys issue 2017-09-06 14:14:34 +08:00
afc163
786f5cd7e0 improve side current menu demo 2017-09-06 13:59:44 +08:00
afc163
696b4252a8 tweak collpse animation easing 2017-09-06 13:46:45 +08:00
afc163
78c1bebd7a Merge branch 'master' into antd-3.0 2017-09-06 13:43:00 +08:00
afc163
ab6620f1f1 Fix WeekPicker style, #3825 2017-09-06 13:18:43 +08:00
afc163
68ff1b6ff0 fix progressDot Steps style 2017-09-06 13:15:47 +08:00
Benjy Cui
59193ef34a Revert "Patch 1 (#7471)" 
This reverts commit 9667ec17bd.
 2017-09-06 09:46:58 +08:00
偏右
a933961aae upgrade rc-steps to 3.0 (#7473) 
* upgrade rc-steps to 3.0

* update snapshot
 2017-09-05 19:57:59 +08:00
kuang
9667ec17bd Patch 1 (#7471) 
* default value error 

f10a2abbd8/src/Modal.tsx (L53)

* default value error
 2017-09-05 19:07:57 +08:00
afc163
68139cdbda Add some icons 2017-09-05 17:13:46 +08:00
Khalifa Lame
f48cf1df90 docs: update Steps English doc (#7463) 
Added code tags to string values.
 2017-09-05 16:50:27 +08:00
Khalifa Lame
112aaed5fb docs: update Layout English doc (#7461) 
Fixed typos.
 2017-09-05 16:48:23 +08:00
afc163
cdac7cd28a fix demo snapshot 2017-09-05 16:35:05 +08:00
afc163
0f778d2a4a Merge from master 2017-09-05 16:19:34 +08:00
afc163
8cc1943b77 test: update snap 2017-09-05 15:58:49 +08:00
afc163
cb1e0bfe8e Fix table empty data scroll style 
close #7457
 2017-09-05 15:57:34 +08:00
afc163
8d517a9647 Fix submenu hover style 2017-09-05 11:34:13 +08:00
afc163
6654a4220d Fix submenu hover style 2017-09-05 11:31:00 +08:00
Khalifa Lame
8551b706cf Update Card English doc (#7440) 
Fixed typo
 2017-09-04 21:02:03 +08:00
Khalifa Lame
ec2322a906 Update Icon English doc (#7441) 
Fixed small typo.
 2017-09-04 21:01:48 +08:00
Khalifa Lame
5510d12ce8 docs: update Input English doc (#7439) 
Fixed some typos
 2017-09-04 15:24:08 +08:00
Khalifa Lame
8271b5d069 docs: update Button English doc (#7438) 
Fixed some typos. Added ghost button type.
 2017-09-04 15:23:42 +08:00
Khalifa Lame
99a998afb5 docs: update Table english doc (#7432) 
Fixed numerous typos
 2017-09-04 10:47:37 +08:00
Wei Zhu
35229e55b1 Update snapshot for 9423609 2017-09-03 22:38:21 +08:00
afc163
9423609243 Tweak collapse style 2017-09-03 18:24:22 +08:00
afc163
07dfac18f7 Tweak table small border style 2017-09-01 18:30:47 +08:00
afc163
7b56d7248f Fix conditional rendering of Timeline.Item, ref #6530 2017-09-01 17:06:30 +08:00
afc163
668cec2f9e Fix FormItem focus behavious, close #7351 2017-09-01 15:17:04 +08:00
Wei Zhu
1547b889b7 Revert "Add support for table default sort order" (#7414) 2017-09-01 14:40:29 +08:00
Wei Zhu
bac4d04844 docs: typo 2017-09-01 11:35:30 +08:00
Wei Zhu
ad3e49e397 docs: Add backfill to AutoComplete 2017-09-01 11:33:11 +08:00
afc163
882ae31199 Fix menu inlineCollapsed under uncontrolled Sider, close #7409 2017-09-01 10:38:53 +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
afc163
a204c0afa2 restore default cursor, close #7410 2017-09-01 10:04:25 +08:00
偏右
f3911b3707 Feat week picker (#7404) 
* New Component WeekPicker

close #212

* Add WeexPicker in API doc

* update snapshot

* Add test cases

* update snapshot
 2017-08-31 20:44:22 +08:00
Ricardo Raphael Joson
bedfb180a8 Update index.en-US.md (#7403) 2017-08-31 17:13:28 +08:00
偏右
81f16cb2e0 Merge pull request #7400 from ant-design/feature-2.13 
Feature 2.13
 2017-08-31 16:02:04 +08:00
afc163
a3e723648b upgrade react-slick to 0.15.0 2017-08-31 12:20:10 +08:00
afc163
a0a1bff7fe Use real count as badge title 2017-08-31 10:55:25 +08:00
niko
75518241d6 List optimize (#7391) 
* change spin size to large

* fixed list loading
 2017-08-30 15:16:48 +08:00
afc163
843d82f6bd fix demo sanpshot 2017-08-30 14:24:47 +08:00
afc163
90c1dfc5c0 fix demo sanpshot 2017-08-30 14:22:18 +08:00
afc163
9547fe5bc4 fix demo sanpshot 2017-08-30 14:21:20 +08:00
afc163
81048aafb2 Improve itemRender of Pagination 2017-08-30 14:03:37 +08:00
nikogu
e4860bfac0 update snapshots again 2017-08-30 13:51:27 +08:00
afc163
96dd7132e8 Merge branch 'master' into feature-2.13 2017-08-30 13:22:38 +08:00
nikogu
0a9e28226b update snapshots 2017-08-30 11:53:46 +08:00
nikogu
33c41e97f7 List: change padding bottom 2017-08-30 11:45:47 +08:00
niko
44f63ae010 change list border color (#7390) 2017-08-30 10:30:23 +08:00
afc163
56b6fc38d7 fix sider layout min height 2017-08-29 23:58:27 +08:00
afc163
3ceda311b6 menu cannot be selectable in dropdown defaultly 2017-08-29 19:55:09 +08:00
afc163
7fed87f835 doc: fix undocumented selectable prop of Menu 2017-08-29 19:45:13 +08:00
John Nguyen
6c509f9712 adds selectable prop to typescript file (#7384) 2017-08-29 19:42:55 +08:00
afc163
c23afb05d0 Fix test case 2017-08-29 19:41:59 +08:00
afc163
fe09eec9aa improve empty cell style 2017-08-29 17:55:50 +08:00
afc163
f2fe374a18 Improve spin transition delay 2017-08-29 16:40:28 +08:00
afc163
2bedd6b0e6 Improve spin transition delay 2017-08-29 16:39:29 +08:00
afc163
429cdb448d Fix RangePicker text overlap 2017-08-29 15:08:55 +08:00
afc163
a5733f5de3 Fix RangePicker text overlap 2017-08-29 15:08:06 +08:00
John Nguyen
3b6ea67115 adds className to DropDown component" (#7378) 2017-08-29 13:27:38 +08:00
Leo
fc8f533e67 fix ts checking (#7355) 
* add title prop to Option component(for ts checking)

* fix Checkbox onChange type
 2017-08-29 08:58:51 +08:00
XBTop1!
a5b0848efe doc: add disableCheckbox property for TreeSelect (#7370) 2017-08-29 08:35:49 +08:00
afc163
5a971b24ad Merge from master 2017-08-27 19:32:02 +08:00
afc163
1e48ec0c6a Merge branch 'master' into feature-2.13 2017-08-27 19:31:09 +08:00
afc163
a94e3ab3e0 Add test case for empty table 2017-08-27 17:30:29 +08:00
afc163
6527f9cdb0 More elegant empty style for fixed-columns Table 
close #7298

close #7142
 2017-08-27 17:30:29 +08:00
偏右
742999ff28 Fix matchMedia not present in jest test (#7344) 
close #6560

close #3308

close #7341
 2017-08-27 16:53:36 +08:00
afc163
d84452e8b8 Fix snapshot generate, close #7318 2017-08-27 16:07:07 +08:00
偏右
a7200c906c Add hideDefaultSelections (#7342) 
close #7295
 2017-08-27 15:44:22 +08:00
afc163
7e2d456453 Fix ci 2017-08-27 14:43:23 +08:00
afc163
8f6c0d8fc9 Fix snapshot 2017-08-27 14:12:42 +08:00
afc163
53ffc83d23 Fix snapshot 2017-08-27 14:10:29 +08:00
afc163
ef8beaffde Merge from master 2017-08-25 22:51:14 +08:00
afc163
21f375b7d7 update TreeSelect doc 2017-08-25 17:20:43 +08:00
ddcat1115
83a02a6050 fix demo (#7327) 2017-08-25 16:37:00 +08:00
afc163
6dade37aec update doc 2017-08-25 14:54:54 +08:00
afc163
3d322a7c04 Tweak tooltip background and fix basic demo 2017-08-25 10:11:22 +08:00
afc163
0d26b4c972 doc: update Upload API description 2017-08-24 18:37:26 +08:00
XuMM_12
35bc4726a9 Fix Checkbox Group disabled status (#7266) (#7296) 2017-08-24 12:56:25 +08:00
ddcat1115
aa9f97dfda Merge remote-tracking branch 'origin/master' into antd-3.0 2017-08-24 10:45:02 +08:00
afc163
c355eae6d1 Fix node test 2017-08-24 10:05:55 +08:00
afc163
61aac68028 doc: remove new key way 2017-08-24 09:44:17 +08:00
ddcat1115
b10f7726c3 Merge remote-tracking branch 'origin/master' into antd-3.0 2017-08-23 23:12:38 +08:00
ddcat1115
0d4baf302d 调整卡片样式 (#7286) 
* 调整卡片样式

* improve
 2017-08-23 19:02:27 +08:00
afc163
44319bec11 active the selected item should be highlighted 2017-08-23 18:16:52 +08:00
Ziluo
f04f340fa1 doc:update link of react-blocks (#7299) 2017-08-23 16:36:07 +08:00
Ziluo
fc884242d8 doc:update link of react-blocks (#7299) 2017-08-23 16:34:15 +08:00
afc163
72f7232929 Add test cases for Card and Breadcrumb 2017-08-23 16:29:56 +08:00
afc163
8bdad3d418 update less code style 2017-08-23 13:57:01 +08:00
Tao
62b72d6c51 modify 参数 to 方法 (#7294) 
* modify `参数` to `方法`

* modify `Property` to `Method`

* dummy copy-paste
 2017-08-23 13:25:44 +08:00
afc163
ac5bdc6983 doc: update select description 2017-08-23 13:17:43 +08:00
Benjy Cui
2268418a97 docs: add docs for validateFields, close: ##7287 2017-08-23 11:13:01 +08:00
afc163
94709bf968 Merge branch 'master' into antd-3.0 2017-08-22 18:37:51 +08:00
afc163
a51a37cbd8 tweak detail of inline collapse menu 2017-08-22 18:37:08 +08:00
Benjy Cui
2620318172 feat: support controlled panels for DatePicker and RangePicker, close: #5190 (#7049) 2017-08-21 21:15:44 +08:00
niko
56f0716b03 List: support responsive (#7272) 
* List: support responsive

* change grid api for responsive & use card responsive function

* abstract getGrid

* update snapshots

* defind grid columns number

* defind grid columns number

* add ListGridType
 2017-08-21 21:14:20 +08:00
afc163
2d9b374a76 Merge branch 'antd-3.0' of github.com:ant-design/ant-design into antd-3.0 2017-08-21 21:05:41 +08:00
afc163
dc7dfd38c6 Merge from master 2017-08-21 21:02:57 +08:00
afc163
1fdce5db28 Fix tabs snapshots 2017-08-21 21:02:09 +08:00
afc163
50bdbbda40 Add multiple demo for TreeSelect 2017-08-21 18:08:41 +08:00
afc163
84e561b237 Fix removing wrong item when uid is 0, close #7269 2017-08-20 15:39:25 +08:00
山客
ac07dcefb0 Update Table Document (#7268) 
Fix syntax errors(markdown table).
 2017-08-20 15:15:38 +08:00
afc163
d4171badfd Merge from master 2017-08-19 12:40:40 +08:00
偏右
3b59a03c00 New component divider (#7261) 
* Add Divider

* use Divider in table demos

* update demo instruction

* upgrade snapshots
 2017-08-19 12:39:11 +08:00
afc163
fcb935b101 improve form doc 2017-08-19 12:12:57 +08:00
lihqi
6624805ad4 Update index.en-US.md (#7259) 2017-08-18 19:19:10 +08:00
lihqi
5bf94956e4 Update index.zh-CN.md (#7258) 2017-08-18 19:19:02 +08:00
afc163
c28c2f6b1e Merge branch 'master' into antd-3.0 2017-08-18 19:18:26 +08:00
afc163
f56e1a7de7 Fix InputNumber id ts type, close #7257 2017-08-18 18:17:06 +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
afc163
e00bfdc150 Make Input with addons same default width 100% with Input 2017-08-18 12:09:17 +08:00
afc163
988e12f54b tweak some font weight 2017-08-17 22:10:40 +08:00
afc163
187e9dd85c tweak step number font 2017-08-17 21:51:25 +08:00
afc163
fc11c69d3f Make Input with addons same default width 100% with Input 2017-08-17 18:13:06 +08:00
afc163
b84b17d981 Merge branch 'master' into antd-3.0 2017-08-17 18:03:28 +08:00
afc163
b216597cfd Fix card grid bug 2017-08-17 17:20:28 +08:00
LeezQ
d329d191dd docs: interface define error (#7241) 
fix: interface Properties should be separated by semicolons
 2017-08-17 16:24:18 +08:00
lvren
a93cb09e15 将sider收起时的宽度变量放到themes中控制 (#7238) 2017-08-17 16:09:04 +08:00
Benjy Cui
e061ada71a test: fix CI 2017-08-17 15:33:26 +08:00
Benjy Cui
9abce572a4 fix: notification.xxx shoud not affect defualtPlacement, close: #5895 2017-08-17 15:23:47 +08:00
Benjy Cui
26d746bd8f fix: should support child.ref in AutoComplete, close: #6814 (#7237) 2017-08-17 13:09:18 +08:00
afc163
01d4acb7a9 Attach more events for Affix display 2017-08-17 11:45:46 +08:00
afc163
fe3af14273 Remove exported SelectPropTypes and fix undefined exports, close #7222 2017-08-17 09:57:23 +08:00
Ramsés Moreno
20ea524ef1 fix: corrections in the Spanish locale (#7234) 
* Corrections in the Spanish locale. In Spanish, the only uppercase letter in a sentece is the first letter and not in every word. Some othe minor changes.

* Corrections in the Spanish locale. In Spanish, the only uppercase letter in a sentece is the first letter and not in every word. Some othe minor changes.
 2017-08-17 09:36:52 +08:00
afc163
ea92bbf371 fix snap 2017-08-16 22:04:16 +08:00
afc163
f61f811432 Fix sider width transition in IE11 
close #6349
 2017-08-16 21:46:09 +08:00
afc163
70e10dee59 Fix transition width of sider trigger 2017-08-16 21:46:09 +08:00
jiang
7a5e11c799 fix: tabs show scroll anim and tag anim ease (#7218) 
* fix: tabs show scroll anim and tag anim ease

* update snapshot
 2017-08-16 21:05:52 +08:00
偏右
2dedc5ec7f Upgrade grid break points (#7230) 
close #5122
 2017-08-16 20:19:41 +08:00
Benjy Cui
e0bf1cefe7 fix: disabled of Dropdown, ref: #7102 2017-08-16 17:56:07 +08:00
Benjy Cui
1f652bfe4c fix: event.target of Button's click event, close: #7034 2017-08-16 17:43:56 +08:00
Benjy Cui
bee3c43e7a fix: Timeline with only one child should work, close: #7214 2017-08-16 17:31:53 +08:00
afc163
b0da6adf8c Improve responsive of Steps 2017-08-16 16:07:57 +08:00
afc163
ad6dbcb9c6 Fix button in DatePicker 2017-08-16 15:38:12 +08:00
afc163
53640c3f18 update menu API doc 2017-08-16 14:27:22 +08:00
afc163
f0c6350e0e update select demo 2017-08-16 10:38:03 +08:00
afc163
cf3c0aac43 Fix focused style of disabled Pagination button 2017-08-16 09:54:10 +08:00
afc163
9c925d7c9b fix snap 2017-08-15 23:09:45 +08:00
afc163
2318cd47a4 Merge from master 2017-08-15 22:50:00 +08:00
afc163
8dfb44ba72 update card snapshot 2017-08-15 22:36:48 +08:00
afc163
f46112d385 refactor card extra style 2017-08-15 22:34:48 +08:00
afc163
59b11f3b48 Tweak button insert space logic 2017-08-15 20:08:00 +08:00
nikogu
4e68750777 List: remove noHovering prop 2017-08-15 19:57:44 +08:00
nikogu
8ed6883d70 List: change noHovering default true 2017-08-15 17:36:51 +08:00
nikogu
ecef5887b6 merge master 2017-08-15 17:26:56 +08:00
niko
600d589617 fixed some list style bug (#7177) 
* fixed some list style bug

* add cursor:pointer to hover style

* fixed hover style
 2017-08-15 17:25:14 +08:00
afc163
1f6bcf963f tweak progress initial style 2017-08-15 16:48:49 +08:00
afc163
749b6e7242 Tweak table sorter style 2017-08-15 15:14:02 +08:00
Stefan Paunovic
7d8c7d72b7 feat: add sr_RS locale (Serbian) (#7201) 2017-08-15 09:24:30 +08:00
乐仪
314c095fbf Merge remote-tracking branch 'origin/master' into antd-3.0 2017-08-15 00:13:40 +08:00
afc163
57e3be2c32 Fix select popupContainer in site header 2017-08-14 22:57:45 +08:00
乐仪
cd6b017ce5 fix ts error 2017-08-14 22:25:17 +08:00
ddcat1115
1c518c3d97 Card improve & bugfix (#7204) 
* Card improve & bugfix

* update snap
 2017-08-14 21:43:32 +08:00
nikogu
0034d0529c add list grid 2017-08-14 11:09:22 +08:00
偏右
a59bcf7e90 change noHovering to true defaultly (#7178) 2017-08-14 09:52:16 +08:00
Mitchell Demler
293d63910a Fix type definition for Card Component. (#7196) 
React.Component requires two parameters. The second parameter (State) is now optional in a more recent version of @types/react however upgrading to this has several major/breaking changes elsewhere. I would prefer to explicitly define State as `{}` in this case.
 2017-08-14 09:44:44 +08:00
afc163
f6d349731c Fix innerSlider of react-slick, close #7191 2017-08-13 14:52:29 +08:00
Zheeeng
754966991b Rename File interface to UploadFile (#7183) 
* Fix doc missing info

* Rename File interface to UploadFile
 2017-08-12 13:56:57 +08:00
Mars Wong
1e80254059 doc: add missing API for Cascader (#7187) 2017-08-12 13:56:42 +08:00
nikogu
7d49cc18a9 Merge branch 'master' into feature-2.13 2017-08-12 11:16:33 +08:00
Eden Wang
e633f91c27 Disabled Dropdown is showing Menu on hover (#7102) 
* disabled dropdown is showing menu on hover

* fix cr error

* update snap

* update document
 2017-08-11 23:55:36 +08:00
afc163
11f9459738 update snapshot 2017-08-11 22:14:16 +08:00
afc163
1651015688 fix card doc, ref #7185 2017-08-11 20:21:16 +08:00
afc163
592653c2ad fix card type tabs className, close #7185 2017-08-11 19:59:55 +08:00
afc163
711703b91e update bootstrap 3 link 2017-08-11 19:08:09 +08:00
Xiaohan Lee
c23c0a6b16 Update docs for Table.render and Upload.onChange (#7180) 
* Docs: fix invalid link in docs of Table.render

* Docs: add link for "onChange" in docs of Upload.onChange
 2017-08-11 17:05:58 +08:00
jiang
22ef7d1147 add form explain animate (#7172) 2017-08-11 17:05:25 +08:00
afc163
f689ede0fa The collapse trigger of Sider should be fixed and upon menus 
close #7161
 2017-08-11 16:10:17 +08:00
Zhang Zhi
30e4fa8a8d Remove Button's redundent code (#7176) 2017-08-11 15:06:35 +08:00
Zheeeng
fdc8d357ef Fix doc missing info (#7175) 2017-08-11 12:39:26 +08:00
afc163
c79592cf05 Fix select demo 2017-08-11 10:44:13 +08:00
afc163
af9dc73eef Fix collapse arrow position in IE9/10/11 2017-08-11 10:32:16 +08:00
Zheeeng
d6dde83247 Fix typo (#7170) 2017-08-11 09:30:19 +08:00