Commit Graph

1435 Commits

Author SHA1 Message Date
血诺
0c3432fd35 fix className concat 2015-11-12 21:28:02 +08:00
afc163
8a62a4d009 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-12 19:12:25 +08:00
afc163
6382a14519 do not show title when there is no title in popover 2015-11-12 19:11:43 +08:00
yuntao.qyt
faf900a37f Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into issue/314 2015-11-12 14:58:42 +08:00
yuntao.qyt
9a3cfc096f theme dark 2015-11-12 14:57:54 +08:00
yiminghe
f41409f319 update docs 2015-11-12 14:16:17 +08:00
afc163
9edea2d4ff Merge pull request #503 from ant-design/feature-calendar
add components/calendar
2015-11-11 21:26:28 +08:00
afc163
60ec92fcf3 update docs 2015-11-11 17:44:16 +08:00
afc163
547db94de3 Add back calendar auto adjust style 2015-11-11 17:08:31 +08:00
afc163
f588e480df remove demo just for bug tracing 2015-11-11 15:48:02 +08:00
血诺
6c5a051d92 change listdata to listData 2015-11-11 14:32:58 +08:00
血诺
a2e7ff51fb fix details 2015-11-11 14:30:15 +08:00
血诺
a3e4043567 fix cols 2015-11-11 13:41:22 +08:00
血诺
7f4854a2c1 fix&improve 2015-11-11 13:11:47 +08:00
血诺
4db12ff733 add components/calendar 2015-11-11 13:11:47 +08:00
yiminghe
8fbd11015c fix datepicker in modal. Fixes #505 #506 2015-11-11 12:26:26 +08:00
yiminghe
42a86258cc add popupStyle for datepicker zIndex 2015-11-11 12:21:00 +08:00
xiaosheng.lj
3ea0225d61 feat add hover style 2015-11-11 00:28:05 +08:00
afc163
72a400c7e0 update API document, ref #498 2015-11-10 16:18:20 +08:00
afc163
09c208831f ref #498 2015-11-10 16:07:23 +08:00
yiminghe
56ea33a08a fix format parse 2015-11-10 15:39:59 +08:00
yiminghe
ac900e2919 update datepicker 2015-11-10 14:20:29 +08:00
yiminghe
cf503260ae upgrade calendar 2015-11-10 11:18:39 +08:00
yiminghe
d37370c144 fix lint 2015-11-09 11:13:31 +08:00
yiminghe
455441a645 fix placeholder 2015-11-09 10:58:52 +08:00
afc163
06dc2b9041 improve steps line css style 2015-11-08 15:42:33 +08:00
afc163
159b5b28e4 Add spin prefixCls, ref #435 2015-11-06 23:49:37 +08:00
afc163
2c523d7246 Add spining for better transition effect, ref #315 2015-11-06 23:43:23 +08:00
afc163
e4b0454f8b update datepicker demo 2015-11-06 22:27:58 +08:00
afc163
c05652a140 Add radio button disabled style, fix #489 2015-11-06 22:03:09 +08:00
afc163
d5acc3832a update form demo 2015-11-06 14:13:26 +08:00
afc163
cd4ec87064 fix #486 temporarily 2015-11-06 14:11:47 +08:00
afc163
b3e2855333 dataSource could be null 2015-11-05 20:06:16 +08:00
afc163
90966ea1c9 empty text should be inside spin 2015-11-05 20:02:49 +08:00
afc163
57c12fa3ae Add table column className demo 2015-11-05 19:46:29 +08:00
afc163
e323b0fc24 Remove demo text 2015-11-05 19:35:21 +08:00
afc163
516c9e1f51 Fix menu click arg 2015-11-05 19:09:33 +08:00
afc163
23b52b14f2 upgrade react-slick dep, fix carousel document, close #483 2015-11-05 18:29:44 +08:00
afc163
7a5bea24d2 update select api 2015-11-05 18:18:21 +08:00
afc163
bd04fbf354 Fix popconfirm animation, close #484 2015-11-05 18:14:20 +08:00
afc163
7ab0f7538d update validation demo 2015-11-05 18:07:24 +08:00
afc163
eb7568c8a6 update select style 2015-11-05 17:49:47 +08:00
afc163
2f18d05759 move input-number width to css 2015-11-05 17:35:21 +08:00
afc163
19c385ce58 Fix rowSelection when change dataSource 2015-11-05 17:30:24 +08:00
afc163
f2ce959d33 hide submenu on click 2015-11-05 14:18:46 +08:00
偏右
3fa30ddc43 Merge pull request #479 from ant-design/fix-popover-style
fix: delete :after of placement
2015-11-05 10:52:00 +08:00
popomore
d3e0c844a3 fix: delete :after of placement 2015-11-04 21:07:00 +08:00
afc163
f205f43bd9 update tooltip and placement demo 2015-11-04 20:48:51 +08:00
偏右
3659d8ab8e Merge pull request #474 from ant-design/feature-placement
feat: support more placement for popover
2015-11-04 20:31:33 +08:00
afc163
1742085df9 fix warnings 2015-11-04 19:40:38 +08:00
afc163
ba3a91738e Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-04 19:33:13 +08:00
afc163
d124dca717 better placement demo 2015-11-04 19:32:54 +08:00
yiminghe
b4830a8dd1 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-04 18:08:29 +08:00
yiminghe
8005455ddd use div 2015-11-04 18:07:42 +08:00
afc163
f7c3550377 document for 0 value 2015-11-04 18:02:59 +08:00
afc163
75ca864dec document for 0 value 2015-11-04 18:02:36 +08:00
afc163
27155b5d81 hide badge when count is 0, fix #476 2015-11-04 18:00:37 +08:00
popomore
e62c4c7666 feat: support more placement for popconfirm 2015-11-04 17:50:49 +08:00
偏右
79682dd61c Merge pull request #473 from ant-design/fix-form-warning
fix: fix form demo warning. fixed #470.
2015-11-04 17:27:24 +08:00
afc163
30b6aeaa04 rowSelection getCheckboxProps, defaultValue should be defaultChecked 2015-11-04 17:23:20 +08:00
popomore
84647fa12d test: add simple testcase for popover 2015-11-04 17:22:33 +08:00
popomore
52fbd05072 feat: support more placement for popover
Ref #312
2015-11-04 17:18:40 +08:00
SimaQ
ecb1a8f447 fix: fix form demo warning. fixed #470. 2015-11-04 17:10:19 +08:00
afc163
3baeaeb0c3 rewrite iconfont demo page 2015-11-04 16:55:02 +08:00
afc163
c044f62374 update upload style 2015-11-04 12:00:49 +08:00
偏右
5616e552a4 Merge pull request #459 from ant-design/feat-upload
feat add upload progress effect
2015-11-04 11:19:03 +08:00
SimaQ
49459897d7 refine validation demo. 2015-11-03 23:34:51 +08:00
afc163
2b54004b7e update spin 2015-11-03 22:41:57 +08:00
afc163
a707df5276 Add filterMultiple in table column, close #442 2015-11-03 22:32:36 +08:00
afc163
be42f5687b update loading demo 2015-11-03 22:23:31 +08:00
yiminghe
dc1650486d fix button 2015-11-03 20:06:44 +08:00
afc163
7a9c536569 add loading prop for table 2015-11-03 18:16:16 +08:00
afc163
a3a7854cad should spin the table content, not contain pagination 2015-11-03 17:48:56 +08:00
afc163
556ec6068c Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-03 17:22:00 +08:00
afc163
664fb92104 update rc-table 2015-11-03 17:21:51 +08:00
yiminghe
6be657bc64 fix autocomplete 2015-11-03 17:13:05 +08:00
xiaosheng.lj
851da67f48 style uploadList to showUploadList 2015-11-03 16:59:04 +08:00
xiaosheng.lj
9cb8bef1ad feat add uploadlist config and fix color 2015-11-03 16:59:04 +08:00
xiaosheng.lj
440f69a800 style color with tint 2015-11-03 16:59:04 +08:00
xiaosheng.lj
0cc8035678 feat add upload progress effect 2015-11-03 16:59:04 +08:00
偏右
d184d87308 Merge pull request #466 from benjycui/feat-button
feat: make `Button` easy to use
2015-11-03 14:48:33 +08:00
Benjy Cui
5fd6999866 feat: make Button easy to use 2015-11-03 14:25:36 +08:00
afc163
e8c47a9fb5 update demo 2015-11-03 14:25:34 +08:00
yiminghe
052e8ee0f4 upgrade 2015-11-03 13:52:41 +08:00
afc163
9749b1692e update document 2015-11-02 16:37:40 +08:00
偏右
6a4743e7ac Merge pull request #433 from ant-design/form-modularization
form 组件
2015-11-02 16:32:04 +08:00
afc163
7c409e54b0 fix datepicker style 2015-11-02 14:46:06 +08:00
afc163
80983752c1 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-01 13:00:38 +08:00
Benjy Cui
24a2e1ecca deps: upgrade rc-slider 2015-11-01 11:42:47 +08:00
afc163
b5e40560bf update demo style 2015-10-31 17:35:50 +08:00
afc163
84e71919da Datepicker upgrade 2015-10-31 15:16:05 +08:00
SimaQ
1c1bf9945a 细节修改,保持 dom 结构稳定。 2015-10-31 08:46:15 +08:00
SimaQ
26d9c64f4d fix: 修复通 Validator 结合使用输入失焦的问题。 2015-10-31 08:46:15 +08:00
SimaQ
0097b574d0 更新 Validation demo。 2015-10-31 08:46:15 +08:00
SimaQ
3a38ad40d3 更新 form 文档。 2015-10-31 08:46:14 +08:00
SimaQ
0d2a6f9c3c message 组件名更新.... 2015-10-31 08:46:14 +08:00
SimaQ
bc228af808 mv input-size.md to input.md, inputs.md to input-group.md 2015-10-31 08:46:14 +08:00
SimaQ
27a8d10f3c 更新文档。 2015-10-31 08:46:14 +08:00
SimaQ
7b675f0721 更新 form demo. 2015-10-31 08:46:14 +08:00
SimaQ
8f72f6cdcf 将 formItem 布局样式相关的属性写法同 layout 组件属性结合。 2015-10-31 08:46:14 +08:00
SimaQ
cd24f3d566 优化 Input.jsx 2015-10-31 08:45:36 +08:00
SimaQ
6d18737404 update demo. 2015-10-31 08:45:36 +08:00
SimaQ
b9bee33154 更新 validation demo. 2015-10-31 08:45:36 +08:00
SimaQ
c2e56746dc 更新 form 说明文案。 2015-10-31 08:45:36 +08:00
SimaQ
b8479d9d55 更新 form demo。 2015-10-31 08:45:35 +08:00
SimaQ
5bb37f7033 form 组建 2015-10-31 08:45:35 +08:00
SimaQ
042800c750 增加 size 定义。 2015-10-31 08:45:35 +08:00
SimaQ
e59d168453 去除 isCompact 属性,将是否添加 ant-form-item-compact 类在程序内部判断。 2015-10-31 08:45:35 +08:00
SimaQ
7ca132eca8 feat: add mixin for form. 2015-10-31 08:45:35 +08:00
SimaQ
ebab3c4199 update form demo. 2015-10-31 08:45:35 +08:00
SimaQ
6689011357 feat: Form modularization. 2015-10-31 08:44:38 +08:00
afc163
30a719f936 update document 2015-10-31 02:21:43 +08:00
afc163
e0c9da599a update table loading 2015-10-31 02:12:26 +08:00
afc163
dde31cfa1b update spin component 2015-10-31 02:00:03 +08:00
偏右
9f6ce589d6 Merge pull request #435 from KgTong/feature-spin
Feature spin
2015-10-31 00:33:06 +08:00
afc163
25368de60b update button demo style 2015-10-30 17:04:22 +08:00
afc163
f526703bf8 update disabled button demo 2015-10-30 17:00:06 +08:00
偏右
483446b28f Merge pull request #455 from ant-design/feature-delStyleAlign
del align
2015-10-30 16:48:11 +08:00
勤拭
cc58106186 del align 2015-10-30 16:45:10 +08:00
Benjy Cui
21231c50a1 docs: 增加多选 Select 校验的 demo 2015-10-30 16:06:27 +08:00
Benjy Cui
46452912c1 docs: update Slider's docs 2015-10-30 14:09:15 +08:00
KgTong
fa55d3a442 delete the loading attribute in spin/index.md 2015-10-30 13:16:51 +08:00
KgTong
b0bad43bf8 Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin 2015-10-30 13:11:39 +08:00
KgTong
ed91ce0931 use animation judge function, and remove the loading attribute 2015-10-30 11:56:23 +08:00
偏右
4eef432425 Update index.md 2015-10-29 23:17:25 +08:00
afc163
fee949cd04 update code style 2015-10-29 20:15:44 +08:00
afc163
3a5f301fad update code style 2015-10-29 20:14:08 +08:00
afc163
67c0e2ad0e update document 2015-10-29 20:10:44 +08:00
偏右
ba023f3f05 Merge pull request #447 from ant-design/feature-colspan-rowspan
support colspan and rowspan
2015-10-29 20:00:15 +08:00
afc163
e246dfeb06 update datepicker style 2015-10-29 19:59:48 +08:00
afc163
bd61bad5ee date null is meaning value 2015-10-29 19:37:39 +08:00
勤拭
7664a41f9b 调整格式 2015-10-29 17:31:47 +08:00
勤拭
6e184378bf 文档逗号改为中文格式 2015-10-29 17:03:15 +08:00
勤拭
c2e67f72ed standard format 2015-10-29 16:23:09 +08:00
勤拭
e9cfca0d89 support colspan and rowspan 2015-10-29 15:38:59 +08:00
afc163
3a68e2fe1f update tabs demo 2015-10-29 15:27:43 +08:00
afc163
d375942e4b update tabs demo 2015-10-29 15:23:58 +08:00
偏右
f528017412 Merge pull request #438 from ant-design/develop-0.10.0fortreedynamic
Dynamic Tree
2015-10-29 14:19:30 +08:00
ioldfish
a63360734c demo中去掉propTypes 2015-10-29 14:02:51 +08:00
ioldfish
97942c6f2d Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-29 13:42:40 +08:00
ioldfish
01bf42d712 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-29 09:55:47 +08:00
Haibin Yu
0d2c6b2505 remove state items in uploadList.jsx 2015-10-29 00:06:39 +08:00
KgTong
852377b6b3 ES6 syntax for spin demo code 2015-10-28 21:40:05 +08:00
afc163
753c01ae18 ES6 syntax for demo code
fix antd.notification
2015-10-28 20:55:49 +08:00
afc163
dffbda521c update datepicker demo 2015-10-28 19:48:32 +08:00
KgTong
7ad9db3eb3 fix IE version logic 2015-10-28 19:39:36 +08:00
KgTong
2e67eae9dd Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin 2015-10-28 19:33:45 +08:00
KgTong
89517f6e45 support align center and fix compatibility for IE 2015-10-28 19:33:25 +08:00
afc163
17afda5028 update demo start-end 2015-10-28 18:35:56 +08:00
afc163
735ed1f89f update iconfont code sample 2015-10-28 18:13:15 +08:00
偏右
1d30992de2 Merge pull request #440 from ant-design/layout-component
layout 组件化
2015-10-28 18:10:55 +08:00
pizn
90c8d17bbe feat: 重构下 className 的写法,支持原有的 className 2015-10-28 18:04:56 +08:00
偏右
5ab1a16a32 Merge pull request #443 from coderhaoxin/fix-badge-count
fix: get count from props
2015-10-28 17:51:14 +08:00
haoxin
147ffa4209 fix: get count from props 2015-10-28 17:47:28 +08:00
pizn
68a952fb62 update: 修改 flex demo 2015-10-28 17:24:35 +08:00
afc163
7c9892a9c7 Add Button propsType 2015-10-28 15:45:31 +08:00
pizn
d1e60798af udpate... 2015-10-28 00:02:31 +08:00
pizn
69aaa6c296 Add layout componet for antd 2015-10-27 23:52:17 +08:00
偏右
59c511fe19 Merge pull request #437 from ant-design/ie8-button-radius-support
support border radius in ie8 via css3pie
2015-10-27 20:05:26 +08:00
afc163
e19186f783 confirmLoading is fully controlled by props now, fix #392 2015-10-27 19:57:18 +08:00
afc163
0193df102b update table ajax demo 2015-10-27 19:37:39 +08:00
afc163
f7ef12acf1 Remove some demo 2015-10-27 19:19:09 +08:00
afc163
64b4031d7a Fix key warning in table demo 2015-10-27 17:27:11 +08:00
ioldfish
2fefd5d103 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-27 16:44:31 +08:00
ioldfish
49c019f86d Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-27 16:28:00 +08:00
afc163
602c2d1f9d support border radius in ie8 via css3pie 2015-10-27 16:26:56 +08:00
ioldfish
8f887d3879 update ant-tree dynamic 2015-10-27 15:47:01 +08:00
KgTong
0f4b4ae39f fix table loading when removing type attrite of spin 2015-10-27 15:15:24 +08:00
KgTong
686a21df78 remove type attribute of spin 2015-10-27 14:58:04 +08:00
KgTong
ea0e9b7d6a fix for code review 2015-10-27 14:01:55 +08:00
KgTong
103104b256 fix conflict 2015-10-27 11:06:15 +08:00
KgTong
b9ce4c7ddf replace the table loading with spin 2015-10-27 10:34:05 +08:00
KgTong
5c1a11710d add spin component 2015-10-27 10:10:27 +08:00
xiaoshuai
25a3a3c7b9 fix progressbar worning 2015-10-26 20:14:41 +08:00
afc163
62115e9034 just hide toottip overlay when there is no title
avoid rerender children when title is changed
2015-10-26 16:30:27 +08:00
afc163
4edb61876e Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-26 11:09:12 +08:00
afc163
5a50df6b78 use ghost button to match primary button 2015-10-26 11:08:36 +08:00
afc163
cad3fdff45 lg => large, sm => small 2015-10-26 11:02:48 +08:00
yiminghe
17b1ec14f8 add tabs add demo 2015-10-26 10:56:09 +08:00
afc163
7ae46cd406 no show toolitp when there is no title 2015-10-25 14:55:31 +08:00
Pyiner
776238eda9 fix _target to target 2015-10-24 15:14:53 +08:00
afc163
1e79f487c8 Read locale from deps 2015-10-23 23:50:26 +08:00
jiang
1931db6307 update route md key 2015-10-23 23:15:03 +08:00
afc163
de49cb6e1b Merge branch 'develop-0.10.0' into queue-anim 2015-10-23 22:37:49 +08:00
afc163
c4b0918872 update queue-anim demos 2015-10-23 22:37:42 +08:00
afc163
cd0703e462 remove enter-animation 2015-10-23 21:38:35 +08:00
afc163
5d7fea6c68 Add locale prop link 2015-10-23 18:17:57 +08:00
afc163
f8122309fa Add locale support for datepicker, #424 2015-10-23 17:57:02 +08:00
jljsj
894ae72f43 update router animation 2015-10-23 17:39:37 +08:00
jljsj
eedcb0ea63 remove style.md "gi" 2015-10-23 15:59:15 +08:00
afc163
b7a32da9ec update code style 2015-10-23 15:55:58 +08:00
jljsj
ac87334179 update queue-anim demo ReactDOM 2015-10-23 14:53:57 +08:00
afc163
875635e027 Fix datepicker format 2015-10-23 11:52:05 +08:00
afc163
64e54c42b4 update code style 2015-10-23 10:51:56 +08:00
afc163
6757dc8199 Hide unfinish demo 2015-10-22 23:54:56 +08:00
afc163
4bed95ef6a Merge 2015-10-22 21:30:28 +08:00
afc163
71e026467a Merge branch 'queue-anim' of github.com:ant-design/ant-design into queue-anim 2015-10-22 21:26:21 +08:00
偏右
83664dbd28 Merge pull request #422 from ant-design/unify-size-prop
unify all size prop to: large default small
2015-10-22 21:13:14 +08:00
afc163
3b6c92045c update demo style 2015-10-22 21:12:13 +08:00
afc163
415fa383e3 unify all size prop to: large default small 2015-10-22 21:01:52 +08:00