dtable-statistic 4.2.1 → 4.3.0

package/es/utils/trend-utils.js

@@ -1,70 +1,69 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import dayjs from 'dayjs';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';
 import { getSummaryResult } from './common-utils';
 import { DATE_GRANULARITY, SUMMARY_TYPE } from '../constants';
 dayjs.extend(quarterOfYear);
 export function getCompareDate(dateGranularity) {
-  var currentDate = dayjs();
+  const currentDate = dayjs();
   switch (dateGranularity) {
     case DATE_GRANULARITY.DAY:
       {
-        var compareDate = dayjs(currentDate).subtract(1, 'days').format('YYYY-MM-DD');
-        var comparedDate = dayjs(currentDate).subtract(2, 'days').format('YYYY-MM-DD');
+        const compareDate = dayjs(currentDate).subtract(1, 'days').format('YYYY-MM-DD');
+        const comparedDate = dayjs(currentDate).subtract(2, 'days').format('YYYY-MM-DD');
         return {
-          compareDate: compareDate,
-          comparedDate: comparedDate
+          compareDate,
+          comparedDate
         };
       }
     case DATE_GRANULARITY.WEEK:
       {
-        var currentWeek = dayjs().day(1);
-        var _compareDate = dayjs(currentWeek).subtract(1, 'weeks').format('YYYY-MM-DD');
-        var _comparedDate = dayjs(currentWeek).subtract(2, 'weeks').format('YYYY-MM-DD');
+        const currentWeek = dayjs().day(1);
+        const compareDate = dayjs(currentWeek).subtract(1, 'weeks').format('YYYY-MM-DD');
+        const comparedDate = dayjs(currentWeek).subtract(2, 'weeks').format('YYYY-MM-DD');
         return {
-          compareDate: _compareDate,
-          comparedDate: _comparedDate
+          compareDate,
+          comparedDate
         };
       }
     case DATE_GRANULARITY.MONTH:
       {
-        var _compareDate2 = dayjs(currentDate).subtract(1, 'months').format('YYYY-MM');
-        var _comparedDate2 = dayjs(currentDate).subtract(2, 'months').format('YYYY-MM');
+        const compareDate = dayjs(currentDate).subtract(1, 'months').format('YYYY-MM');
+        const comparedDate = dayjs(currentDate).subtract(2, 'months').format('YYYY-MM');
         return {
-          compareDate: _compareDate2,
-          comparedDate: _comparedDate2
+          compareDate,
+          comparedDate
         };
       }
     case DATE_GRANULARITY.QUARTER:
       {
-        var currentQuarter = dayjs().quarter();
-        var currentYear = dayjs().year();
-        var lastQuarter = currentQuarter - 1;
-        var _compareDate3, _comparedDate3;
+        const currentQuarter = dayjs().quarter();
+        const currentYear = dayjs().year();
+        let lastQuarter = currentQuarter - 1;
+        let compareDate, comparedDate;
         if (lastQuarter < 1) {
-          _compareDate3 = currentYear - 1 + '-Q4';
-          _comparedDate3 = currentYear - 1 + '-Q3';
+          compareDate = currentYear - 1 + '-Q4';
+          comparedDate = currentYear - 1 + '-Q3';
           return {
-            compareDate: _compareDate3,
-            comparedDate: _comparedDate3
+            compareDate,
+            comparedDate
           };
         }
-        _compareDate3 = currentYear + '-Q' + lastQuarter;
-        _comparedDate3 = currentYear + '-Q' + (lastQuarter - 1);
+        compareDate = currentYear + '-Q' + lastQuarter;
+        comparedDate = currentYear + '-Q' + (lastQuarter - 1);
         if (lastQuarter - 1 < 1) {
-          _comparedDate3 = currentYear - 1 + '-Q4';
+          comparedDate = currentYear - 1 + '-Q4';
         }
         return {
-          compareDate: _compareDate3,
-          comparedDate: _comparedDate3
+          compareDate,
+          comparedDate
         };
       }
     case DATE_GRANULARITY.YEAR:
       {
-        var _currentYear = dayjs().year();
+        const currentYear = dayjs().year();
         return {
-          compareDate: _currentYear - 1 + '',
-          comparedDate: _currentYear - 2 + ''
+          compareDate: currentYear - 1 + '',
+          comparedDate: currentYear - 2 + ''
         };
       }
     default:
@@ -74,19 +73,19 @@ export function getCompareDate(dateGranularity) {
   }
 }
 export function summaryDurationResult(result, duration, summaryType, summaryMethod, useDataDb, dbDateKey, valueKey) {
-  var currentTime = dayjs();
-  var days = duration === 'days_30' ? 30 : 7;
-  var endDate = currentTime.format('YYYY-MM-DD');
-  var middleDate = currentTime.subtract(days, 'days').format('YYYY-MM-DD');
-  var startDate = dayjs(middleDate).subtract(days, 'days').format('YYYY-MM-DD');
-  var compareValue = [];
-  var comparedValue = [];
+  const currentTime = dayjs();
+  const days = duration === 'days_30' ? 30 : 7;
+  const endDate = currentTime.format('YYYY-MM-DD');
+  const middleDate = currentTime.subtract(days, 'days').format('YYYY-MM-DD');
+  const startDate = dayjs(middleDate).subtract(days, 'days').format('YYYY-MM-DD');
+  let compareValue = [];
+  let comparedValue = [];
   if (useDataDb) {
-    var days1 = [];
-    var days2 = [];
-    for (var index = 0; index < result.length; index++) {
-      var item = result[index];
-      var key = item[dbDateKey];
+    const days1 = [];
+    const days2 = [];
+    for (let index = 0; index < result.length; index++) {
+      const item = result[index];
+      const key = item[dbDateKey];
       if (key >= startDate && key < middleDate) {
         comparedValue.push(item[valueKey]);
         days1.push(key);
@@ -96,30 +95,21 @@ export function summaryDurationResult(result, duration, summaryType, summaryMeth
       }
     }
   } else {
-    var _iterator = _createForOfIteratorHelper(result),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _item = _step.value;
-        var _key = _item[0];
-        if (_key >= startDate && _key < middleDate) {
-          if (summaryType === SUMMARY_TYPE.ADVANCED) {
-            comparedValue = comparedValue.concat(_item[1] || []);
-          } else {
-            comparedValue.push(_item[1]);
-          }
-        } else if (_key >= middleDate && _key < endDate) {
-          if (summaryType === SUMMARY_TYPE.ADVANCED) {
-            compareValue = compareValue.concat(_item[1] || []);
-          } else {
-            compareValue.push(_item[1]);
-          }
+    for (let item of result) {
+      const key = item[0];
+      if (key >= startDate && key < middleDate) {
+        if (summaryType === SUMMARY_TYPE.ADVANCED) {
+          comparedValue = comparedValue.concat(item[1] || []);
+        } else {
+          comparedValue.push(item[1]);
+        }
+      } else if (key >= middleDate && key < endDate) {
+        if (summaryType === SUMMARY_TYPE.ADVANCED) {
+          compareValue = compareValue.concat(item[1] || []);
+        } else {
+          compareValue.push(item[1]);
         }
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
     }
   }
   if (summaryType === SUMMARY_TYPE.ADVANCED) {
@@ -130,7 +120,7 @@ export function summaryDurationResult(result, duration, summaryType, summaryMeth
     comparedValue = getSummaryResult(comparedValue, 'Sum');
   }
   return {
-    compareValue: compareValue,
-    comparedValue: comparedValue
+    compareValue,
+    comparedValue
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -12,7 +12,7 @@
     "@seafile/seafile-calendar": "0.0.24",
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
-    "dtable-store": "4.2.3",
+    "dtable-store": "4.3.1",
     "dtable-web-api": "4.0.11",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",