diff --git a/components/table/demo/indent-size.md b/components/table/demo/expand-children.md similarity index 95% rename from components/table/demo/indent-size.md rename to components/table/demo/expand-children.md index 86988a8463b5e1a9881125ef517f533b678999ca..7577deb3ab0e28fefc053dde657ef730c1ae235e 100644 --- a/components/table/demo/indent-size.md +++ b/components/table/demo/expand-children.md @@ -78,7 +78,7 @@ const data = [{ }]; ReactDOM.render( - , +
, mountNode ); ```` diff --git a/components/table/index.jsx b/components/table/index.jsx index 599cc2af4c1cec8d909249cdd26cab4a1b7869ae..7b99c71a294dfa6b436568fe99941cccd7bb7f84 100644 --- a/components/table/index.jsx +++ b/components/table/index.jsx @@ -584,6 +584,7 @@ let AntTable = React.createClass({ data={data} columns={columns} className={classString} + expandIconColumnIndex={columns[0].key === 'selection-column' ? 1 : 0} expandIconAsCell={expandIconAsCell} /> {emptyText} diff --git a/package.json b/package.json index 64f03ae539325db862136719ae898880d939291a..cde948dac26c06cbc04e06304e89c970ad4b492c 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "rc-slider": "~3.3.0", "rc-steps": "~1.4.1", "rc-switch": "~1.3.2", - "rc-table": "~3.9.0", + "rc-table": "~3.10.1", "rc-tabs": "~5.7.0", "rc-time-picker": "~1.1.0", "rc-tooltip": "~3.3.1", diff --git a/style/components/table.less b/style/components/table.less index 6970bed99d1f284cd98cb6c1a2808a284a9fde0d..17821ccf69b39e595d881f81c437f788942fafbf 100644 --- a/style/components/table.less +++ b/style/components/table.less @@ -318,6 +318,15 @@ content: '.'; } } + + // Hide selection component in children data + &[class*="@{table-prefix-cls}-row-level-"] .@{table-prefix-cls}-selection-column > span { + display: none; + } + + &[class*="@{table-prefix-cls}-row-level-0"] .@{table-prefix-cls}-selection-column > span { + display: inline-block; + } } tr&-expanded-row { &,