mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-12-28 19:18:40 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
2,568 Commits 20 Branches 736 Tags 481 MiB
bb953b333f
Commit Graph

1259 Commits

Author SHA1 Message Date
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
yiminghe
fdee139459 add className for table 2015-10-22 17:28:12 +08:00
afc163
75eefe533c upgrade datepicker 2015-10-22 17:16:02 +08:00
afc163
86c5ead45a Add onChange prop to Table, fix #395 2015-10-21 20:21:14 +08:00
偏右
3af6ea1639 Merge pull request #417 from ant-design/feature-vertical-tabs 
Add vertical tabs, fix #398
 2015-10-21 20:04:29 +08:00
afc163
b6cdeb157d Add vertical tabs, fix #398 2015-10-21 20:00:02 +08:00
jljsj
d2cf91d837 update queue-anim interval 2015-10-21 18:15:17 +08:00
Benjy Cui
f7a8b11243 chore: remove deprecated APIs 2015-10-21 17:59:57 +08:00
jljsj
dc2c720cec update queue-anim enter-leave state.show 2015-10-21 17:56:42 +08:00
jljsj
ba34a49f79 update queue-anim demo 2015-10-21 17:53:38 +08:00
yiminghe
8c71530838 add start end demo for datepicker 2015-10-21 16:27:48 +08:00
yiminghe
1e43c9ddc5 upgrade tabs 2015-10-21 14:53:48 +08:00
afc163
eed88125f1 Fix document 2015-10-21 10:48:58 +08:00
yiminghe
8f2e8437be add calendarStyle 2015-10-20 16:50:42 +08:00
yiminghe
76b0f673ec beta2 2015-10-20 16:47:55 +08:00
afc163
aed7eae2bc Fix confirmLoading 2015-10-20 10:45:49 +08:00
羽航
999e8a0e53 fix conflict 2015-10-20 09:50:47 +08:00
afc163
f26bbc1cd5 Add document version switch in footer, #406 2015-10-19 17:58:56 +08:00
afc163
e5bed684eb Remove enter-animation document 2015-10-19 16:21:26 +08:00
jljsj
bf1d703274 queue-anim demo 2015-10-19 15:36:32 +08:00
afc163
dc47b1cd5b fix reqwest 2015-10-19 11:34:44 +08:00
ioldfish
b3351715f3 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0 2015-10-15 14:38:12 +08:00
afc163
8e00cdedf4 Merge branch 'master' into develop-0.10.0 2015-10-15 11:26:32 +08:00
afc163
ed7114e25e update modal info 2015-10-15 11:26:07 +08:00
ioldfish
d700a53543 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0 2015-10-15 10:40:01 +08:00
ioldfish
aca09cf191 update ant-tree 2015-10-15 10:38:14 +08:00
Yuwei Ba
60987b0112 Update offset.md 
Typo
 2015-10-15 00:10:01 +08:00
afc163
9ef14500f3 Fix datepicker defaultValue, closes #391 2015-10-14 18:09:28 +08:00
afc163
164c01b5ba Merge branch 'master' into develop-0.10.0 2015-10-14 16:44:52 +08:00
afc163
a3b2ad5791 #380 2015-10-14 10:29:15 +08:00
羽航
1c9b9e8c86 fix little code style 2015-10-13 13:30:37 +08:00
羽航
dd76fe6520 增加InputNumber的Validator示例 2015-10-13 13:26:49 +08:00
yiminghe
fb43a1b86d fix anim server render 2015-10-13 12:52:41 +08:00
羽航
1efca6afa3 增加Datepicker的Validator示例 2015-10-12 17:53:32 +08:00
羽航
52edc78676 修改onSelect属性为onChange属性,以支持Validator.为向前兼容,保留了onSelect属性. 2015-10-12 17:53:01 +08:00
偏右
842c7bb33d Merge pull request #370 from benjycui/feature-button 
feat: add support for `htmlType`
 2015-10-11 15:21:53 +08:00
afc163
100adfc69a update row select argument name 2015-10-10 11:35:31 +08:00
afc163
d184b39450 Merge branch 'feature-#252' of https://github.com/RaoHai/ant-design into develop-0.10.0 2015-10-09 18:48:32 +08:00
RaoHai
2c1fda70d6 Table 列选择模式重构 
+ 表格 `rowSelection` 支持多选
+ 表格可配置某行数据默认选中、不能选中。该配置对 ajax 载入的数据有效。
示例:
```
getCheckboxProps: function (value) {
    return {
        defaultValue: value.name === '胡彦祖ajax2', // 配置默认勾选的列
        disabled: value.name === '李大嘴ajax3'    // 配置无法勾选的列
    }
},
```
 2015-10-09 17:14:09 +08:00
Benjy Cui
1e45e02e8a feat: add support for htmlType 2015-10-09 16:55:07 +08:00
Benjy Cui
f4ca0798de refactor: generate className with rcUtil.classSet 2015-10-09 16:42:08 +08:00
偏右
88f6be5855 Merge pull request #368 from benjycui/feature-button 
chore: replace `button` tag with `Button` component
 2015-10-09 15:47:14 +08:00
Benjy Cui
26069c33e9 chore: upgrade react-slick in order to work with React@0.14.x 2015-10-09 11:35:44 +08:00
Benjy Cui
429a4ca382 refactor: joinClasses is removed in React@0.14.x 2015-10-09 10:55:52 +08:00
Benjy Cui
5b86a4be1d refactor: replace button tag with Button component 2015-10-08 15:13:04 +08:00
afc163
93c181677a Merge branch develop-0.10.0 2015-10-06 12:55:01 +08:00
Benjy Cui
2f771b0482 feat: button should be a component 2015-10-05 15:19:07 +08:00
elrrrrrrr
c540d124a5 chore: 迁移 upload iconfont 2015-10-02 16:52:34 +08:00
elrrrrrrr
725a142669 chore: 迁移 tag iconfont 2015-10-02 16:39:15 +08:00
elrrrrrrr
b7a922a895 chore: 迁移 tabs iconfont 2015-10-02 16:36:48 +08:00
elrrrrrrr
1640a34c4c chore: 迁移 table iconfont 2015-10-02 16:31:51 +08:00
elrrrrrrr
37a1e03bc8 chore: 迁移 switch iconfont 2015-10-02 16:25:10 +08:00
elrrrrrrr
335c34aab7 chore: 迁移 slider iconfont 
- 需要飞哥 review
 2015-10-02 16:18:43 +08:00
elrrrrrrr
b9fa8d1a45 chore: 迁移 progress iconfont 2015-10-02 15:58:37 +08:00
elrrrrrrr
ac6505e68a chore: 迁移 notification iconfont 2015-10-02 15:48:56 +08:00
elrrrrrrr
244c3a78a5 chore: 迁移 modal iconfont 
- api 接口有变
 2015-10-02 15:41:04 +08:00
elrrrrrrr
f99848a5a0 chore: 迁移 message iconfont 
- 需要修改组件 jsx
 2015-10-02 15:32:16 +08:00
elrrrrrrr
ae5ae396ef chore: 迁移 menu iconfont 2015-10-02 15:26:18 +08:00
elrrrrrrr
d467994249 chore: 迁移 form iconfont 2015-10-02 15:17:21 +08:00
elrrrrrrr
d89cc5610b chore: 迁移 dropdown iconfont 组件 2015-10-02 15:12:07 +08:00
elrrrrrrr
bcc4265201 chore: 迁移 button iconfont 
- 手动加上 margin-right 8px
 2015-10-02 15:04:28 +08:00
elrrrrrrr
a85898da62 chore: 迁移 breadcrump iconfont 2015-10-02 14:25:46 +08:00
elrrrrrrr
7f701cc2b7 chore: 迁移 badge iconfont 2015-10-02 14:23:53 +08:00
elrrrrrrr
64aa7b0acb chore: 迁移 alert 组件 iconfont 2015-10-02 14:21:02 +08:00
elrrrrrrr
2ec165d2aa chore(iconfont): 根据 CR 修复代码风格 2015-09-26 01:26:30 +08:00
elrrrrrrr
6465712385 feat: 抽离 Icon 组件、支持自定义属性 
fixed #307
 2015-09-26 01:26:30 +08:00
afc163
05347da926 not emit fetch when there is no dataSource change, #347 2015-09-26 00:56:15 +08:00
afc163
094ae9bbbf update upload document 2015-09-24 19:43:02 +08:00
afc163
147b4ac49b Add overlayClassName to popover and tooltip 2015-09-24 18:38:31 +08:00
afc163
52b639faba Should update table data when changing pageSize 
fix #317
 2015-09-23 14:28:08 +08:00
afc163
74b2c8fcc1 update pagination document 2015-09-23 14:13:31 +08:00
Yuwei Ba
a08fa60930 添加 pageSize 发生变化的回调。 #317 2015-09-23 13:58:56 +08:00
afc163
67735552bb update progress index.md 2015-09-22 20:14:56 +08:00
afc163
73c1d3f595 update progress demo 2015-09-22 20:11:28 +08:00
afc163
176adab763 update modal basic demo 2015-09-22 15:11:29 +08:00
afc163
c5cab1d687 Add confirmLoading prop for Modal 
You can use `confirmLoading` to cancel button loading status.

```
onOk() {
  ...
  this.setState({
    confirmLoading: false
  });
}
```

Fix #322
 2015-09-22 15:06:10 +08:00
afc163
961b990f07 upgrade rc-upload to 1.6.x 2015-09-21 11:34:14 +08:00