Merge pull request ant-design#455 from ant-design/feature-delStyleAlign

del align
smwhr · Oct 30, 2015 · 483446b · 483446b
2 parents 9a326d3 + cc58106
commit 483446b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/components/table/demo/colspan-rowspan.md b/components/table/demo/colspan-rowspan.md
@@ -34,7 +34,6 @@ const columns = [{
       return {
         children: <a href="javascript:;">{text}</a>,
         props: {
-          align: 'center',
           colSpan: 5
         }
       }

diff --git a/components/table/index.md b/components/table/index.md
@@ -78,7 +78,7 @@ var dataSource = new Table.DataSource({
 |------------|----------------------------|-----------------|---------------------|---------|
 | title      | 列头显示文字               | String or React.Element |             |         |
 | dataIndex  | 列数据在 data 中对应的 key | String          |                     |         |
-| colSpan    | 表头列合并,设置为0时,不渲染 | Number          |                     |         |
+| colSpan    | 表头列合并,设置为 0 时,不渲染 | Number          |                     |         |
 | key        | React 需要的 key           | String          |                     |         |
 | render     | 生成复杂数据的渲染函数，参数分别为当前列的值，当前列数据，列索引，@return里面可以设置表格[行/列合并](#demo-colspan-rowspan) | Function(text, record, index) {} |    |         |
 | filters    | 表头的筛选菜单项           | Array           |                     |         |