Merge branch 'dev'

Author: sendya

package.json

@@ -74,7 +74,29 @@
       "vue/no-use-v-if-with-v-for": 0,
       "vue/html-closing-bracket-newline": 0,
       "vue/no-parsing-error": 0,
-      "no-console": 0
+      "no-console": 0,
+      "quotes": [
+        2,
+        "single",
+        {
+          "avoidEscape": true,
+          "allowTemplateLiterals": true
+        }
+      ],
+      "semi": [
+        2,
+        "never",
+        {
+          "beforeStatementContinuationChars": "never"
+        }
+      ],
+      "no-delete-var": 2,
+      "prefer-const": [
+        2,
+        {
+          "ignoreReadBeforeAssign": false
+        }
+      ]
     }
   },
   "postcss": {

src/App.vue

@@ -16,7 +16,7 @@
       }
     },
     created () {
-      let that = this
+      const that = this
       enquireScreen(deviceType => {
         // tablet
         if (deviceType === 0) {

src/components/AvatarList/Item.vue

@@ -11,7 +11,7 @@
   import Tooltip from 'ant-design-vue/es/tooltip'
 
   export default {
-    name: "AvatarItem",
+    name: 'AvatarItem',
     components: {
       Avatar,
       Tooltip

src/components/AvatarList/List.vue

@@ -23,7 +23,7 @@
 
   export default {
     AvatarItem,
-    name: "AvatarList",
+    name: 'AvatarList',
     components: {
       Avatar,
       AvatarItem

src/components/AvatarList/index.js

@@ -1,4 +1,4 @@
 import AvatarList from './List'
-import "./index.less"
+import './index.less'
 
 export default AvatarList

src/components/ChartCard.vue

@@ -24,7 +24,7 @@
 
 <script>
   export default {
-    name: "ChartCard",
+    name: 'ChartCard',
     props: {
       title: {
         type: String,

src/components/CountDown/CountDown.vue

@@ -7,11 +7,11 @@
 <script>
 
   function fixedZero(val) {
-    return val * 1 < 10 ? `0${val}` : val;
+    return val * 1 < 10 ? `0${val}` : val
   }
 
   export default {
-    name: "CountDown",
+    name: 'CountDown',
     props: {
       format: {
         type: Function,
@@ -38,12 +38,12 @@
     },
     filters: {
       format(time) {
-        const hours = 60 * 60 * 1000;
-        const minutes = 60 * 1000;
+        const hours = 60 * 60 * 1000
+        const minutes = 60 * 1000
 
-        const h = Math.floor(time / hours);
-        const m = Math.floor((time - h * hours) / minutes);
-        const s = Math.floor((time - h * hours - m * minutes) / 1000);
+        const h = Math.floor(time / hours)
+        const m = Math.floor((time - h * hours) / minutes)
+        const s = Math.floor((time - h * hours - m * minutes) / 1000)
         return `${fixedZero(h)}:${fixedZero(m)}:${fixedZero(s)}`
       }
     },
@@ -53,8 +53,8 @@
     },
     methods: {
       initTime() {
-        let lastTime = 0;
-        let targetTime = 0;
+        let lastTime = 0
+        let targetTime = 0
         this.originTargetTime = this.target
         try {
           if (Object.prototype.toString.call(this.target) === '[object Date]') {
@@ -66,7 +66,7 @@
           throw new Error('invalid target prop')
         }
 
-        lastTime = targetTime - new Date().getTime();
+        lastTime = targetTime - new Date().getTime()
 
         this.lastTime = lastTime < 0 ? 0 : lastTime
       },
@@ -78,7 +78,7 @@
             clearTimeout(this.timer)
             this.lastTime = 0
             if (typeof onEnd === 'function') {
-              onEnd();
+              onEnd()
             }
           } else {
             this.lastTime -= this.interval

src/components/Ellipsis/Ellipsis.vue

@@ -53,8 +53,8 @@
     },
     render () {
       const { tooltip, length } = this.$props
-      let str = this.$slots.default.map(vNode => vNode.text).join("")
-      const strDom = tooltip && getStrFullLength(str) > length ? this.getTooltip(str) : this.getStrDom(str);
+      const str = this.$slots.default.map(vNode => vNode.text).join('')
+      const strDom = tooltip && getStrFullLength(str) > length ? this.getTooltip(str) : this.getStrDom(str)
       return (
         strDom
       )

src/components/Trend/Trend.vue

@@ -12,7 +12,7 @@
 
 <script>
   export default {
-    name: "Trend",
+    name: 'Trend',
     props: {
       prefixCls: {
         type: String,

src/components/chart/Bar.vue

@@ -39,7 +39,7 @@
   }]
 
   export default {
-    name: "Bar",
+    name: 'Bar',
     props: {
       title: {
         type: String,