Merge branch 'master' into feature

This commit is contained in:
afc163 2018-12-13 22:53:15 +08:00
commit 50617e7ebe
No known key found for this signature in database
GPG Key ID: 5F00908D72002306

View File

@ -849,6 +849,7 @@ export default class Table<T> extends React.Component<TableProps<T>, TableState<
</div>
);
}
const sortTitleString = (sortButton && typeof sortTitle === 'string') ? sortTitle : undefined;
return {
...column,
className: classNames(column.className, {
@ -860,7 +861,7 @@ export default class Table<T> extends React.Component<TableProps<T>, TableState<
title: [
<div
key="title"
title={sortButton ? sortTitle : undefined}
title={sortTitleString}
className={sortButton ? `${prefixCls}-column-sorters` : undefined}
onClick={() => this.toggleSortOrder(column)}
>