Browse Source

fix reveiw issue add consistent-return rule

愚道 7 years ago
parent
commit
6d0a622fcd
5 changed files with 8 additions and 28 deletions
  1. 0 1
      .eslintrc.js
  2. 3 16
      mock/api.js
  3. 2 10
      mock/rule.js
  4. 2 1
      src/pages/Dashboard/Analysis.js
  5. 1 0
      src/utils/utils.js

+ 0 - 1
.eslintrc.js

@@ -22,7 +22,6 @@ module.exports = {
     'jsx-a11y/click-events-have-key-events': 0,
     'jsx-a11y/no-static-element-interactions': 0,
     'jsx-a11y/anchor-is-valid': 0,
-    'consistent-return': 0,
   },
   settings: {
     polyfills: ['fetch', 'promises'],

+ 3 - 16
mock/api.js

@@ -118,12 +118,7 @@ function getFakeList(req, res) {
 
   const result = fakeList(count);
   sourceData = result;
-
-  if (res && res.json) {
-    res.json(result);
-  } else {
-    return result;
-  }
+  res.json(result);
 }
 
 function postFakeList(req, res) {
@@ -155,11 +150,7 @@ function postFakeList(req, res) {
       break;
   }
 
-  if (res && res.json) {
-    res.json(result);
-  } else {
-    return result;
-  }
+  res.json(result);
 }
 
 const getNotice = [
@@ -327,11 +318,7 @@ const getActivities = [
 ];
 
 function getFakeCaptcha(req, res) {
-  if (res && res.json) {
-    res.json('captcha-xxx');
-  } else {
-    return 'captcha-xxx';
-  }
+  res.json('captcha-xxx');
 }
 
 export default {

+ 2 - 10
mock/rule.js

@@ -72,11 +72,7 @@ function getRule(req, res, u) {
     },
   };
 
-  if (res && res.json) {
-    res.json(result);
-  } else {
-    return result;
-  }
+  res.json(result);
 }
 
 function postRule(req, res, u, b) {
@@ -133,11 +129,7 @@ function postRule(req, res, u, b) {
     },
   };
 
-  if (res && res.json) {
-    res.json(result);
-  } else {
-    return result;
-  }
+  res.json(result);
 }
 
 export default {

+ 2 - 1
src/pages/Dashboard/Analysis.js

@@ -132,7 +132,7 @@ class Analysis extends Component {
     const { rangePickerValue } = this.state;
     const value = getTimeDistance(type);
     if (!rangePickerValue[0] || !rangePickerValue[1]) {
-      return;
+      return undefined;
     }
     if (
       rangePickerValue[0].isSame(value[0], 'day') &&
@@ -140,6 +140,7 @@ class Analysis extends Component {
     ) {
       return styles.currentDate;
     }
+    return undefined;
   }
 
   render() {

+ 1 - 0
src/utils/utils.js

@@ -52,6 +52,7 @@ export function getTimeDistance(type) {
 
     return [moment(`${year}-01-01 00:00:00`), moment(`${year}-12-31 23:59:59`)];
   }
+  return undefined;
 }
 
 export function getPlainNode(nodeList, parentPath = '') {