dtable-statistic 4.0.7 → 4.0.9

package/es/stat-view/world-map.js

@@ -6,11 +6,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import DataSet from '@antv/data-set/lib/index';
 import intl from 'react-intl-universal';
-import { TableUtils, getNumberDisplayString } from 'dtable-store';
+import { TableUtils } from 'dtable-store';
 import BaseChart from './base-chart';
 import { Chart } from '../custom-g2';
-import { Loading } from '../components';
-import { COLOR_OPTIONS, DEFAULT_NUMBER_FORMAT_OBJECT, STAT_ITEM_THEME_COLORS, STAT_TYPE, SUMMARY_TYPE, TITLE_AMOUNT } from '../constants';
+import { COLOR_OPTIONS, DEFAULT_NUMBER_FORMAT_OBJECT, STAT_TYPE, SUMMARY_TYPE, TITLE_AMOUNT } from '../constants';
 var WIDTH = 798;
 var HEIGHT = 394;
 var WorldMap = /*#__PURE__*/function (_BaseChart) {
@@ -44,7 +43,8 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
               name_cn: name_cn,
               name: name,
               nameType: nameType,
-              value: value || 0
+              value: value || 0,
+              formatted_value: item.formatted_value
             });
             if (type === STAT_TYPE.WORLD_MAP_BUBBLE) {
               sum += item.value;
@@ -60,10 +60,7 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
     _this.renderCommonMap = function (data) {
       var _this$props = _this.props,
         getTableById = _this$props.getTableById,
-        statItem = _this$props.statItem,
-        theme = _this$props.theme,
-        isEnlarge = _this$props.isEnlarge,
-        isPreview = _this$props.isPreview;
+        statItem = _this$props.statItem;
       var userDataView = _this.dataSet.getView('statisticViewModel').source(data).transform({
         geoDataView: _this.dataSet.getView('mapDataModel'),
         field: 'name',
@@ -74,17 +71,18 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
         table_id = _this$props$statItem.table_id,
         data_color = _this$props$statItem.data_color,
         summary_type = _this$props$statItem.summary_type,
+        summary_method = _this$props$statItem.summary_method,
         summary_column = _this$props$statItem.summary_column;
       var currentColorOption = COLOR_OPTIONS.filter(function (item) {
         return item.name == data_color;
       })[0] || COLOR_OPTIONS[0];
       var exampleColors = currentColorOption.exampleColors,
         highlightedBorderColor = currentColorOption.highlightedBorderColor;
-      var columnData = DEFAULT_NUMBER_FORMAT_OBJECT;
+      var summaryColumnData = DEFAULT_NUMBER_FORMAT_OBJECT;
       if (summary_type === SUMMARY_TYPE.ADVANCED) {
         var table = getTableById(table_id);
         var summaryColumn = TableUtils.getTableColumnByKey(table, summary_column) || {};
-        columnData = summaryColumn.data || DEFAULT_NUMBER_FORMAT_OBJECT;
+        summaryColumnData = summaryColumn.data || DEFAULT_NUMBER_FORMAT_OBJECT;
       }
       _this.statisticView = _this.chart.createView();
       _this.statisticView.data(userDataView.rows);
@@ -99,17 +97,14 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
             stroke: highlightedBorderColor
           }
         }
-      }).tooltip('name*value*color*nameType*name_cn', function (name, value, color, nameType, name_cn) {
+      }).tooltip('name*formatted_value*color*nameType*name_cn', function (name, value, color, nameType, name_cn) {
         return {
           name: nameType === 'en' ? name : name_cn,
-          value: getNumberDisplayString(value, columnData),
-          color: color
+          color: color,
+          value: value
         };
       });
-      var themeColors = STAT_ITEM_THEME_COLORS.light;
-      if (theme === 'dark' && !isEnlarge && isPreview) {
-        themeColors = STAT_ITEM_THEME_COLORS.dark;
-      }
+      var themeColors = _this.getThemeColors();
       var legendDirection = statItem.legend_direction || 'vertical';
       var size = statItem.legend_size || 1;
       _this.chart.legend({
@@ -126,7 +121,7 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
           },
           align: legendDirection === 'vertical' ? 'right' : 'bottom',
           formatter: function formatter(value) {
-            return getNumberDisplayString(value, columnData);
+            return _this.getNumberDisplayString(value, summaryColumnData, summary_method);
           }
         },
         handler: {
@@ -142,9 +137,7 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
       var _this$props2 = _this.props,
         getTableById = _this$props2.getTableById,
         statItem = _this$props2.statItem,
-        isPreview = _this$props2.isPreview,
-        isEnlarge = _this$props2.isEnlarge,
-        theme = _this$props2.theme;
+        isPreview = _this$props2.isPreview;
       var userDv = _this.dataSet.createView().source(data).transform({
         geoDataView: _this.dataSet.getView('mapDataModel'),
         field: 'name',
@@ -154,12 +147,13 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
       var _this$props$statItem2 = _this.props.statItem,
         table_id = _this$props$statItem2.table_id,
         summary_type = _this$props$statItem2.summary_type,
+        summary_method = _this$props$statItem2.summary_method,
         summary_column = _this$props$statItem2.summary_column;
-      var columnData = DEFAULT_NUMBER_FORMAT_OBJECT;
+      var summaryColumnData = DEFAULT_NUMBER_FORMAT_OBJECT;
       if (summary_type === SUMMARY_TYPE.ADVANCED) {
         var table = getTableById(table_id);
         var summaryColumn = TableUtils.getTableColumnByKey(table, summary_column) || {};
-        columnData = summaryColumn.data || DEFAULT_NUMBER_FORMAT_OBJECT;
+        summaryColumnData = summaryColumn.data || DEFAULT_NUMBER_FORMAT_OBJECT;
       }
       _this.statisticView = _this.chart.createView();
       _this.statisticView.data(userDv.rows);
@@ -170,11 +164,11 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
           size = 60;
         }
         return size;
-      }).shape('circle').color(statItem.bubble_color || '#2a67d1').tooltip('name*value*color', function (name, value, color) {
+      }).shape('circle').color(statItem.bubble_color || '#2a67d1').tooltip('name*formatted_value*color', function (name, value, color) {
         return {
           name: name,
-          value: getNumberDisplayString(value, columnData),
-          color: color
+          color: color,
+          value: value
         };
       }).style({
         fillOpacity: 0.6,
@@ -188,10 +182,7 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
           }
         }
       });
-      var themeColors = STAT_ITEM_THEME_COLORS.light;
-      if (theme === 'dark' && !isEnlarge && isPreview) {
-        themeColors = STAT_ITEM_THEME_COLORS.dark;
-      }
+      var themeColors = _this.getThemeColors();
       var legendDirection = statItem.legend_direction || 'vertical';
       var size = statItem.legend_size || 1;
       _this.chart.legend({
@@ -207,7 +198,7 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
           },
           align: legendDirection === 'vertical' ? 'right' : 'bottom',
           formatter: function formatter(value) {
-            return getNumberDisplayString(value, columnData);
+            return _this.getNumberDisplayString(value, summaryColumnData, summary_method);
           }
         },
         handler: {
@@ -286,14 +277,8 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
         containerTpl: '<div class="g2-tooltip"><div class="g2-tooltip-list"></div></div>',
         itemTpl: "<div class=\"g2-tooltip-content\"><div class=\"tooltip-name\">{name}<div><div class=\"tooltip-item\">".concat(intl.get(TITLE_AMOUNT), " : {value}<div></div>"),
         domStyles: {
-          'g2-tooltip': {
-            borderRadius: '2px',
-            backgroundColor: '#fff',
-            padding: '10px'
-          },
-          'tooltip-item': {
-            marginTop: '5px'
-          }
+          'g2-tooltip': _this.getDefaultChartStyleByKey('g2-tooltip'),
+          'tooltip-item': _this.getDefaultChartStyleByKey('tooltip-item')
         }
       });
       _this.chart.scale({
@@ -351,14 +336,15 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
           isDataLoaded: true
         });
         if (!data) return;
+        _this2.geoData = data;
         _this2.initStatisticContext(data);
         if (_this2.container) {
-          chartCalculator.calculate(statItem).then(function (data) {
+          chartCalculator.calculate(statItem).then(function (calculation) {
             _this2.setState({
               isCalculatingData: false
             });
-            _this2.calculateData = data;
-            _this2.updateStatisticData(_this2.fixData(data));
+            _this2.calculateData = calculation;
+            _this2.updateStatisticData(_this2.fixData(calculation));
           });
         }
       });
@@ -389,9 +375,16 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
           isCalculatingData: true
         });
         if (this.container) {
-          chartCalculator.calculate(statItem).then(function (data) {
-            _this3.calculateData = data;
-            _this3.updateStatisticData(_this3.fixData(data));
+          if (this.chart) {
+            this.chart.destroy();
+            this.initStatisticContext(this.geoData);
+          }
+          chartCalculator.calculate(statItem).then(function (calculation) {
+            _this3.setState({
+              isCalculatingData: false
+            });
+            _this3.calculateData = calculation;
+            _this3.updateStatisticData(_this3.fixData(calculation));
             if (_this3.props.isPreview) {
               var canvasSize = _this3.getCanvasSize();
               _this3.chart.changeSize(canvasSize.w, canvasSize.h);
@@ -419,9 +412,7 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
       var _this$state = this.state,
         isDataLoaded = _this$state.isDataLoaded,
         isCalculatingData = _this$state.isCalculatingData;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, !isDataLoaded && isCalculatingData && /*#__PURE__*/React.createElement("div", {
-        className: 'statistic-chart-loading-container'
-      }, /*#__PURE__*/React.createElement(Loading, null)), /*#__PURE__*/React.createElement("div", {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, (!isDataLoaded || isCalculatingData) && this.renderLoading(), /*#__PURE__*/React.createElement("div", {
         ref: function ref(_ref) {
           return _this4.container = _ref;
         },
@@ -433,8 +424,6 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
 }(BaseChart);
 WorldMap.propTypes = {
   isPreview: PropTypes.bool,
-  isEnlarge: PropTypes.bool,
-  theme: PropTypes.string,
   statItem: PropTypes.object,
   chartCalculator: PropTypes.object,
   getTableById: PropTypes.func,

package/es/tabs/tab.js

@@ -7,6 +7,7 @@ import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import { ModalPortal } from '../components';
 import { isMobile } from '../utils';
+import { THEME_NAME_MAP } from '../constants';
 import styles from './statistic-tabs.module.css';
 var DashBoardTab = /*#__PURE__*/function (_Component) {
   _inherits(DashBoardTab, _Component);
@@ -141,7 +142,7 @@ var DashBoardTab = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React.createElement("i", {
         className: "".concat(styles['icon'], " dtable-font dtable-icon-drop-down")
       }), isShowViewDropdown && /*#__PURE__*/React.createElement(ModalPortal, null, /*#__PURE__*/React.createElement("div", {
-        className: "".concat(theme === 'dark' ? 'statistic-tabs-dropdown-dark' : 'statistic-tabs-dropdown-light', " statistic-dropdown-menu dropdown-menu large show"),
+        className: "".concat(theme === THEME_NAME_MAP.DARK ? 'statistic-tabs-dropdown-dark' : 'statistic-tabs-dropdown-light', " statistic-dropdown-menu dropdown-menu large show"),
         style: _objectSpread(_objectSpread({}, dropdownMenuPosition), {}, {
           zIndex: 1500
         })

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;
@@ -134,27 +135,45 @@ export var isArrayCellValue = function isArrayCellValue(column) {
 
 export var getSummaryResult = function getSummaryResult(results, summaryMethod) {
   var precision = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 8;
+  var numericResults = Array.isArray(results) && results.length > 0 ? results.filter(function (res) {
+    return isNumber(res);
+  }) : [];
   switch (summaryMethod) {
     case SUMMARY_METHOD_MAP.Max:
       {
-        return getMax(results);
+        return getMax(numericResults);
       }
     case SUMMARY_METHOD_MAP.Min:
       {
-        return getMin(results);
+        return getMin(numericResults);
       }
     case SUMMARY_METHOD_MAP.Sum:
       {
-        return getSum(results, precision);
+        return getSum(numericResults, precision);
       }
     case SUMMARY_METHOD_MAP.Mean:
       {
-        return getMean(results, precision);
+        return getMean(numericResults, precision);
       }
     case SUMMARY_METHOD_MAP.Distinct_values:
       {
-        var result = new Set(results).size;
-        return result;
+        var count = 0;
+        var existMap = {};
+        Array.isArray(results) && results.forEach(function (resNum) {
+          var num = resNum;
+          if (!num) {
+            if (num === 0) {
+              num = '0';
+            } else {
+              num = !!num;
+            }
+          }
+          if (!existMap[num]) {
+            existMap[num] = true;
+            count++;
+          }
+        });
+        return count;
       }
     default:
       {
@@ -292,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/sql-utils.js

@@ -101,7 +101,8 @@ export var getSqlString = function getSqlString(statItem, statisticRecord, _ref)
   return sqlString;
 };
 var getSqlGroupName = function getSqlGroupName(name, original_name, column) {
-  var type = column.type;
+  var _ref2 = column || {},
+    type = _ref2.type;
   if (type === CellType.SINGLE_SELECT || type === CellType.MULTIPLE_SELECT) {
     return "'".concat(name, "'");
   }
@@ -111,9 +112,9 @@ var getSqlGroupName = function getSqlGroupName(name, original_name, column) {
   }
   return "'".concat(newName, "'");
 };
-var getGroupName = function getGroupName(selectedColumn, _ref2) {
-  var groupby_date_granularity = _ref2.groupby_date_granularity,
-    groupby_geolocation_granularity = _ref2.groupby_geolocation_granularity;
+var getGroupName = function getGroupName(selectedColumn, _ref3) {
+  var groupby_date_granularity = _ref3.groupby_date_granularity,
+    groupby_geolocation_granularity = _ref3.groupby_geolocation_granularity;
   var groupName = "`".concat(selectedColumn.name, "`");
   var isTimeColumn = TIME_COLUMN_LIST.includes(selectedColumn.type);
   if (isTimeColumn) {
@@ -123,11 +124,11 @@ var getGroupName = function getGroupName(selectedColumn, _ref2) {
   }
   return groupName;
 };
-var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable, _ref3) {
-  var _ref3$isColumn = _ref3.isColumn,
-    isColumn = _ref3$isColumn === void 0 ? false : _ref3$isColumn,
-    _ref3$isCurrentView = _ref3.isCurrentView,
-    isCurrentView = _ref3$isCurrentView === void 0 ? false : _ref3$isCurrentView;
+var getDatabaseGroupName = function getDatabaseGroupName(statItem, selectedTable, _ref4) {
+  var _ref4$isColumn = _ref4.isColumn,
+    isColumn = _ref4$isColumn === void 0 ? false : _ref4$isColumn,
+    _ref4$isCurrentView = _ref4.isCurrentView,
+    isCurrentView = _ref4$isCurrentView === void 0 ? false : _ref4$isCurrentView;
   if (isCurrentView) return '';
   var type = statItem.type;
   var groupName, selectedColumn, columnGroupName, columnSelectedColumn;

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 } 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) {
@@ -337,18 +342,21 @@ var StatUtils = /*#__PURE__*/function () {
     }
   }, {
     key: "getFormattedValue",
-    value: function getFormattedValue(value, column) {
+    value: function getFormattedValue(value, column, summaryMethod) {
       if (!column) {
         return value;
       }
+      if (summaryMethod === SUMMARY_METHOD_MAP.Distinct_values) {
+        return value;
+      }
       var type = column.type,
         data = column.data;
-      if (FORMULA_COLUMN_TYPES_MAP[type]) {
-        return getClientFormulaDisplayString(value, data);
-      }
       if (isNumericColumn(column)) {
         return getNumberDisplayString(value, data);
       }
+      if (FORMULA_COLUMN_TYPES_MAP[type]) {
+        return getClientFormulaDisplayString(value, data);
+      }
       return value;
     }
   }]);

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.7",
+  "version": "4.0.9",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",