Commit Graph

2186 Commits

Author SHA1 Message Date
偏右
bb30d5a778 Merge pull request #389 from ant-design/color-tint-tool
Add color tint and color transform tool
2015-10-14 16:46:47 +08:00
afc163
5fd6d98217 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-14 16:46:01 +08:00
afc163
164c01b5ba Merge branch 'master' into develop-0.10.0 2015-10-14 16:44:52 +08:00
afc163
d1f7fcfecc Fix font spec page style 2015-10-14 16:44:30 +08:00
偏右
50231d9c46 Merge pull request #390 from ant-design/upgrade-input-number
upgrade input-number to 2.1.x
2015-10-14 16:31:20 +08:00
afc163
6092ca2319 upgrade input-number to 2.1.x 2015-10-14 16:27:06 +08:00
afc163
59e5ff25ae Add color tint and color transform tool 2015-10-14 16:02:32 +08:00
偏右
8c55c16194 Merge pull request #383 from kevyu/master
fix text-color typo in popover.less
2015-10-14 13:58:19 +08:00
Haibin Yu
3faa1535db fix text-color typo in popover.less 2015-10-14 13:28:37 +08:00
afc163
a3b2ad5791 #380 2015-10-14 10:29:15 +08:00
yiminghe
fb43a1b86d fix anim server render 2015-10-13 12:52:41 +08:00
afc163
ecb98d8787 Merge branch 'master' into develop-0.10.0 2015-10-12 10:21:16 +08:00
afc163
a085adcf05 Add react to devDeps 2015-10-12 10:20:17 +08:00
afc163
dfab1e274d Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-11 17:54:18 +08:00
afc163
70448f45cb fix doc style 2015-10-11 17:49:17 +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
37da0caf2c Remove importing jquery 2015-10-10 14:20:22 +08:00
afc163
100adfc69a update row select argument name 2015-10-10 11:35:31 +08:00
afc163
33f152b4ac update steps style 2015-10-09 21:27:28 +08:00
afc163
a4ad6cd1b0 update input-number transition style 2015-10-09 20:52:41 +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
390ba270b9 Table 列选择模式重构
close #252

+ 表格 `rowSelection` 支持多选
+ 表格可配置某行数据默认选中、不能选中。该配置对 ajax 载入的数据有效。
示例:
```
getCheckboxProps: function (value) {
    return {
        defaultValue: value.name === '胡彦祖ajax2', // 配置默认勾选的列
        disabled: value.name === '李大嘴ajax3'    //配置无法勾选的列
    }
},
```
2015-10-09 17:26:36 +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
afc163
cea77e00a5 Change version to 0.10.0-beta, Merge branch 'master' into develop-0.10.0 2015-10-09 15:43:05 +08:00
afc163
ac3eaaf6ea update stableVersion 2015-10-09 15:42:03 +08:00
Benjy Cui
0183694f9c refactor: remove .ant-btn-menu 2015-10-09 15:16:22 +08:00
偏右
a52de54748 Merge pull request #369 from benjycui/feature-react@0.14.x
fix: antd build fail
2015-10-09 12:19:03 +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
偏右
67a4027346 Merge pull request #361 from ant-design/feature/migrateIcon
Feature/migrate icon
2015-10-06 13:01:56 +08:00
afc163
93c181677a Merge branch develop-0.10.0 2015-10-06 12:55:01 +08:00
偏右
0d2fcf429b Merge pull request #345 from benjycui/feature-button
feat: button should be a component
2015-10-06 12:48:28 +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