mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-11 19:42:54 +08:00
Code Issues Actions 41 Packages Projects Releases Wiki Activity

fix: Prop style is getting duplicated on Table (#18315) (#18330)

Browse Source
This commit is contained in:
He Linming 2019-08-19 11:14:48 +08:00 committed by 偏右
parent 62aeb5aff2
commit af39b46595
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/empty/__tests__/__snapshots__/demo.test.js.snap
View File

@ -466,7 +466,6 @@ exports[`renders ./components/empty/demo/config-provider.md correctly 1`] = `
</h3> </h3>
<div <div
class="ant-table-wrapper" class="ant-table-wrapper"
style="margin-top:8px"
> >
<div <div
class="ant-spin-nested-loading" class="ant-spin-nested-loading"

3
components/table/Table.tsx
View File

@ -1279,7 +1279,6 @@ export default class Table<T> extends React.Component<TableProps<T>, TableState<
const { const {
prefixCls: customizePrefixCls, prefixCls: customizePrefixCls,
dropdownPrefixCls: customizeDropdownPrefixCls, dropdownPrefixCls: customizeDropdownPrefixCls,
style,
className, className,
} = this.props; } = this.props;
const data = this.getCurrentPageData(); const data = this.getCurrentPageData();
@ -1315,7 +1314,7 @@ export default class Table<T> extends React.Component<TableProps<T>, TableState<
: `${prefixCls}-without-pagination`; : `${prefixCls}-without-pagination`;
return ( return (
<div className={classNames(`${prefixCls}-wrapper`, className)} style={style}> <div className={classNames(`${prefixCls}-wrapper`, className)}>
<Spin <Spin
{...loading} {...loading}
className={loading.spinning ? `${paginationPatchClass} ${prefixCls}-spin-holder` : ''} className={loading.spinning ? `${paginationPatchClass} ${prefixCls}-spin-holder` : ''}