diff --git a/components/table/Table.tsx b/components/table/Table.tsx index 8b31bbcdea70..d22fce393709 100755 --- a/components/table/Table.tsx +++ b/components/table/Table.tsx @@ -1230,8 +1230,7 @@ export default class Table extends React.Component, TableState< mergedLocale.emptyText = renderEmpty('Table'); } - const classString = classNames({ - [`${prefixCls}-${this.props.size}`]: true, + const classString = classNames(`${prefixCls}-${this.props.size}`, { [`${prefixCls}-bordered`]: this.props.bordered, [`${prefixCls}-empty`]: !data.length, [`${prefixCls}-without-column-header`]: !showHeader, diff --git a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap index a4c0c97c469a..b6719b3a1faf 100644 --- a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap @@ -11,7 +11,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = ` class="ant-spin-container" >
-
-
-
- -
+ Bordered + +
+
-
- - - -
+ + +
+
+
-
- -
+ loading + +
+
-
- - - -
+ + +
+
+
-
- -
+ Title + +
+
-
- - - -
+ + +
+
+
-
- -
+ Column Header + +
+
-
- - - -
+ + +
+
+
-
- -
+ Footer + +
+
-
- - - -
+ + +
+
+
-
- -
+ Expandable + +
+
-
- - - -
+ + +
+
+
-
- -
+ Checkbox + +
+
-
- - - -
+ + +
+
+
-
- -
+ Fixed Header + +
+
-
- - - -
+ + +
+
+
-
- -
+ Has Data + +
+
-
- - - -
+ + +
+
+
+
+ +
- + +
+
+
+
+
+ +
+
-
- -
- - + - + -
- -
+ class="ant-radio-button-inner" + /> + + + Small + + +
+
+
+
-
- -
+ Table Layout + +
+
-
- -
- - - - + -
- -
+ class="ant-radio-button-inner" + /> + + + Fixed + + +
+
- -
-
+
+ +
+
-
- - - + - - + + Top + + + + + + + + + + + +
+
+
+
+
+
+
+ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Edrward 2 + + 32 + + London Park no. 2 + + + Edit + +
+ Edrward 3 + + 32 + + London Park no. 3 + + + Edit + +
+ Edrward 4 + + 32 + + London Park no. 4 + + + Edit + +
+ Edrward 5 + + 32 + + London Park no. 5 + + + Edit + +
+ Edrward 6 + + 32 + + London Park no. 6 + + + Edit + +
+ Edrward 7 + + 32 + + London Park no. 7 + + + Edit + +
+ Edrward 8 + + 32 + + London Park no. 8 + + + Edit + +
+ Edrward 9 + + 32 + + London Park no. 9 + + + Edit + +
+
+
+
+ +
+
+ +`; + +exports[`renders ./components/table/demo/ellipsis.md correctly 1`] = ` +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -4247,92 +4770,8 @@ exports[`renders ./components/table/demo/edit-row.md correctly 1`] = `
  • - - 2 - -
    • -
  • - - 3 - -
    • -
  • - - 4 - -
    • -
  • - - 5 - -
    • -
  • - -
    - - - - - ••• - -
    -     -
    • -
  • - - 10 - -
    • -
    • @@ -11283,17 +11722,17 @@ exports[`renders ./components/table/demo/reset-filter.md correctly 1`] = ` data-row-key="2" > @@ -11303,17 +11742,17 @@ exports[`renders ./components/table/demo/reset-filter.md correctly 1`] = ` data-row-key="3" > @@ -11323,17 +11762,17 @@ exports[`renders ./components/table/demo/reset-filter.md correctly 1`] = ` data-row-key="4" > diff --git a/components/table/__tests__/__snapshots__/empty.test.js.snap b/components/table/__tests__/__snapshots__/empty.test.js.snap index 4073fd0381e8..5ea5d8c18dbf 100644 --- a/components/table/__tests__/__snapshots__/empty.test.js.snap +++ b/components/table/__tests__/__snapshots__/empty.test.js.snap @@ -453,7 +453,7 @@ exports[`Table renders empty table with fixed columns 1`] = ` class="ant-spin-container" >
    {text}, }, { title: 'Age', dataIndex: 'age', key: 'age', - width: 70, }, { title: 'Address', @@ -40,7 +36,6 @@ const columns = [ { title: 'Action', key: 'action', - width: 360, render: (text, record) => ( Action 一 {record.name} @@ -86,6 +81,7 @@ class Demo extends React.Component { rowSelection: {}, scroll: undefined, hasData: true, + tableLayout: undefined, }; handleToggle = prop => enable => { @@ -96,10 +92,18 @@ class Demo extends React.Component { this.setState({ size: e.target.value }); }; + handleTableLayoutChange = e => { + this.setState({ tableLayout: e.target.value }); + }; + handleExpandChange = enable => { this.setState({ expandedRowRender: enable ? expandedRowRender : undefined }); }; + handleEllipsisChange = enable => { + this.setState({ ellipsis: enable }); + }; + handleTitleChange = enable => { this.setState({ title: enable ? title : undefined }); }; @@ -135,56 +139,71 @@ class Demo extends React.Component { const { state } = this; return (
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default - Middle - Small - - - - - Top - Bottom - Both - None - - - -
    -
    + +
    + + Name + + +
    +     +     		+ +
    + + Age + + +
    +     +     		+ +
    + + Address + + +
    +     +     		+ +
    + + Long Column Long Column Long Column + + +
    +     +     		+ +
    + + Long Column Long Column + + +
    +     +     		+ +
    + + Long Column + + +
    +     +
    - Edrward 2 - - 32 - - London Park no. 2 - - Edit + John Brown
    - Edrward 3 - 32 - London Park no. 3 - - - Edit - -
    - Edrward 4 + New York No. 1 Lake Park, New York No. 1 Lake Park - 32 + New York No. 1 Lake Park, New York No. 1 Lake Park - London Park no. 4 + New York No. 1 Lake Park, New York No. 1 Lake Park - - Edit - + New York No. 1 Lake Park, New York No. 1 Lake Park
    - Edrward 5 - - 32 - - London Park no. 5 - - Edit + Jim Green
    - Edrward 6 - - 32 - - London Park no. 6 - - - Edit - + 42
    - Edrward 7 + London No. 2 Lake Park, London No. 2 Lake Park - 32 + London No. 2 Lake Park, London No. 2 Lake Park - London Park no. 7 + London No. 2 Lake Park, London No. 2 Lake Park - - Edit - + London No. 2 Lake Park, London No. 2 Lake Park
    - Edrward 8 + + Joe Black + - London Park no. 8 - - - Edit - -
    - Edrward 9 + Sidney No. 1 Lake Park, Sidney No. 1 Lake Park - 32 + Sidney No. 1 Lake Park, Sidney No. 1 Lake Park - London Park no. 9 + Sidney No. 1 Lake Park, Sidney No. 1 Lake Park - - Edit - + Sidney No. 1 Lake Park, Sidney No. 1 Lake Park
    John Brown 32 New York No. 1 Lake Park Jim Green 42 London No. 1 Lake Park Joe Black 32 Sidney No. 1 Lake Park Jim Red 32 London No. 2 Lake Park
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + Middle + Small + + + + + Unset + Fixed + + + + + Top + Bottom + Both + None + + + +
    ({ ...item, ellipsis: state. ellipsis }))} + dataSource={state.hasData ? data : null} + /> ); } @@ -194,9 +213,6 @@ ReactDOM.render(, mountNode); ```