From 990d9c6192e44f50d176b64caf168e817f3c2cc1 Mon Sep 17 00:00:00 2001 From: monkindey Date: Tue, 17 Oct 2017 13:38:40 +0800 Subject: [PATCH] format the conflicted table markdown --- components/table/index.en-US.md | 2 +- components/table/index.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/table/index.en-US.md b/components/table/index.en-US.md index f3d7e687ac..b5fda6557a 100644 --- a/components/table/index.en-US.md +++ b/components/table/index.en-US.md @@ -58,7 +58,7 @@ const columns = [{ | defaultExpandAllRows | Expand all rows initially | boolean | `false` | | defaultExpandedRowKeys | Initial expanded row keys | string\[] | - | | expandedRowKeys | Current expanded row keys | string\[] | - | -| expandedRowRender | Expanded container render for each row | Function(record):ReactNode | - | +| expandedRowRender | Expanded container render for each row | Function(record):ReactNode | - | | footer | Table footer renderer | Function(currentPageData) | | | indentSize | Indent size in pixels of tree data | number | 15 | | loading | Loading status of table | boolean\|[object](https://ant.design/components/spin-cn/#API) ([more](https://github.com/ant-design/ant-design/issues/4544#issuecomment-271533135)) | `false` | diff --git a/components/table/index.zh-CN.md b/components/table/index.zh-CN.md index c02d8ce6ce..8741ce453d 100644 --- a/components/table/index.zh-CN.md +++ b/components/table/index.zh-CN.md @@ -59,7 +59,7 @@ const columns = [{ | defaultExpandAllRows | 初始时，是否展开所有行 | boolean | false | | defaultExpandedRowKeys | 默认展开的行 | string\[] | - | | expandedRowKeys | 展开的行，控制属性 | string\[] | - | -| expandedRowRender | 额外的展开行 | Function(record):ReactNode | - | +| expandedRowRender | 额外的展开行 | Function(record):ReactNode | - | | footer | 表格尾部 | Function(currentPageData) | | | indentSize | 展示树形数据时，每层缩进的宽度，以 px 为单位 | number | 15 | | loading | 页面是否加载中 | boolean\|[object](https://ant.design/components/spin-cn/#API) ([更多](https://github.com/ant-design/ant-design/issues/4544#issuecomment-271533135)) | false |