Skip to content

Commit 0d8f4f0

Browse files
liiil825sunnywx
liiil825
authored and
sunnywx
committed
fix: Eslint warnings (#550)
1 parent 30ea9cd commit 0d8f4f0

File tree

60 files changed

+295
-308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+295
-308
lines changed

‎.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ module.exports = {
6868
'arrow-parens': 'off',
6969

7070
// import
71-
'import/no-extraneous-dependencies': ['warn', { devDependencies: false }],
71+
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
7272
'import/no-dynamic-require': 'warn',
7373
'import/no-unresolved': 'off',
7474
'import/extensions': 'off',

‎src/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { Suspense } from 'react';
1+
import React from 'react';
22
import PropTypes from 'prop-types';
33

44
import { Provider } from 'mobx-react';

‎src/components/Base/Notification/item.jsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,25 @@ export default class NotificationItem extends React.Component {
3333
ts: Date.now()
3434
};
3535

36-
timer = null;
37-
3836
state = {
3937
hidden: false
4038
};
4139

40+
componentDidMount() {
41+
const { timeOut } = this.props;
42+
if (timeOut) {
43+
this.timer = setTimeout(this.hideNotify, timeOut);
44+
}
45+
}
46+
47+
componentWillUnmount() {
48+
clearTimeout(this.timer);
49+
this.timer = null;
50+
this.props.onClosed();
51+
}
52+
53+
timer = null;
54+
4255
// based on font-awesome icons
4356
iconMap = {
4457
error: 'error',
@@ -65,20 +78,7 @@ export default class NotificationItem extends React.Component {
6578
});
6679
};
6780

68-
componentDidMount() {
69-
const { timeOut } = this.props;
70-
if (timeOut) {
71-
this.timer = setTimeout(this.hideNotify, timeOut);
72-
}
73-
}
74-
75-
componentWillUnmount() {
76-
clearTimeout(this.timer);
77-
this.timer = null;
78-
this.props.onClosed();
79-
}
80-
81-
handleClick = e => {
81+
handleClick = () => {
8282
// this.hideNotify();
8383
};
8484

‎src/components/Base/Pagination/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export default class Pagination extends React.Component {
136136
}
137137

138138
render() {
139-
const { total, className, ...rest } = this.props;
139+
const { total, className } = this.props;
140140
const { current } = this.state;
141141
const totalPage = this.calculatePage();
142142

‎src/components/Base/Select/select.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ export default class Select extends React.Component {
2626
isOpen: false
2727
};
2828

29-
childNodes = [];
30-
31-
currentLabel = '';
32-
3329
componentWillUnmount() {
3430
document.removeEventListener('click', this.handleOutsideClick.bind(this));
3531
}
3632

33+
childNodes = [];
34+
35+
currentLabel = '';
36+
3737
handleOutsideClick(e) {
3838
if (this.wrapper && !this.wrapper.contains(e.target)) {
3939
this.setState({ isOpen: false });
@@ -92,7 +92,7 @@ export default class Select extends React.Component {
9292

9393
renderControl() {
9494
const { isOpen } = this.state;
95-
const { value, disabled } = this.props;
95+
const { disabled } = this.props;
9696

9797
return (
9898
<div className={styles.control} onClick={this.handleControlClick}>

‎src/components/Base/Switch/index.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ export default class Switch extends PureComponent {
2828
};
2929
}
3030

31-
toggleSwitch = () => {
32-
const on = !this.state.on;
33-
this.setState({ on }, this.props.onChange(on));
34-
};
35-
3631
componentWillReceiveProps(nextProps) {
3732
if (nextProps.checked !== this.state.on) {
3833
this.setState({ on: nextProps.checked });
3934
}
4035
}
4136

37+
toggleSwitch = () => {
38+
const on = !this.state.on;
39+
this.setState({ on }, this.props.onChange(on));
40+
};
41+
4242
render() {
4343
const {
4444
disabled, type, onText, offText

‎src/components/Base/Table/noData.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { PureComponent } from 'react';
22
import PropTypes from 'prop-types';
3-
import classnames from 'classnames';
43
import { translate } from 'react-i18next';
54

65
import { Icon } from 'components/Base';

‎src/components/Base/Table/table.jsx

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,20 @@ export default class Table extends React.Component {
4242
};
4343
}
4444

45+
componentWillReceiveProps(nextProps) {
46+
if (!isEqual(this.props.dataSource, nextProps.dataSource)) {
47+
this.setState({
48+
selectionDirty: false
49+
});
50+
}
51+
52+
if (nextProps.rowSelection && nextProps.rowSelection.selectedRowKeys) {
53+
this.setState({
54+
selectedRowKeys: nextProps.rowSelection.selectedRowKeys || []
55+
});
56+
}
57+
}
58+
4559
getTableData = () => {
4660
const { rowKey } = this.props;
4761
const data = [...this.props.dataSource];
@@ -109,13 +123,8 @@ export default class Table extends React.Component {
109123
}
110124
};
111125

112-
setExtendRowKeys = (
113-
selectedRowKeys,
114-
{
115-
selectType, item, checked, changeRowKeys
116-
}
117-
) => {
118-
const { extendRowSelection } = this.props;
126+
setExtendRowKeys = () => {
127+
/* const { extendRowSelection } = this.props; */
119128
};
120129

121130
handleCheckboxSelect = (value, index, e) => {
@@ -354,20 +363,6 @@ export default class Table extends React.Component {
354363
);
355364
};
356365

357-
componentWillReceiveProps(nextProps) {
358-
if (!isEqual(this.props.dataSource, nextProps.dataSource)) {
359-
this.setState({
360-
selectionDirty: false
361-
});
362-
}
363-
364-
if (nextProps.rowSelection && nextProps.rowSelection.selectedRowKeys) {
365-
this.setState({
366-
selectedRowKeys: nextProps.rowSelection.selectedRowKeys || []
367-
});
368-
}
369-
}
370-
371366
render() {
372367
const {
373368
className,

‎src/components/Base/Tooltip/index.jsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,20 @@ export default class Tooltip extends React.Component {
3939
this.trigger = props.trigger;
4040
}
4141

42+
componentDidMount() {
43+
this.bindEvent();
44+
}
45+
46+
componentWillReceiveProps(nextProps) {
47+
if (nextProps.visible !== this.state.visible) {
48+
this.setState({ visible: nextProps.visible });
49+
}
50+
}
51+
52+
componentWillUnmount() {
53+
this.removeEvent();
54+
}
55+
4256
showPopper = () => {
4357
this.setState(
4458
{ visible: true },
@@ -110,20 +124,6 @@ export default class Tooltip extends React.Component {
110124
}
111125
};
112126

113-
componentWillReceiveProps(nextProps) {
114-
if (nextProps.visible !== this.state.visible) {
115-
this.setState({ visible: nextProps.visible });
116-
}
117-
}
118-
119-
componentDidMount() {
120-
this.bindEvent();
121-
}
122-
123-
componentWillUnmount() {
124-
this.removeEvent();
125-
}
126-
127127
render() {
128128
const {
129129
prefixCls,

‎src/components/Base/Upload/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { noop } from 'lodash';
66
import attrAccept from './utils/attr-accept';
77
import traverseFileTree from './utils/traverseFileTree';
88

9-
import styles from './index.scss';
9+
import './index.scss';
1010

1111
const now = Date.now();
1212
let index = 0;
@@ -17,8 +17,6 @@ function getUid() {
1717
}
1818

1919
export default class Upload extends Component {
20-
reqs = {};
21-
2220
static propTypes = {
2321
accept: PropTypes.string,
2422
checkFile: PropTypes.func,
@@ -54,6 +52,8 @@ export default class Upload extends Component {
5452
this.abort();
5553
}
5654

55+
reqs = {};
56+
5757
onChange = e => {
5858
const { files } = e.target;
5959
this.uploadFiles(files);

‎src/components/Base/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ export Timeline from './Timeline';
1616
export Tooltip from './Tooltip';
1717
export Image from './Image';
1818
export Upload from './Upload';
19-
export CodeMirror from './CodeMirror';

‎src/components/Card/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
33
import classnames from 'classnames';
44
import { withRouter } from 'react-router';
55

6-
import { Icon, Image } from 'components/Base';
6+
import { Image } from 'components/Base';
77

88
import styles from './index.scss';
99

‎src/components/CodeMirror/CodeMirror.jsx

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
3+
import CodeMirror from 'react-codemirror';
4+
5+
// fixme
6+
/* eslint-disable import/no-extraneous-dependencies */
7+
require('codemirror/lib/codemirror.css');
8+
require('codemirror/mode/yaml/yaml');
9+
10+
export default class LazyCodeMirror extends Component {
11+
static propTypes = {
12+
code: PropTypes.string,
13+
mode: PropTypes.string,
14+
onChange: PropTypes.func
15+
};
16+
17+
static defaultProps = {
18+
code: '',
19+
onChange: () => {},
20+
mode: 'yaml'
21+
};
22+
23+
render() {
24+
const {
25+
onChange, code, mode, ...rest
26+
} = this.props;
27+
28+
return (
29+
<CodeMirror
30+
value={code}
31+
onChange={onChange}
32+
options={{ mode }}
33+
{...rest}
34+
/>
35+
);
36+
}
37+
}

‎src/components/Base/CodeMirror/index.jsx renamed to ‎src/components/CodeMirror/index.jsx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
import React, { lazy, Suspense } from 'react';
22
import PropTypes from 'prop-types';
33

4-
const CodeMirror = lazy(() => import('react-codemirror'));
4+
const Component = lazy(() => import('./CodeMirror'));
55

6-
// fixme
7-
if (process.browser) {
8-
require('codemirror/mode/yaml/yaml');
9-
require('codemirror/mode/javascript/javascript');
10-
require('codemirror/lib/codemirror.css');
11-
}
12-
13-
export default class CodeMirrorX extends React.Component {
6+
export default class CodeMirror extends React.Component {
147
static propTypes = {
158
code: PropTypes.string,
169
mode: PropTypes.string,
@@ -23,19 +16,14 @@ export default class CodeMirrorX extends React.Component {
2316
mode: 'yaml'
2417
};
2518

26-
constructor(props) {
27-
super(props);
28-
this.state = { module: null };
29-
}
30-
3119
render() {
3220
const {
3321
onChange, code, mode, ...rest
3422
} = this.props;
3523

3624
return (
3725
<Suspense fallback={<div>Loading...</div>}>
38-
<CodeMirror
26+
<Component
3927
value={code}
4028
onChange={onChange}
4129
options={{ mode, lineNumbers: true }}

‎src/components/Deploy/section.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ import classnames from 'classnames';
44
import _ from 'lodash';
55

66
import {
7-
Radio, Input, Select, Slider, CodeMirror
7+
Radio, Input, Select, Slider
88
} from 'components/Base';
99

10+
import CodeMirror from 'components/CodeMirror';
11+
1012
import styles from './index.scss';
1113

1214
export default class Section extends React.Component {

‎src/components/DetailCard/CopyId.jsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default class CopyId extends React.Component {
2020
componentDidMount() {
2121
const { t } = this.props;
2222

23-
this.clipboard = new ClipboardJS(this.refs.copyBtn);
23+
this.clipboard = new ClipboardJS(this.copyBtn);
2424

2525
this.clipboard.on('success', e => {
2626
this.props.rootStore.notify({
@@ -41,7 +41,13 @@ export default class CopyId extends React.Component {
4141
return (
4242
<div className={classnames(styles.copyOuter, className)}>
4343
id: {id}
44-
<span className="copyId" data-clipboard-text={id} ref="copyBtn">
44+
<span
45+
className="copyId"
46+
data-clipboard-text={id}
47+
ref={node => {
48+
this.copyBtn = node;
49+
}}
50+
>
4551
<Icon name="copy" type="dark" />
4652
</span>
4753
</div>

‎src/components/DetailCard/UserCard.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default class UserCard extends React.Component {
2626
};
2727

2828
render() {
29-
const { userDetail, user, t } = this.props;
29+
const { userDetail, t } = this.props;
3030

3131
return (
3232
<div className={styles.detailCard}>

0 commit comments

Comments
 (0)