dtable-statistic 4.3.3 → 4.3.4

package/es/utils/trend-utils.js

@@ -1,51 +1,43 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getCompareDate = getCompareDate;
-exports.summaryDurationResult = summaryDurationResult;
-var _dayjs = _interopRequireDefault(require("dayjs"));
-var _quarterOfYear = _interopRequireDefault(require("dayjs/plugin/quarterOfYear"));
-var _commonUtils = require("./common-utils");
-var _constants = require("../constants");
-_dayjs.default.extend(_quarterOfYear.default);
-function getCompareDate(dateGranularity) {
-  const currentDate = (0, _dayjs.default)();
+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) {
+  const currentDate = dayjs();
   switch (dateGranularity) {
-    case _constants.DATE_GRANULARITY.DAY:
+    case DATE_GRANULARITY.DAY:
       {
-        const compareDate = (0, _dayjs.default)(currentDate).subtract(1, 'days').format('YYYY-MM-DD');
-        const comparedDate = (0, _dayjs.default)(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,
           comparedDate
         };
       }
-    case _constants.DATE_GRANULARITY.WEEK:
+    case DATE_GRANULARITY.WEEK:
       {
-        const currentWeek = (0, _dayjs.default)().day(1);
-        const compareDate = (0, _dayjs.default)(currentWeek).subtract(1, 'weeks').format('YYYY-MM-DD');
-        const comparedDate = (0, _dayjs.default)(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,
           comparedDate
         };
       }
-    case _constants.DATE_GRANULARITY.MONTH:
+    case DATE_GRANULARITY.MONTH:
       {
-        const compareDate = (0, _dayjs.default)(currentDate).subtract(1, 'months').format('YYYY-MM');
-        const comparedDate = (0, _dayjs.default)(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,
           comparedDate
         };
       }
-    case _constants.DATE_GRANULARITY.QUARTER:
+    case DATE_GRANULARITY.QUARTER:
       {
-        const currentQuarter = (0, _dayjs.default)().quarter();
-        const currentYear = (0, _dayjs.default)().year();
+        const currentQuarter = dayjs().quarter();
+        const currentYear = dayjs().year();
         let lastQuarter = currentQuarter - 1;
         let compareDate, comparedDate;
         if (lastQuarter < 1) {
@@ -66,9 +58,9 @@ function getCompareDate(dateGranularity) {
           comparedDate
         };
       }
-    case _constants.DATE_GRANULARITY.YEAR:
+    case DATE_GRANULARITY.YEAR:
       {
-        const currentYear = (0, _dayjs.default)().year();
+        const currentYear = dayjs().year();
         return {
           compareDate: currentYear - 1 + '',
           comparedDate: currentYear - 2 + ''
@@ -80,12 +72,12 @@ function getCompareDate(dateGranularity) {
       }
   }
 }
-function summaryDurationResult(result, duration, summaryType, summaryMethod, useDataDb, dbDateKey, valueKey) {
-  const currentTime = (0, _dayjs.default)();
+export function summaryDurationResult(result, duration, summaryType, summaryMethod, useDataDb, dbDateKey, valueKey) {
+  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 = (0, _dayjs.default)(middleDate).subtract(days, 'days').format('YYYY-MM-DD');
+  const startDate = dayjs(middleDate).subtract(days, 'days').format('YYYY-MM-DD');
   let compareValue = [];
   let comparedValue = [];
   if (useDataDb) {
@@ -106,13 +98,13 @@ function summaryDurationResult(result, duration, summaryType, summaryMethod, use
     for (let item of result) {
       const key = item[0];
       if (key >= startDate && key < middleDate) {
-        if (summaryType === _constants.SUMMARY_TYPE.ADVANCED) {
+        if (summaryType === SUMMARY_TYPE.ADVANCED) {
           comparedValue = comparedValue.concat(item[1] || []);
         } else {
           comparedValue.push(item[1]);
         }
       } else if (key >= middleDate && key < endDate) {
-        if (summaryType === _constants.SUMMARY_TYPE.ADVANCED) {
+        if (summaryType === SUMMARY_TYPE.ADVANCED) {
           compareValue = compareValue.concat(item[1] || []);
         } else {
           compareValue.push(item[1]);
@@ -120,12 +112,12 @@ function summaryDurationResult(result, duration, summaryType, summaryMethod, use
       }
     }
   }
-  if (summaryType === _constants.SUMMARY_TYPE.ADVANCED) {
-    comparedValue = (0, _commonUtils.getSummaryResult)(comparedValue, summaryMethod);
-    compareValue = (0, _commonUtils.getSummaryResult)(compareValue, summaryMethod);
+  if (summaryType === SUMMARY_TYPE.ADVANCED) {
+    comparedValue = getSummaryResult(comparedValue, summaryMethod);
+    compareValue = getSummaryResult(compareValue, summaryMethod);
   } else {
-    compareValue = (0, _commonUtils.getSummaryResult)(compareValue, 'Sum');
-    comparedValue = (0, _commonUtils.getSummaryResult)(comparedValue, 'Sum');
+    compareValue = getSummaryResult(compareValue, 'Sum');
+    comparedValue = getSummaryResult(comparedValue, 'Sum');
   }
   return {
     compareValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.3.3",
+  "version": "4.3.4",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",