根据eslint规范修改代码

wolaiyehaibu · Jul 20, 2018 · 3ddae71 · 3ddae71
1 parent 29281f8
commit 3ddae71
Show file tree

Hide file tree

Showing 47 changed files with 214 additions and 224 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -14,6 +14,7 @@
       "allowTernary": true
     }],
     "no-console": 0,
+    "no-script-url": 0,
     "no-extend-native": 0,
     "no-param-reassign": 0,
     "no-restricted-syntax": 0,
@@ -23,7 +24,11 @@
     "no-plusplus": 0,
     "no-unused-vars": [2, { "ignoreRestSiblings": true }],
     "no-underscore-dangle": 0,
-    "space-before-function-paren": [2, "always"],
+    "space-before-function-paren": ["error", {
+      "anonymous":"always",
+      "named":"never",
+      "asyncArrow":"always"
+    }],
 
     "import/no-extraneous-dependencies": 0,
     "import/prefer-default-export": 0,

diff --git a/.umirc.js b/.umirc.js
@@ -10,8 +10,7 @@ export default {
           /service\.(j|t)sx?$/,
           /models\//,
           /components\//,
-          /services\//,
-          /chart\/Container\.js$/,
+          /services\//
         ],
       },
     ],

diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
   ],
   "scripts": {
     "analyze": "cross-env ANALYZE=1 BABELRC=1 umi build",
-    "start": "cross-env BABELRC=1 COMPILE_ON_DEMAND=none BROWSER=none ESLINT=none HOST=0.0.0.0 umi dev",
+    "start": "cross-env BABELRC=1 COMPILE_ON_DEMAND=none BROWSER=none HOST=0.0.0.0 umi dev",
     "lint": "eslint --fix --ext .js src",
     "build": "cross-env BABELRC=1 umi build",
     "test": "umi test"

diff --git a/src/components/Exception/index.js b/src/components/Exception/index.js
@@ -23,7 +23,7 @@ export default ({ className, linkElement = 'a', type, title, desc, img, actions,
             actions ||
               createElement(linkElement, {
                 to: '/',
-                href: '/',
+                href: '/'
               }, <Button type="primary">返回首页</Button>)
           }
 

diff --git a/src/components/Exception/typeConfig.js b/src/components/Exception/typeConfig.js
@@ -2,18 +2,18 @@ const config = {
   403: {
     img: 'https://gw.alipayobjects.com/zos/rmsportal/wZcnGqRDyhPOEYFcZDnb.svg',
     title: '403',
-    desc: '抱歉，你无权访问该页面',
+    desc: '抱歉，你无权访问该页面'
   },
   404: {
     img: 'https://gw.alipayobjects.com/zos/rmsportal/KpnpchXsobRgLElEozzI.svg',
     title: '404',
-    desc: '抱歉，你访问的页面不存在',
+    desc: '抱歉，你访问的页面不存在'
   },
   500: {
     img: 'https://gw.alipayobjects.com/zos/rmsportal/RVRUAYdCGeYNBWoKiIwB.svg',
     title: '500',
-    desc: '抱歉，服务器出错了',
-  },
+    desc: '抱歉，服务器出错了'
+  }
 };
 
 export default config;
diff --git a/src/components/Form/AutoField.js b/src/components/Form/AutoField.js
@@ -83,7 +83,7 @@ class AutoField extends React.Component {
 
   initFileFields(field) {
     if (!field) return;
-    if (field.fieldType == 'img' || field.fieldType == 'imgs' || field.fieldType == 'file' || field.fieldType == 'files') {
+    if (field.fieldType === 'img' || field.fieldType === 'imgs' || field.fieldType === 'file' || field.fieldType === 'files') {
       let fieldValue = field.value || '';
       let fileArr = [];
       if (fieldValue.length > 0) {
@@ -109,7 +109,7 @@ class AutoField extends React.Component {
     this.initFileFields(field);
   }
 
-  componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps) {
     let field = nextProps.fieldOption;
 
     if (!util.object.equal(nextProps.field, this.props.fieldOption)) {
@@ -124,7 +124,7 @@ class AutoField extends React.Component {
 
   getValueTag(field) {
     let self = this;
-    if (typeof (field.value) == 'undefined' || field.value == 'null') {
+    if (typeof (field.value) === 'undefined' || field.value === 'null') {
       field.value = '';
     }
     if (field.render && typeof (field.render) === 'function') return field.render(field.value);
@@ -150,7 +150,7 @@ class AutoField extends React.Component {
           onChange={value => self.onChange(util.string.isEmpty(value) ? 0 : value)} />;
       case "switch":
         return <Switch disabled={field.disabled}
-          checked={field.value == true}
+          checked={field.value === true}
           checkedChildren={<Icon type="check" />}
           unCheckedChildren={<Icon type="cross" />}
           onChange={value => self.onChange(value ? "1" : "0")} />;
@@ -209,7 +209,7 @@ class AutoField extends React.Component {
     let fieldOption = this.props.fieldOption;
     let formItemLayout = {
       labelCol: { span: this.props.labelColSpan },
-      wrapperCol: { span: 20 - this.props.labelColSpan },
+      wrapperCol: { span: 20 - this.props.labelColSpan }
     };
 
     return <FormItem {...formItemLayout} label={
@@ -232,7 +232,7 @@ class AutoField extends React.Component {
 AutoField.propTypes = {
   fieldOption: PropTypes.object.isRequired,
   labelColSpan: PropTypes.number,
-  onChange: PropTypes.func,
+  onChange: PropTypes.func
 }
 
 AutoField.defaultProps = {

diff --git a/src/components/Form/BirdCascader.js b/src/components/Form/BirdCascader.js
@@ -31,7 +31,7 @@ class BirdCascader extends React.Component {
     }
   }
 
-  componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps) {
     if (!util.object.equal(nextProps.data, this.props.data)) {
       this.initData(nextProps.data)
     }
@@ -45,7 +45,7 @@ class BirdCascader extends React.Component {
     let hash = {}
     data.forEach(item => {
       hash[item['value']] = item;
-      if (item.folder + '' == 'true') {
+      if (item.folder + '' === 'true') {
         folderNodes.push(item);
       }
     });
@@ -64,7 +64,7 @@ class BirdCascader extends React.Component {
     for (let i = 0, len = folderNodes.length; i < len; i++) {
       let curNode = folderNodes[i];
 
-      while (curNode != null && typeof (curNode) != 'undefined') {
+      while (curNode !== null && typeof (curNode) !== 'undefined') {
         let value = curNode['value'];
         if (hash[value]['children'] && hash[value]['children'].length > 0) break;
 
@@ -73,7 +73,7 @@ class BirdCascader extends React.Component {
         let pArr = pNode ? pNode['children'] : options;
 
         let index = pArr.findIndex(item => item['value'] === value);
-        if (index == -1) break;
+        if (index === -1) break;
 
         pArr.splice(index, 1)
         curNode = hash[pValue];

diff --git a/src/components/Form/BirdForm.js b/src/components/Form/BirdForm.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { request, deepClone,util } from 'utils';
+import { request, deepClone, util } from 'utils';
 import AutoField from './AutoField';
-import {Form,message,Button,Tabs,Row,Col} from 'antd';
+import { Form, message, Button, Tabs, Row, Col } from 'antd';
 
 const FormItem = Form.Item;
 const TabPane = Tabs.TabPane;
@@ -29,8 +29,8 @@ class BirdForm extends React.Component {
       isValueChange: false
     }
   }
-  componentWillReceiveProps(nextProps) {
-    if (nextProps.value != this.props.value) {
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    if (nextProps.value !== this.props.value) {
       let initValue = deepClone(nextProps.value)
       this.setState({
         initValue: initValue
@@ -43,13 +43,13 @@ class BirdForm extends React.Component {
   }
 
   initGroup() {
-    if (!this.props.withTab || this.props.fields.length == 0 || this.state.group.length > 0) return;
+    if (!this.props.withTab || this.props.fields.length === 0 || this.state.group.length > 0) return;
 
     let group = [];
     for (let field of this.props.fields) {
       let groupName = field.groupName || this.props.defaultGroupName;
 
-      let index = group.findIndex(g => g.groupName == groupName);
+      let index = group.findIndex(g => g.groupName === groupName);
       if (index < 0) {
         group.push({
           groupName: groupName,
@@ -103,20 +103,20 @@ class BirdForm extends React.Component {
 
   save() {
     let self = this;
-    if(!self.validate())return;
+    if (!self.validate()) return;
 
     let dto = self.getResult();
-    self.setState({submitting: true})
+    self.setState({ submitting: true })
 
     request({
       url: this.props.saveUrl,
       method: "post",
       data: dto
     }).then(function () {
-      self.setState({submitting: false});
+      self.setState({ submitting: false });
       message.success('保存成功');
     }).catch(function () {
-      self.setState({submitting: false});
+      self.setState({ submitting: false });
     });
   }
 
@@ -145,17 +145,17 @@ class BirdForm extends React.Component {
     }
 
     let autoFields = rows.map((row, index) => {
-      return <Row key={formKey+'_row_' + index}>
+      return <Row key={formKey + '_row_' + index}>
         {row.map(field => {
-          let colSpan = field.colSpan||1;
+          let colSpan = field.colSpan || 1;
           if (colSpan > 4) {
             colSpan = 4;
           }
           let unit = 24 / self.props.lineCapacity;
-          return <Col span={colSpan * unit} key={formKey+'_field_' + field.key}>
+          return <Col span={colSpan * unit} key={formKey + '_field_' + field.key}>
             {field.fieldType !== 'empty' &&
-            <AutoField fieldOption={field} labelColSpan={6 / colSpan}
-                       onChange={(key, value) => self.onFieldChange(key, value)}/>}
+              <AutoField fieldOption={field} labelColSpan={6 / colSpan}
+                onChange={(key, value) => self.onFieldChange(key, value)} />}
           </Col>
         })}
       </Row>
@@ -168,9 +168,9 @@ class BirdForm extends React.Component {
 
     const submitFormLayout = {
       wrapperCol: {
-        xs: {span: 24, offset: 0},
-        sm: {span: 10, offset: 7},
-      },
+        xs: { span: 24, offset: 0 },
+        sm: { span: 10, offset: 7 }
+      }
     };
 
     const button = <Button type="primary" loading={this.state.submitting} icon='save' onClick={() => self.save()}>
@@ -180,7 +180,7 @@ class BirdForm extends React.Component {
     return (
       self.props.withTab
         ? <Tabs type={self.props.tabType} tabPosition={self.props.tabPosition}
-                tabBarExtraContent={this.props.saveUrl && button}>
+          tabBarExtraContent={this.props.saveUrl && button}>
           {self.state.group.map((group, index) => {
             return <TabPane tab={group.groupName} key={'group_' + index}>
               <Form>
@@ -191,7 +191,7 @@ class BirdForm extends React.Component {
         </Tabs>
         : <Form>
           {self.getFields(self.props.fields)}
-          {this.props.saveUrl && <FormItem {...submitFormLayout} style={{marginTop: 32}}>
+          {this.props.saveUrl && <FormItem {...submitFormLayout} style={{ marginTop: 32 }}>
             {button}
           </FormItem>}
         </Form>
@@ -200,16 +200,16 @@ class BirdForm extends React.Component {
 }
 
 BirdForm.propTypes = {
-  fields:PropTypes.array.isRequired,
-  lineCapacity:PropTypes.number,//每行容量
-  withTab:PropTypes.bool,//是否使用tab展示
+  fields: PropTypes.array.isRequired,
+  lineCapacity: PropTypes.number,//每行容量
+  withTab: PropTypes.bool,//是否使用tab展示
   defaultGroupName: PropTypes.string,//默认的分组名
   activeGroupName: PropTypes.string,//选中的分组名
   tabType: PropTypes.string,//tab类型
   tabPosition: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),//tab的位置
 
-  saveUrl:PropTypes.string,
-  value:PropTypes.object
+  saveUrl: PropTypes.string,
+  value: PropTypes.object
 };
 
 BirdForm.defaultProps = {

diff --git a/src/components/Form/BirdMulti.js b/src/components/Form/BirdMulti.js
@@ -5,7 +5,7 @@ import { Checkbox } from 'antd';
 const CheckboxGroup = Checkbox.Group;
 
 const formatOption = options => {
-  if (!options || options.length == 0) return [];
+  if (!options || options.length === 0) return [];
 
   return options.map(o => {
     o['disabled'] = o['disabled'] + '' === 'true';
@@ -48,7 +48,7 @@ class BirdMulti extends React.Component {
     }
   }
 
-  componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps) {
     if (!util.object.equal(nextProps.options, this.props.options)) {
       this.setState({
         options: nextProps.options
@@ -58,12 +58,12 @@ class BirdMulti extends React.Component {
 
   checkAll = () => {
     let enableOptions = this.state.options.filter(o => !o.disabled);
-    if(enableOptions.length == 0) return;
+    if(enableOptions.length === 0) return;
 
     let allValues = enableOptions.map(p => p.value);
 
     let checkedValues = this.props.selectedValue ? this.props.selectedValue.split(',') : [];
-    let isCheckAll = checkedValues.length == enableOptions.length;
+    let isCheckAll = checkedValues.length === enableOptions.length;
     if (isCheckAll) {
       this.onPropsChange('');
     } else {
@@ -77,7 +77,7 @@ class BirdMulti extends React.Component {
 
   render() {
     let checkedValues = this.props.selectedValue ? this.props.selectedValue.split(',') : [];
-    let isCheckAll = checkedValues.length == this.state.options.filter(o => !o.disabled).length;
+    let isCheckAll = checkedValues.length === this.state.options.filter(o => !o.disabled).length;
     let options = this.state.options.map(option => { option.disabled = option.disabled + ''==='true'; return option });
 
     return (

diff --git a/src/components/Form/BirdSelector.js b/src/components/Form/BirdSelector.js
@@ -4,10 +4,10 @@ import { request, config, util } from 'utils';
 import { Select } from 'antd';
 
 const formatOption = options => {
-  if (!options || options.length == 0) return [];
+  if (!options || options.length === 0) return [];
 
   return options.map(o => {
-    if (typeof (o['disabled']) == 'string') o['disabled'] = o['disabled'] === 'true';
+    if (typeof (o['disabled']) === 'string') o['disabled'] = o['disabled'] === 'true';
     return o;
   });
 }
@@ -49,7 +49,7 @@ class BirdSelector extends React.Component {
     }
   }
 
-  componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps) {
     if (!util.object.equal(nextProps.data, this.props.data)) {
       this.setState({
         options: nextProps.data

diff --git a/src/components/Form/BirdStoredForm.js b/src/components/Form/BirdStoredForm.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { request, deepClone } from 'utils';
+import { request } from 'utils';
 import BirdForm from './BirdForm';
 import {Card} from 'antd';
 
@@ -22,7 +22,7 @@ class BirdStoredForm extends React.Component {
     }
   }
 
-  componentWillMount() {
+  componentDidMount() {
     let self = this;
 
     request({