From 8b0225f5354f2aa35c4cc8bc56c13d3b61676587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=BF=BC?= Date: Tue, 25 Apr 2017 11:23:22 +0800 Subject: [PATCH 1/3] column support align attr --- src/Table.jsx | 2 ++ src/TableCell.jsx | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Table.jsx b/src/Table.jsx index 3c7cf935..8f516681 100644 --- a/src/Table.jsx +++ b/src/Table.jsx @@ -225,9 +225,11 @@ export default class Table extends React.Component { rows.push([]); } } + const styleProp = { textAlign: column.align ? column.align : 'left' }; const cell = { key: column.key, className: column.className || '', + style: styleProp, children: column.title, }; if (column.children) { diff --git a/src/TableCell.jsx b/src/TableCell.jsx index 797e1e5e..3b3eb664 100644 --- a/src/TableCell.jsx +++ b/src/TableCell.jsx @@ -28,7 +28,9 @@ export default class TableCell extends React.Component { render() { const { record, indentSize, prefixCls, indent, index, expandIcon, column } = this.props; - const { dataIndex, render, className = '' } = column; + const { dataIndex, render, className = '', align = 'left' } = column; + + const styleProp = { textAlign: align }; // We should return undefined if no dataIndex is specified, but in order to // be compatible with object-path's behavior, we return the record object instead. @@ -72,6 +74,7 @@ export default class TableCell extends React.Component { return ( From a12935925d5107c3b51d4c34b61a0beef9de218f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=BF=BC?= Date: Tue, 25 Apr 2017 13:54:22 +0800 Subject: [PATCH 2/3] fix --- src/Table.jsx | 2 +- src/TableCell.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Table.jsx b/src/Table.jsx index 8f516681..125e22e0 100644 --- a/src/Table.jsx +++ b/src/Table.jsx @@ -225,7 +225,7 @@ export default class Table extends React.Component { rows.push([]); } } - const styleProp = { textAlign: column.align ? column.align : 'left' }; + const styleProp = column.align ? { textAlign: column.align } : {}; const cell = { key: column.key, className: column.className || '', diff --git a/src/TableCell.jsx b/src/TableCell.jsx index 3b3eb664..2fbb6ae3 100644 --- a/src/TableCell.jsx +++ b/src/TableCell.jsx @@ -28,9 +28,9 @@ export default class TableCell extends React.Component { render() { const { record, indentSize, prefixCls, indent, index, expandIcon, column } = this.props; - const { dataIndex, render, className = '', align = 'left' } = column; + const { dataIndex, render, className = '', align } = column; - const styleProp = { textAlign: align }; + const styleProp = align ? { textAlign: align } : {}; // We should return undefined if no dataIndex is specified, but in order to // be compatible with object-path's behavior, we return the record object instead. From fd0767628a96ddcbe3b86c0fac8bae22c104e3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=BF=BC?= Date: Tue, 25 Apr 2017 14:19:23 +0800 Subject: [PATCH 3/3] fix null --- src/Table.jsx | 2 +- src/TableCell.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Table.jsx b/src/Table.jsx index 125e22e0..87a545cb 100644 --- a/src/Table.jsx +++ b/src/Table.jsx @@ -225,7 +225,7 @@ export default class Table extends React.Component { rows.push([]); } } - const styleProp = column.align ? { textAlign: column.align } : {}; + const styleProp = column.align ? { textAlign: column.align } : null; const cell = { key: column.key, className: column.className || '', diff --git a/src/TableCell.jsx b/src/TableCell.jsx index 2fbb6ae3..9dc04d75 100644 --- a/src/TableCell.jsx +++ b/src/TableCell.jsx @@ -30,7 +30,7 @@ export default class TableCell extends React.Component { index, expandIcon, column } = this.props; const { dataIndex, render, className = '', align } = column; - const styleProp = align ? { textAlign: align } : {}; + const styleProp = align ? { textAlign: align } : null; // We should return undefined if no dataIndex is specified, but in order to // be compatible with object-path's behavior, we return the record object instead.