dtable-statistic 4.0.8 → 4.0.10

package/es/calculator/workers/basic-chart-calculator-worker.js

@@ -306,8 +306,7 @@ function getGroupbyNumericColumnsChartResults(rows, formulaRows, groupbyColumn,
   return getGroupChartStatResult(table, value, groupbyColumn, numericSummaryColumnKey, rows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType);
 }
 function calculateGeolocationBasicChart(chart, value, username, userId) {
-  var type = chart.type,
-    table_id = chart.table_id,
+  var table_id = chart.table_id,
     view_id = chart.view_id,
     geo_column = chart.geo_column,
     geolocation_granularity = chart.geolocation_granularity,
@@ -315,9 +314,6 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
     summary_column = chart.summary_column,
     summary_method = chart.summary_method;
   var geolocationGranularity = geolocation_granularity;
-  if (type === STAT_TYPE.WORLD_MAP || type === STAT_TYPE.WORLD_MAP_BUBBLE) {
-    geolocationGranularity = null;
-  }
   var table = TableUtils.getTableById(value.tables, table_id);
   var view = table && Views.getViewById(table.views, view_id);
   if (!view) {

package/es/model/ring.js

@@ -25,13 +25,14 @@ var Ring = /*#__PURE__*/function (_BaseModel) {
     if (_this.summary_method === SUMMARY_METHOD_MAP.Row_count) {
       _this.summary_method = SUMMARY_METHOD_MAP.Max;
     }
-    _this.show_legend = object.show_legend;
-    _this.display_label = object.display_label;
+    _this.show_legend = isBoolean(object.show_legend) ? object.show_legend : true;
+    _this.display_label = isBoolean(object.display_label) ? object.display_label : true;
     _this.show_percent = object.show_percent;
     _this.sort_type = object.sort_type;
     _this.minimum_slice_percent = object.minimum_slice_percent;
     _this.display_annotation = isBoolean(object.display_annotation) ? object.display_annotation : true;
     _this.annotation_font_size = object.annotation_font_size;
+    _this.label_font_size = object.label_font_size;
     _this.label_format = object.label_format;
     _this.label_position = object.label_position;
     return _this;

package/es/service/dashboard-service.js

@@ -24,8 +24,14 @@ var DashBoardService = /*#__PURE__*/function () {
   _createClass(DashBoardService, [{
     key: "initStatistics",
     value: function initStatistics(value, updateStatistics, deletePluginSettings) {
-      this.statistics = value && value.statistics || [];
-      if (this.statistics.length === 0) {
+      var baseStatistics = value && value.statistics || [];
+      var advancedStatistics = this.getAdvancedStatistics(value);
+      var hasBaseStatistics = baseStatistics.length > 0;
+      var hasAdvancedStatistics = advancedStatistics.length > 0;
+      this.statistics = baseStatistics;
+
+      // init default dashboard if neither base-statistics nor advanced-statistics
+      if (!hasBaseStatistics && !hasAdvancedStatistics) {
         this.statistics = [new StatisticDashBoard({
           _id: generatorUniqueId([]),
           stat_items: [],
@@ -36,11 +42,15 @@ var DashBoardService = /*#__PURE__*/function () {
       this.needSave = false;
 
       // convert to advance-statistic
-      if (!hasOwnProperty(this.statistics[0], 'stat_items')) {
+      if (hasBaseStatistics && !hasOwnProperty(this.statistics[0], 'stat_items')) {
         this.needSave = true;
         this.convert2AdvanceStatistic();
       }
-      this.mergeAdvancedStatistics(value, deletePluginSettings);
+
+      // merge advanced statistics
+      if (hasAdvancedStatistics) {
+        this.mergeAdvancedStatistics(advancedStatistics, deletePluginSettings);
+      }
       this.filterInvalidCharts();
       if (this.needSave) {
         this.needSave = false;
@@ -148,12 +158,16 @@ var DashBoardService = /*#__PURE__*/function () {
       return this.chartService.generatorChart(convertedChart);
     }
   }, {
-    key: "mergeAdvancedStatistics",
-    value: function mergeAdvancedStatistics(value, deletePluginSettings) {
+    key: "getAdvancedStatistics",
+    value: function getAdvancedStatistics(value) {
       if (!value || !hasOwnProperty(value, 'plugin_settings') || !hasOwnProperty(value.plugin_settings, ADVANCED_STATISTICS_NAME)) {
-        return;
+        return [];
       }
-      var advancedStatistics = value.plugin_settings[ADVANCED_STATISTICS_NAME];
+      return value.plugin_settings[ADVANCED_STATISTICS_NAME] || [];
+    }
+  }, {
+    key: "mergeAdvancedStatistics",
+    value: function mergeAdvancedStatistics(advancedStatistics, deletePluginSettings) {
       if (!Array.isArray(advancedStatistics) || advancedStatistics.length === 0 || this.statistics.some(function (dashboard) {
         return dashboard.from_advanced;
       }) // already merged from advanced

package/es/stat-editor/stat-settings/basic-chart-settings/pivot-table-settings.js

@@ -324,7 +324,10 @@ var PivotSettings = /*#__PURE__*/function (_Component) {
     _this.onChangeMultiSummaryMethod = function (index, option) {
       var _ref9 = _this.props.statItem || {},
         summary_columns_option = _ref9.summary_columns_option;
-      summary_columns_option[index].method = option.value;
+      summary_columns_option = Array.isArray(summary_columns_option) ? _toConsumableArray(summary_columns_option) : [];
+      summary_columns_option[index] = Object.assign({}, summary_columns_option[index], {
+        method: option.value
+      });
       _this.props.updateStatItem(Object.assign({}, _this.props.statItem, {
         summary_columns_option: summary_columns_option
       }));

package/es/stat-view/base-chart.js

@@ -56,14 +56,16 @@ var BaseChart = /*#__PURE__*/function (_Component) {
       return ticksLen > 0 ? ticksLen : data.length;
     };
     _this.getThemeColors = function () {
+      var themeColors = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+      // dark->custom->light
       var _this$props = _this.props,
         isPreview = _this$props.isPreview,
         isEnlarge = _this$props.isEnlarge,
         theme = _this$props.theme;
-      if (isEnlarge || !isPreview) {
-        return STAT_ITEM_THEME_COLORS.light;
+      if (theme === THEME_NAME_MAP.DARK && !isEnlarge && isPreview) {
+        themeColors = STAT_ITEM_THEME_COLORS.dark;
       }
-      return theme === THEME_NAME_MAP.DARK ? STAT_ITEM_THEME_COLORS[THEME_NAME_MAP.DARK] : STAT_ITEM_THEME_COLORS[THEME_NAME_MAP.LIGHT];
+      return themeColors || STAT_ITEM_THEME_COLORS[THEME_NAME_MAP.LIGHT];
     };
     _this.getAxisLabelColor = function (textColor) {
       var _this$props2 = _this.props,

package/es/stat-view/horizontal-bar-chart.js

@@ -12,7 +12,7 @@ import { Chart } from '../custom-g2';
 import { getCurrentTheme, sortDataByGroupSum } from '../utils/common-utils';
 import { getChartGroups } from '../utils/basic-chart-utils';
 import { getConvertedColorRules, getLabelColor } from '../utils/color-utils';
-import { DEFAULT_NUMBER_FORMAT_OBJECT, EMPTY_NAME, LABEL_CONFIG_CHANGED, STATISTICS_COUNT_SHOW, STAT_TYPE, SUMMARY_TYPE, TITLE_AMOUNT, TYPE_COLOR_USING, USEABLE_COLOR_TYPES } from '../constants';
+import { DATA_SORT_TYPE, DEFAULT_NUMBER_FORMAT_OBJECT, EMPTY_NAME, LABEL_CONFIG_CHANGED, STATISTICS_COUNT_SHOW, STAT_TYPE, SUMMARY_TYPE, TITLE_AMOUNT, TYPE_COLOR_USING, USEABLE_COLOR_TYPES } from '../constants';
 var propTypes = {
   isPreview: PropTypes.bool,
   isEdit: PropTypes.bool,
@@ -45,7 +45,13 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
       _this.initChartHandler();
       var data = originalData;
       if (type == STAT_TYPE.STACKED_HORIZONTAL_BAR && sort_type) {
-        data = sortDataByGroupSum(originalData, sort_type);
+        var convertedSortType = sort_type;
+        if (sort_type === DATA_SORT_TYPE.ASCENDING) {
+          convertedSortType = DATA_SORT_TYPE.DESCENDING;
+        } else if (sort_type === DATA_SORT_TYPE.DESCENDING) {
+          convertedSortType = DATA_SORT_TYPE.ASCENDING;
+        }
+        data = sortDataByGroupSum(originalData, convertedSortType);
       }
       _this.chart.on('interval:click', function (e) {
         _this.props.toggleStatisticRecordsDialog(e.data.data, statItem);

package/es/stat-view/pivot-table/index.js

@@ -32,7 +32,7 @@ var PivotTable = /*#__PURE__*/function (_BaseChart) {
       if (!Object.keys(statData).length > 0) return '';
       var pivot_columns = statData.pivot_columns;
       var column_groupby_column_key = statItem.column_groupby_column_key;
-      var themeColors = _this.getThemeColors();
+      var themeColors = _this.getThemeColors('#212529');
       if (Array.isArray(pivot_columns) && pivot_columns.length > 100) {
         return /*#__PURE__*/React.createElement("div", {
           className: 'statistic-chart-text'

package/es/stat-view/pivot-table/two-dimension-table.js

@@ -6,10 +6,10 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { PureComponent } from 'react';
 import intl from 'react-intl-universal';
-import { CellType, isNumber, TableUtils, Views } from 'dtable-store';
+import { FORMULA_COLUMN_TYPES_MAP, isNumber, TableUtils, Views } from 'dtable-store';
 import PivotTableDisplayName from './pivot-table-display-name';
 import { isMobile } from '../../utils';
-import { TITLE_TOTAL } from '../../constants';
+import { STATISTICS_COUNT_TYPE, SUMMARY_METHOD_MAP, TITLE_TOTAL } from '../../constants';
 import styles from './statistic-pivot-table.module.css';
 var TwoDimensionTable = /*#__PURE__*/function (_PureComponent) {
   _inherits(TwoDimensionTable, _PureComponent);
@@ -59,6 +59,95 @@ var TwoDimensionTable = /*#__PURE__*/function (_PureComponent) {
       }
       return 0;
     };
+    _this.getCellValueFromRow = function (row, formulaRow, columnType, columnKey, sqlKey, isSqlQuery) {
+      if (!isSqlQuery) {
+        if (FORMULA_COLUMN_TYPES_MAP[columnType]) {
+          var cellValue = formulaRow[columnKey];
+          return Array.isArray(cellValue) ? cellValue[0] : cellValue;
+        }
+        return row[columnKey];
+      }
+      return row[sqlKey];
+    };
+    _this.getSummaryTotal = function (summaryColumnType, summaryColumnKey, sqlKey, summaryType, summaryMethod, rows, formulaRows, isSqlQuery) {
+      if (summaryType === STATISTICS_COUNT_TYPE.COUNT) {
+        return rows.length;
+      }
+      if (summaryType !== STATISTICS_COUNT_TYPE.ADVANCED) {
+        return 0;
+      }
+      switch (summaryMethod) {
+        case SUMMARY_METHOD_MAP.Distinct_values:
+          {
+            var count = 0;
+            var existMap = {};
+            rows.forEach(function (row) {
+              var formulaRow = formulaRows && formulaRows[row._id];
+              var cellValue = _this.getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+              if (!cellValue) {
+                if (cellValue === 0) {
+                  cellValue = '0';
+                } else {
+                  cellValue = !!cellValue;
+                }
+              }
+              if (!existMap[cellValue]) {
+                existMap[cellValue] = true;
+                count++;
+              }
+            });
+            return count;
+          }
+        case SUMMARY_METHOD_MAP.Sum:
+        case SUMMARY_METHOD_MAP.Mean:
+          {
+            var sum = 0;
+            var validNumbersCount = 0;
+            rows.forEach(function (row) {
+              var formulaRow = formulaRows && formulaRows[row._id];
+              var cellValue = _this.getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+              if (isNumber(cellValue)) {
+                validNumbersCount++;
+                sum += cellValue;
+              }
+            });
+            if (summaryMethod === SUMMARY_METHOD_MAP.Sum) {
+              sum = Number.parseFloat(sum.toFixed(8));
+            } else if (summaryMethod === SUMMARY_METHOD_MAP.Mean) {
+              sum = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
+            }
+            return sum;
+          }
+        case SUMMARY_METHOD_MAP.Max:
+        case SUMMARY_METHOD_MAP.Min:
+          {
+            if (rows.length === 0) {
+              return 0;
+            }
+            var result = rows.reduce(function (current, next) {
+              var currentFormulaRow = formulaRows && formulaRows[current._id];
+              var nextFormulaRow = formulaRows && formulaRows[next._id];
+              var currentValue = _this.getCellValueFromRow(current, currentFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+              var nextValue = _this.getCellValueFromRow(next, nextFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+              if (!nextValue && nextValue !== 0) {
+                return current;
+              }
+              var isNextGreater = currentValue < nextValue;
+              if (summaryMethod === SUMMARY_METHOD_MAP.Min) {
+                return isNextGreater ? current : next;
+              } else {
+                return isNextGreater ? next : current;
+              }
+            });
+            var formulaRow = formulaRows && formulaRows[result._id];
+            return _this.getCellValueFromRow(result, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          }
+        default:
+          {
+            return 0;
+          }
+      }
+    };
     _this.getCells = function (row, summaryColumn) {
       var _this$props2 = _this.props,
         pivotResult = _this$props2.pivotResult,
@@ -83,19 +172,7 @@ var TwoDimensionTable = /*#__PURE__*/function (_PureComponent) {
             sqlKey = column.sqlKey,
             method = column.method;
           if (Array.isArray(rowData)) {
-            var sum = 0;
-            rowData.forEach(function (rowDataItem) {
-              if (!isSqlQuery) {
-                if (type === CellType.FORMULA) {
-                  var formulaRow = formulaRows[rowDataItem._id];
-                  sum += _this.getNumberValue(formulaRow[key]);
-                  return;
-                }
-                sum += _this.getNumberValue(rowDataItem[key]);
-                return;
-              }
-              sum += _this.getNumberValue(rowDataItem[sqlKey]);
-            });
+            var sum = _this.getSummaryTotal(type, key, sqlKey, STATISTICS_COUNT_TYPE.ADVANCED, method, rowData, formulaRows, isSqlQuery);
             summary_multiple_columns.push(sum);
             formatted_summary_multiple_columns.push(getSummaryValueDisplayString(column, sum, method));
             return;
@@ -304,22 +381,12 @@ var TwoDimensionTable = /*#__PURE__*/function (_PureComponent) {
         var isValidTotalDisplayValue = true;
         if (column_groupby_multiple_numeric_column) {
           var total = 0;
-          pivotColumnCell.forEach(function (item) {
-            pivot_summary_multiple_columns.forEach(function (jtem) {
-              var type = jtem.type,
-                key = jtem.key,
-                sqlKey = jtem.sqlKey;
-              if (!isSqlQuery) {
-                if (type === CellType.FORMULA) {
-                  var formulaRow = formulaRows[item._id];
-                  total += _this.getNumberValue(formulaRow[key]);
-                  return;
-                }
-                total += _this.getNumberValue(item[key]);
-                return;
-              }
-              total += _this.getNumberValue(item[sqlKey]);
-            });
+          pivot_summary_multiple_columns.forEach(function (summaryCol) {
+            var type = summaryCol.type,
+              key = summaryCol.key,
+              sqlKey = summaryCol.sqlKey,
+              method = summaryCol.method;
+            total += _this.getSummaryTotal(type, key, sqlKey, STATISTICS_COUNT_TYPE.ADVANCED, method, pivotColumnCell, formulaRows, isSqlQuery);
           });
           totalDisplayValue = total;
           allTotalDisplay += total;

package/es/utils/common-utils.js

@@ -1,5 +1,6 @@
 import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, generatorBase64Code, isNumber, TableUtils } from 'dtable-store';
 import { STAT_TYPE, DEFAULT_LABEL_FONT_SIZE, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, CHART_STYLE_COLORS, PIE_COLOR_OPTIONS, SUMMARY_METHOD_MAP } from '../constants';
+import StatUtils from './stat-utils';
 export var generatorUniqueId = function generatorUniqueId(list) {
   var uniqueId;
   var isUnique = false;
@@ -310,12 +311,10 @@ export var sortDataByGroupSum = function sortDataByGroupSum(data, sortType) {
       });
     }
   });
-  var sortSum = sortType == 'ascending' ? function (a, b) {
-    return a.valueSum - b.valueSum;
-  } : function (a, b) {
-    return b.valueSum - a.valueSum;
-  };
-  return nameSumMap.sort(sortSum).reduce(function (accumulator, currentItem) {
+
+  // sort group
+  StatUtils.sortDataByKey(nameSumMap, 'valueSum', sortType);
+  return nameSumMap.reduce(function (accumulator, currentItem) {
     return accumulator.concat(currentItem.items);
   }, []);
 };

package/es/utils/stat-utils.js

@@ -2,7 +2,7 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { DateUtils, isNumber, isNumericColumn, CellType, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, sortText, sortNumber, sortDate, sortSingleSelect, getPrecisionNumber, getFormulaDisplayString, getGeolocationDisplayString, getDateDisplayString, getNumberDisplayString } from 'dtable-store';
 import { getClientFormulaDisplayString } from '../utils';
-import { STATISTICS_COUNT_TYPE, SUMMARY_METHOD_MAP } from '../constants';
+import { DATA_SORT_TYPE, STATISTICS_COUNT_TYPE, SUMMARY_METHOD_MAP } from '../constants';
 var SUPPORT_SORT_COLUMNS = [CellType.TEXT, CellType.NUMBER, CellType.DATE, CellType.SINGLE_SELECT, CellType.FORMULA, CellType.LINK_FORMULA, CellType.CTIME, CellType.MTIME, CellType.RATE];
 var getValidCollaborators = function getValidCollaborators(collaborators, emails) {
   if (!Array.isArray(emails)) {
@@ -207,24 +207,29 @@ var StatUtils = /*#__PURE__*/function () {
       });
     }
   }, {
-    key: "sortStatisticData",
-    value: function sortStatisticData(statistics, sort_type) {
-      statistics.sort(function (currResult, nextResult) {
-        var current = currResult.value;
-        var next = nextResult.value;
-        if (!current && current !== 0) {
+    key: "sortDataByKey",
+    value: function sortDataByKey(data, key, sortType) {
+      data.sort(function (curr, next) {
+        var currentVal = curr[key];
+        var nextVal = next[key];
+        if (!currentVal && currentVal !== 0) {
           return -1;
         }
-        if (!next && next !== 0) {
+        if (!nextVal && nextVal !== 0) {
           return 1;
         }
-        if (sort_type === 'ascending') {
-          return current > next ? 1 : -1;
+        if (sortType === DATA_SORT_TYPE.ASCENDING) {
+          return currentVal > nextVal ? 1 : -1;
         } else {
-          return current > next ? -1 : 1;
+          return currentVal > nextVal ? -1 : 1;
         }
       });
     }
+  }, {
+    key: "sortStatisticData",
+    value: function sortStatisticData(statistics, sort_type) {
+      this.sortDataByKey(statistics, 'value', sort_type);
+    }
   }, {
     key: "getTotal",
     value: function getTotal(summary_column_key, summary_column_type, summary_type, summary_method) {

package/es/utils/trend-utils.js

@@ -78,7 +78,7 @@ export function summaryDurationResult(result, duration, summaryType, summaryMeth
   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 = currentTime.subtract(days, 'days').format('YYYY-MM-DD');
+  var startDate = dayjs(middleDate).subtract(days, 'days').format('YYYY-MM-DD');
   var compareValue = [];
   var comparedValue = [];
   if (useDataDb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "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.0.2",
+    "dtable-store": "4.0.6",
     "dtable-web-api": "4.0.1",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",