Merge branch 'master' of https://gitee.com/MTrun/big-screen-vue-datav into development

src/utils/index.js

@@ -1,35 +1,16 @@
-export function debounce(func, wait, immediate) {
-  let timeout, args, context, timestamp, result;
-
-  const later = function() {
-    // 据上一次触发时间间隔
-    const last = +new Date() - timestamp;
-
-    // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
-    if (last < wait && last > 0) {
-      timeout = setTimeout(later, wait - last);
-    } else {
-      timeout = null;
-      // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
-      if (!immediate) {
-        result = func.apply(context, args);
-        if (!timeout) context = args = null;
-      }
-    }
-  };
-
-  return function(...args) {
-    context = this;
-    timestamp = +new Date();
-    const callNow = immediate && !timeout;
-    // 如果延时不存在，重新设定延时
-    if (!timeout) timeout = setTimeout(later, wait);
-    if (callNow) {
-      result = func.apply(context, args);
-      context = args = null;
-    }
-
-    return result;
+/**
+ * @param {Function} fn 函数
+ * @param {Number} delay 延迟时间
+ */
+export function debounce(fn, delay) {
+  var timer;
+  return function () {
+    var context = this;
+    var args = arguments;
+    clearTimeout(timer);
+    timer = setTimeout(function () {
+      fn.apply(context, args);
+    }, delay);
   };
 }
 
@@ -38,9 +19,9 @@ export function debounce(func, wait, immediate) {
  * @param {String} fmt 需要转换的格式 如 yyyy-MM-dd、yyyy-MM-dd HH:mm:ss
  */
 export function formatTime(time, fmt) {
-  if (!time) return ''
+  if (!time) return '';
   else {
-    const date = new Date(time)
+    const date = new Date(time);
     const o = {
       'M+': date.getMonth() + 1,
       'd+': date.getDate(),
@@ -48,15 +29,23 @@ export function formatTime(time, fmt) {
       'm+': date.getMinutes(),
       's+': date.getSeconds(),
       'q+': Math.floor((date.getMonth() + 3) / 3),
-      'S': date.getMilliseconds()
-    }
-    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+      S: date.getMilliseconds(),
+    };
+    if (/(y+)/.test(fmt))
+      fmt = fmt.replace(
+        RegExp.$1,
+        (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+      );
     for (const k in o) {
       if (new RegExp('(' + k + ')').test(fmt)) {
-        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : ((
-          '00' + o[k]).substr(('' + o[k]).length)))
+        fmt = fmt.replace(
+          RegExp.$1,
+          RegExp.$1.length === 1
+            ? o[k]
+            : ('00' + o[k]).substr(('' + o[k]).length)
+        );
       }
     }
-    return fmt
+    return fmt;
   }
 }

src/utils/resizeMixins.js

@@ -1,5 +1,5 @@
 // 混入代码 resize-mixins.js
-import { debounce } from '@/utils/index';
+import { debounce } from '@/utils';
 const resizeChartMethod = '$__resizeChartMethod';
 
 export default {