Skip to content

Commit 64a7ac2

Browse files
yesmeckyesmeck
committed
Lint fix
1 parent 3e05f83 commit 64a7ac2

File tree

15 files changed

+576
-605
lines changed

15 files changed

+576
-605
lines changed

‎examples/dropdown.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ for (let i = 0; i < 10; i++) {
1818
});
1919
}
2020

21-
class Test extends React.Component {
22-
filters = []
23-
21+
class Demo extends React.Component {
2422
state = {
2523
visible: false,
2624
}
2725

26+
filters = []
27+
2828
handleVisibleChange = (visible) => {
2929
this.setState({ visible });
3030
}
@@ -105,7 +105,7 @@ class Test extends React.Component {
105105
ReactDOM.render(
106106
<div>
107107
<h2>use dropdown</h2>
108-
<Test />
108+
<Demo />
109109
</div>,
110110
document.getElementById('__react-content')
111111
);

‎examples/expandedRowRender.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,7 @@ const tableData = [
1010
{ key: 2, a: '1333', c: 'eee', d: 2 },
1111
];
1212

13-
class App extends React.Component {
14-
columns = [
15-
{ title: 'title 1', dataIndex: 'a', key: 'a', width: 100 },
16-
{ title: 'title 2', dataIndex: 'b', key: 'b', width: 100 },
17-
{ title: 'title 3', dataIndex: 'c', key: 'c', width: 200 },
18-
{ title: 'Operation', dataIndex: '', key: 'x', render: this.renderAction },
19-
]
20-
13+
class Demo extends React.Component {
2114
state = {
2215
data: tableData,
2316
expandedRowKeys: [],
@@ -47,6 +40,13 @@ class App extends React.Component {
4740
});
4841
}
4942

43+
columns = [
44+
{ title: 'title 1', dataIndex: 'a', key: 'a', width: 100 },
45+
{ title: 'title 2', dataIndex: 'b', key: 'b', width: 100 },
46+
{ title: 'title 3', dataIndex: 'c', key: 'c', width: 200 },
47+
{ title: 'Operation', dataIndex: '', key: 'x', render: this.renderAction },
48+
]
49+
5050
toggleButton() {
5151
if (this.state.expandedRowKeys.length) {
5252
const closeAll = () => this.setState({ expandedRowKeys: [] });
@@ -108,7 +108,7 @@ class App extends React.Component {
108108
ReactDOM.render(
109109
<div>
110110
<h2>expandedRowRender</h2>
111-
<App />
111+
<Demo />
112112
</div>,
113113
document.getElementById('__react-content')
114114
);

‎examples/key.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable no-console,func-names,react/no-multi-comp */
22
import React from 'react';
33
import ReactDOM from 'react-dom';
4+
import PropTypes from 'prop-types';
45
import Table from 'rc-table';
56
import 'rc-table/assets/index.less';
67

@@ -11,7 +12,11 @@ const CheckBox = ({ id }) => (
1112
</label>
1213
);
1314

14-
class MyTable extends React.Component {
15+
class Demo extends React.Component {
16+
static propTypes = {
17+
data: PropTypes.array.isRequired,
18+
}
19+
1520
constructor(props) {
1621
super(props);
1722

@@ -59,7 +64,7 @@ const data = [{ a: '123' }, { a: 'cdd', b: 'edd' }, { a: '1333', c: 'eee', d: 2
5964
ReactDOM.render(
6065
<div>
6166
<h2>specify key</h2>
62-
<MyTable data={data} />
67+
<Demo data={data} />
6368
</div>,
6469
document.getElementById('__react-content')
6570
);

‎src/BaseTable.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,17 @@ import ExpandableRow from './ExpandableRow';
88

99
class BaseTable extends React.Component {
1010
static propTypes = {
11-
fixed: PropTypes.string,
11+
fixed: PropTypes.oneOfType([
12+
PropTypes.string,
13+
PropTypes.bool,
14+
]),
1215
columns: PropTypes.array.isRequired,
1316
tableClassName: PropTypes.string.isRequired,
1417
hasHead: PropTypes.bool.isRequired,
1518
hasBody: PropTypes.bool.isRequired,
19+
store: PropTypes.object.isRequired,
20+
expander: PropTypes.object.isRequired,
21+
getRowKey: PropTypes.func,
1622
}
1723

1824
static contextTypes = {
@@ -27,13 +33,9 @@ class BaseTable extends React.Component {
2733

2834
renderRows = (renderData, indent, ancestorKeys = []) => {
2935
const { table } = this.context;
30-
const {
31-
columnManager,
32-
onExpanded,
33-
} = table;
36+
const { columnManager } = table;
3437
const {
3538
prefixCls,
36-
data,
3739
childrenColumnName,
3840
rowClassName,
3941
rowRef,
@@ -43,14 +45,13 @@ class BaseTable extends React.Component {
4345
onRowMouseEnter,
4446
onRowMouseLeave,
4547
} = table.props;
46-
const { getRowKey, columns, fixed, expander } = this.props;
48+
const { getRowKey, fixed, expander } = this.props;
4749

48-
let rows = [];
50+
const rows = [];
4951

5052
for (let i = 0; i < renderData.length; i++) {
5153
const record = renderData[i];
5254
const key = getRowKey(record, i);
53-
const childrenData = record[childrenColumnName];
5455
const className = typeof rowClassName === 'string'
5556
? rowClassName
5657
: rowClassName(record, i, indent);
@@ -84,7 +85,7 @@ class BaseTable extends React.Component {
8485
needIndentSpaced={expander.needIndentSpaced}
8586
onExpandedChange={expander.handleExpandChange}
8687
>
87-
{( expandableRow ) => (
88+
{(expandableRow) => ( // eslint-disable-line
8889
<TableRow
8990
fixed={fixed}
9091
indent={indent}

‎src/BodyTable.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,15 @@ export default function BodyTable(props, { table }) {
9191
}
9292

9393
BodyTable.propTypes = {
94-
fixed: PropTypes.string,
94+
fixed: PropTypes.oneOfType([
95+
PropTypes.string,
96+
PropTypes.bool,
97+
]),
9598
columns: PropTypes.array.isRequired,
9699
tableClassName: PropTypes.string.isRequired,
97100
handleBodyScroll: PropTypes.func.isRequired,
101+
getRowKey: PropTypes.func.isRequired,
102+
expander: PropTypes.object.isRequired,
98103
};
99104

100105
BodyTable.contextTypes = {

‎src/ExpandableRow.js‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,42 @@
11
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { connect } from 'mini-store';
34
import ExpandIcon from './ExpandIcon';
45

56
class ExpandableRow extends React.Component {
7+
static propTypes = {
8+
prefixCls: PropTypes.string.isRequired,
9+
rowKey: PropTypes.oneOfType([
10+
PropTypes.string,
11+
PropTypes.number,
12+
]).isRequired,
13+
fixed: PropTypes.oneOfType([
14+
PropTypes.string,
15+
PropTypes.bool,
16+
]),
17+
record: PropTypes.object.isRequired,
18+
indentSize: PropTypes.number,
19+
needIndentSpaced: PropTypes.bool.isRequired,
20+
expandRowByClick: PropTypes.bool,
21+
expanded: PropTypes.bool.isRequired,
22+
expandIconAsCell: PropTypes.bool,
23+
expandIconColumnIndex: PropTypes.number,
24+
childrenColumnName: PropTypes.string,
25+
expandedRowRender: PropTypes.func,
26+
onExpandedChange: PropTypes.func.isRequired,
27+
onRowClick: PropTypes.func,
28+
children: PropTypes.func.isRequired,
29+
}
30+
631
componentWillUnmount() {
732
this.handleDestroy();
833
}
934

1035
hasExpandIcon = (columnIndex) => {
1136
const { expandRowByClick } = this.props;
12-
return !this.expandIconAsCell && !expandRowByClick && columnIndex === this.expandIconColumnIndex;
37+
return !this.expandIconAsCell &&
38+
!expandRowByClick &&
39+
columnIndex === this.expandIconColumnIndex;
1340
}
1441

1542
handleExpandChange = (record, event) => {
@@ -35,7 +62,7 @@ class ExpandableRow extends React.Component {
3562
}
3663

3764
renderExpandIcon = () => {
38-
const { prefixCls, expanded, record, needIndentSpaced, onExpandedChange } = this.props;
65+
const { prefixCls, expanded, record, needIndentSpaced } = this.props;
3966

4067
return (
4168
<ExpandIcon
@@ -85,7 +112,7 @@ class ExpandableRow extends React.Component {
85112
hasExpandIcon: this.hasExpandIcon,
86113
renderExpandIcon: this.renderExpandIcon,
87114
renderExpandIconCell: this.renderExpandIconCell,
88-
}
115+
};
89116

90117
return this.props.children(expandableRowProps);
91118
}
@@ -94,4 +121,3 @@ class ExpandableRow extends React.Component {
94121
export default connect(({ expandedRowKeys }, { rowKey }) => ({
95122
expanded: !!~expandedRowKeys.indexOf(rowKey),
96123
}))(ExpandableRow);
97-

‎src/ExpandableTable.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@ class ExpandableTable extends React.Component {
1111
defaultExpandAllRows: PropTypes.bool,
1212
defaultExpandedRowKeys: PropTypes.array,
1313
expandIconColumnIndex: PropTypes.number,
14+
expandedRowRender: PropTypes.func,
1415
childrenColumnName: PropTypes.string,
1516
indentSize: PropTypes.number,
1617
onExpand: PropTypes.func,
1718
onExpandedRowsChange: PropTypes.func,
19+
columnManager: PropTypes.object.isRequired,
20+
store: PropTypes.object.isRequired,
21+
prefixCls: PropTypes.string.isRequired,
22+
data: PropTypes.array,
23+
children: PropTypes.func.isRequired,
1824
}
1925

2026
static defaultProps = {
@@ -85,7 +91,7 @@ class ExpandableTable extends React.Component {
8591
expandedRowKeys.push(rowKey);
8692
} else {
8793
// row was collapse
88-
let expandedRowIndex = expandedRowKeys.indexOf(rowKey);
94+
const expandedRowIndex = expandedRowKeys.indexOf(rowKey);
8995
if (expandedRowIndex !== -1) {
9096
expandedRowKeys.splice(expandedRowIndex, 1);
9197
}
@@ -101,7 +107,7 @@ class ExpandableTable extends React.Component {
101107

102108
renderExpandIndentCell = (rows, fixed) => {
103109
const { prefixCls, expandIconAsCell } = this.props;
104-
if (!expandIconAsCell || fixed == 'right') {
110+
if (!expandIconAsCell || fixed === 'right') {
105111
return;
106112
}
107113

@@ -155,7 +161,7 @@ class ExpandableTable extends React.Component {
155161
}
156162

157163
renderRows = (renderRows, record, index, indent, fixed, parentKey, ancestorKeys) => {
158-
const { expandedRowClassName, columns, expandedRowRender, childrenColumnName } = this.props;
164+
const { expandedRowClassName, expandedRowRender, childrenColumnName } = this.props;
159165
const childrenData = record[childrenColumnName];
160166
const expandedRowContent = expandedRowRender && expandedRowRender(record, index, indent);
161167
const nextAncestorKeys = [...ancestorKeys, parentKey];
@@ -167,7 +173,7 @@ class ExpandableTable extends React.Component {
167173
expandedRowClassName(record, index, indent),
168174
nextAncestorKeys,
169175
fixed,
170-
)
176+
),
171177
];
172178
}
173179

‎src/HeadTable.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,14 @@ export default function HeadTable(props, { table }) {
4545
}
4646

4747
HeadTable.propTypes = {
48-
fixed: PropTypes.string,
48+
fixed: PropTypes.oneOfType([
49+
PropTypes.string,
50+
PropTypes.bool,
51+
]),
4952
columns: PropTypes.array.isRequired,
5053
tableClassName: PropTypes.string.isRequired,
5154
handleBodyScrollLeft: PropTypes.func.isRequired,
55+
expander: PropTypes.object.isRequired,
5256
};
5357

5458
HeadTable.contextTypes = {

‎src/Table.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ export default class Table extends React.Component {
278278

279279
const table = [
280280
this.renderTable({
281-
columns: this.columnManager.groupedColumns()
281+
columns: this.columnManager.groupedColumns(),
282282
}),
283283
this.renderEmptyText(),
284284
this.renderFooter(),
285285
];
286286

287287
return scrollable ? (
288288
<div className={`${prefixCls}-scroll`}>{table}</div>
289-
): table;
289+
) : table;
290290
}
291291

292292
renderLeftFixedTable() {
@@ -296,7 +296,7 @@ export default class Table extends React.Component {
296296
<div className={`${prefixCls}-fixed-left`}>
297297
{this.renderTable({
298298
columns: this.columnManager.leftColumns(),
299-
fixed: 'left',
299+
fixed: 'left',
300300
})}
301301
</div>
302302
);
@@ -309,7 +309,7 @@ export default class Table extends React.Component {
309309
<div className={`${prefixCls}-fixed-right`}>
310310
{this.renderTable({
311311
columns: this.columnManager.rightColumns(),
312-
fixed: 'right',
312+
fixed: 'right',
313313
})}
314314
</div>
315315
);

‎src/TableHeader.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ export default function TableHeader(props, { table }) {
6565
TableHeader.propTypes = {
6666
fixed: PropTypes.string,
6767
columns: PropTypes.array.isRequired,
68+
expander: PropTypes.object.isRequired,
6869
};
6970

7071
TableHeader.contextTypes = {

0 commit comments

Comments
 (0)