dtable-statistic 4.0.6 → 4.0.8

package/es/calculator/mirror-calculator.js

@@ -110,29 +110,40 @@ var MirrorCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
                 sqlCondition = filter2SqlCondition(selectedTable, selectedView);
                 summaryColumnName = '';
-                if (isAdvanced) {
-                  summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
-                  summaryColumnName = summaryColumn.name;
-                  summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                  sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
-                } else {
-                  sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(method, "(").concat(columnName, ") from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
+                if (!isAdvanced) {
+                  _context2.next = 21;
+                  break;
+                }
+                summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
+                if (summaryColumn) {
+                  _context2.next = 16;
+                  break;
                 }
-                _context2.next = 15;
+                return _context2.abrupt("return", []);
+              case 16:
+                summaryColumnName = summaryColumn.name;
+                summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+                sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
+                _context2.next = 22;
+                break;
+              case 21:
+                sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(method, "(").concat(columnName, ") from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
+              case 22:
+                _context2.next = 24;
                 return this.sqlQuery(sqlString);
-              case 15:
+              case 24:
                 result = _context2.sent;
                 if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 26;
+                  _context2.next = 35;
                   break;
                 }
                 data = result.data;
                 if (data.results) {
-                  _context2.next = 20;
+                  _context2.next = 29;
                   break;
                 }
                 return _context2.abrupt("return", []);
-              case 20:
+              case 29:
                 newResult = [];
                 _summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
                 valueKey = isAdvanced ? "".concat(_summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
@@ -147,19 +158,23 @@ var MirrorCalculator = /*#__PURE__*/function (_BaseCalculator) {
                     var equal2GroupData1 = groupData1.id === groupValue;
                     if (equal2GroupData0 || equal2GroupData1) {
                       var value = item[valueKey];
+                      var formattedValue = value;
                       if (isAdvanced) {
                         value = formatNumericValue(value, summaryColumn);
+                        formattedValue = StatUtils.getFormattedValue(value, summaryColumn, summary_method);
                       }
                       newResult.push({
                         name: label,
                         original_name: item[column],
                         value: equal2GroupData0 ? value : 0,
+                        formatted_value: equal2GroupData0 ? formattedValue : 0,
                         group_name: groupData[0].name,
                         color: groupData[0].color
                       }, {
                         name: label,
                         original_name: item[column],
                         value: equal2GroupData1 ? value : 0,
+                        formatted_value: equal2GroupData1 ? formattedValue : 0,
                         group_name: groupData[1].name,
                         color: groupData[1].color
                       });
@@ -170,9 +185,9 @@ var MirrorCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   data: newResult,
                   colorSet: [groupData[0] && groupData[0].color, groupData[1] && groupData[1].color]
                 });
-              case 26:
+              case 35:
                 return _context2.abrupt("return", []);
-              case 27:
+              case 36:
               case "end":
                 return _context2.stop();
             }

package/es/calculator/pivot-table-calculator.js

@@ -9,7 +9,7 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import dayjs from 'dayjs';
 import { CellType, filter2SqlCondition, isDateColumn, isNumericColumn, TableUtils } from 'dtable-store';
 import BaseCalculator from './base-calculator';
-import { DTABLE_DB_SUMMARY_METHOD, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, SUMMARY_TYPE, TIME_COLUMN_LIST } from '../constants';
+import { DTABLE_DB_SUMMARY_METHOD, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, SUMMARY_METHOD_MAP, SUMMARY_TYPE, TIME_COLUMN_LIST } from '../constants';
 import { getSummaryColumnMethod } from '../utils/common-utils';
 import StatUtils from '../utils/stat-utils';
 import { getFormattedLabel } from '../utils/row-utils';
@@ -199,9 +199,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         };
       }
       if (summary_columns_option) {
-        var _summarySQLColumnName2ColumnKey = {};
-        var _summaryTableColumnKey2Column = {};
-        var _summaryTableColumnKey2Method = {};
+        var _summaries = [];
         var summaryColumnOptions = [];
         var _summaryMethod = summary_method;
         var summaryColumn = TableUtils.getTableColumnByKey(table, summary_column_key);
@@ -209,10 +207,11 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           var _this$summaryMethodCo2 = this.summaryMethodColumn2SqlColumn(_summaryMethod, summaryColumn),
             sqlSummaryMethodColumnName = _this$summaryMethodCo2.name,
             sqlSummaryMethodColumnKey = _this$summaryMethodCo2.key;
-          var summaryColumnKey = summaryColumn.key;
-          _summarySQLColumnName2ColumnKey[sqlSummaryMethodColumnKey] = summaryColumnKey;
-          _summaryTableColumnKey2Column[summaryColumnKey] = summaryColumn;
-          _summaryTableColumnKey2Method[summaryColumnKey] = _summaryMethod;
+          _summaries.push({
+            sqlSummaryMethodColumnKey: sqlSummaryMethodColumnKey,
+            summaryColumn: summaryColumn,
+            summaryMethod: _summaryMethod
+          });
           summaryColumnOptions.push(sqlSummaryMethodColumnName);
         }
         summary_columns_option.forEach(function (option) {
@@ -224,10 +223,11 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
             var _this$summaryMethodCo3 = _this.summaryMethodColumn2SqlColumn(summaryMethod, summaryColumn),
               _sqlSummaryMethodColumnName = _this$summaryMethodCo3.name,
               _sqlSummaryMethodColumnKey = _this$summaryMethodCo3.key;
-            var _summaryColumnKey = summaryColumn.key;
-            _summarySQLColumnName2ColumnKey[_sqlSummaryMethodColumnKey] = _summaryColumnKey;
-            _summaryTableColumnKey2Column[_summaryColumnKey] = summaryColumn;
-            _summaryTableColumnKey2Method[_summaryColumnKey] = summaryMethod;
+            _summaries.push({
+              sqlSummaryMethodColumnKey: _sqlSummaryMethodColumnKey,
+              summaryColumn: summaryColumn,
+              summaryMethod: summaryMethod
+            });
             summaryColumnOptions.push(_sqlSummaryMethodColumnName);
           }
         });
@@ -236,38 +236,35 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         return {
           sql: _sql2,
           sqlGroupbyColumnKey: sqlGroupbyColumnKey,
-          summarySQLColumnName2ColumnKey: _summarySQLColumnName2ColumnKey,
-          summaryTableColumnKey2Column: _summaryTableColumnKey2Column,
-          summaryTableColumnKey2Method: _summaryTableColumnKey2Method
+          summaries: _summaries
         };
       }
-      var summarySQLColumnName2ColumnKey = {};
-      var summaryTableColumnKey2Column = {};
-      var summaryTableColumnKey2Method = {};
       var summaryMethod = summary_method;
       var statisticNumericColumnKeys = [summary_column_key].concat(_toConsumableArray(numeric_column_keys || []));
       var validStatisticNumericColumnKeys = _toConsumableArray(new Set(statisticNumericColumnKeys));
-      var statisticSummaryColumnsString = validStatisticNumericColumnKeys.map(function (key) {
+      var sqlNumericColumns = [];
+      var summaries = [];
+      validStatisticNumericColumnKeys.map(function (key) {
         return TableUtils.getTableColumnByKey(table, key);
       }).filter(function (column) {
         return column && (isDateColumn(column) || isNumericColumn(column));
-      }).map(function (column) {
+      }).forEach(function (column) {
         var _this$summaryMethodCo4 = _this.summaryMethodColumn2SqlColumn(summaryMethod, column),
           sqlNumericColumn = _this$summaryMethodCo4.name,
           sqlNumericColumnKey = _this$summaryMethodCo4.key;
-        var summaryColumnKey = column.key;
-        summarySQLColumnName2ColumnKey[sqlNumericColumnKey] = summaryColumnKey;
-        summaryTableColumnKey2Column[summaryColumnKey] = column;
-        summaryTableColumnKey2Method[summaryColumnKey] = summaryMethod;
-        return sqlNumericColumn;
-      }).join(', ');
+        summaries.push({
+          sqlSummaryMethodColumnKey: sqlNumericColumnKey,
+          summaryColumn: column,
+          summaryMethod: summaryMethod
+        });
+        sqlNumericColumns.push(sqlNumericColumn);
+      });
+      var statisticSummaryColumnsString = sqlNumericColumns.join(', ');
       var sql = "SELECT ".concat(sqlGroupbyColumnName).concat(statisticSummaryColumnsString ? ', ' + statisticSummaryColumnsString : '', " FROM ").concat(tableName, " ").concat(condition, " GROUP BY ").concat(sqlGroupbyColumnName, " LIMIT 0, 5000");
       return {
         sql: sql,
         sqlGroupbyColumnKey: sqlGroupbyColumnKey,
-        summarySQLColumnName2ColumnKey: summarySQLColumnName2ColumnKey,
-        summaryTableColumnKey2Column: summaryTableColumnKey2Column,
-        summaryTableColumnKey2Method: summaryTableColumnKey2Method
+        summaries: summaries
       };
     }
   }, {
@@ -329,8 +326,35 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           }) : [];
           sqlSummaryColumnName = sqlSummaryMultipleNumericColumnName;
         }
+        if (summary_columns_option) {
+          var summaryColumnOptions = [];
+          summary_columns_option.forEach(function (option) {
+            var key = option.key,
+              method = option.method;
+            var summaryColumn = TableUtils.getTableColumnByKey(table, key);
+            var summaryMethod = method;
+            if (summaryColumn && (isNumericColumn(summaryColumn) || isDateColumn(summaryColumn))) {
+              var _this2$summaryMethodC2 = _this2.summaryMethodColumn2SqlColumn(summaryMethod, summaryColumn),
+                sqlSummaryMethodColumnName = _this2$summaryMethodC2.name;
+              summaryColumnOptions.push(sqlSummaryMethodColumnName);
+            }
+          });
+          var statisticSummaryColumnsString = summaryColumnOptions.join(', ');
+          if (statisticSummaryColumnsString) {
+            if (sqlSummaryColumnName) {
+              sqlSummaryColumnName += ", ".concat(statisticSummaryColumnsString);
+            } else {
+              sqlSummaryColumnName = statisticSummaryColumnsString;
+            }
+          }
+        }
+      }
+      var sql;
+      if (sqlSummaryColumnName) {
+        sql = "SELECT ".concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, ", ").concat(sqlSummaryColumnName, " FROM ").concat(tableName, " ").concat(condition, " GROUP BY ").concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, " ORDER BY `").concat(groupbyColumn.name, "` LIMIT 0, 5000");
+      } else {
+        sql = "SELECT ".concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, " FROM ").concat(tableName, " ").concat(condition, " GROUP BY ").concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, " ORDER BY `").concat(groupbyColumn.name, "` LIMIT 0, 5000");
       }
-      var sql = "SELECT ".concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, ", ").concat(sqlSummaryColumnName, " FROM ").concat(tableName, " ").concat(condition, " GROUP BY ").concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, " ORDER BY `").concat(groupbyColumn.name, "` LIMIT 0, 5000");
       return {
         sql: sql,
         sqlGroupbyColumnKey: sqlGroupbyColumnKey,
@@ -356,13 +380,16 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         sqlRows.forEach(function (row) {
           var total = row[sqlSummaryColumnKey] || 0;
           _allTotal += total;
+          var originalLabel = _this3.getOriginalLabel(groupbyColumn, _sqlGroupbyColumnKey, row, groupby_geolocation_granularity, groupby_date_granularity);
+          var name = _this3.getLabel(groupbyColumn, originalLabel);
+          var original_name = _this3.getOriginalName(groupbyColumn, originalLabel);
           pivot_rows.push({
-            name: _this3.getLabel(groupbyColumn, _sqlGroupbyColumnKey, row, groupby_geolocation_granularity, groupby_date_granularity),
+            name: name,
+            original_name: original_name,
             rows: [],
             total: {
               total: total
-            },
-            original_name: row[groupbyColumn.key]
+            }
           });
         });
         return {
@@ -374,43 +401,46 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         };
       }
       var sqlGroupbyColumnKey = statisticSQLMap.sqlGroupbyColumnKey,
-        summarySQLColumnName2ColumnKey = statisticSQLMap.summarySQLColumnName2ColumnKey,
-        summaryTableColumnKey2Column = statisticSQLMap.summaryTableColumnKey2Column,
-        summaryTableColumnKey2Method = statisticSQLMap.summaryTableColumnKey2Method;
-      var summaryColumnKeys = Object.values(summarySQLColumnName2ColumnKey);
-      var sqlSummaryColumnKeys = Object.keys(summarySQLColumnName2ColumnKey);
+        summaries = statisticSQLMap.summaries;
       var totalTemplate = {};
-      Object.values(summaryColumnKeys).forEach(function (key) {
-        var summaryMethod = summaryTableColumnKey2Method[key];
-        totalTemplate[key + summaryMethod] = _this3.initTotal(summaryMethod);
+      summaries.forEach(function (summary) {
+        var summaryColumn = summary.summaryColumn,
+          summaryMethod = summary.summaryMethod;
+        var summaryColumnKey = summaryColumn.key;
+        totalTemplate[summaryColumnKey + summaryMethod] = _this3.initTotal(summaryMethod);
         pivot_columns.push({
-          key: key,
+          key: summaryColumnKey,
           method: summaryMethod
         });
       });
       var allTotal = _objectSpread({}, totalTemplate);
       sqlRows.forEach(function (row) {
         var rowTotal = _objectSpread({}, totalTemplate);
-        sqlSummaryColumnKeys.forEach(function (key) {
-          var columnKey = summarySQLColumnName2ColumnKey[key];
-          var summaryColumn = summaryTableColumnKey2Column[columnKey];
-          var summaryMethod = summaryTableColumnKey2Method[columnKey];
-          var value = row[key] || _this3.initTotal(summaryMethod);
-          allTotal[columnKey + summaryMethod] = _this3.getSummaryValue({
+        summaries.forEach(function (summary) {
+          var sqlSummaryMethodColumnKey = summary.sqlSummaryMethodColumnKey,
+            summaryColumn = summary.summaryColumn,
+            summaryMethod = summary.summaryMethod;
+          var summaryColumnKey = summaryColumn.key;
+          var totalKey = summaryColumnKey + summaryMethod;
+          var value = row[sqlSummaryMethodColumnKey] || _this3.initTotal(summaryMethod);
+          allTotal[totalKey] = _this3.getSummaryValue({
             summaryColumn: summaryColumn,
             summaryMethod: summaryMethod
-          }, allTotal[columnKey + summaryMethod], value);
+          }, allTotal[totalKey], value);
           if (summaryColumn && isDateColumn(summaryColumn)) {
-            rowTotal[columnKey + summaryMethod] = value;
+            rowTotal[totalKey] = value;
           } else if (summaryColumn && isNumericColumn(summaryColumn)) {
-            rowTotal[columnKey + summaryMethod] = rowTotal[columnKey + summaryMethod] + value;
+            rowTotal[totalKey] = rowTotal[totalKey] + value;
           }
         });
+        var originalLabel = _this3.getOriginalLabel(groupbyColumn, sqlGroupbyColumnKey, row, groupby_geolocation_granularity, groupby_date_granularity);
+        var name = _this3.getLabel(groupbyColumn, originalLabel);
+        var original_name = _this3.getOriginalName(groupbyColumn, originalLabel);
         pivot_rows.push({
-          name: _this3.getLabel(groupbyColumn, sqlGroupbyColumnKey, row, groupby_geolocation_granularity, groupby_date_granularity),
+          name: name,
+          original_name: original_name,
           rows: [row],
-          total: rowTotal,
-          original_name: row[groupbyColumn.key]
+          total: rowTotal
         });
       });
       if (pivot_columns.length < 2) {
@@ -459,12 +489,16 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
       var isRowGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[columnGroupbyColumn.type];
       sqlRows.forEach(function (row) {
         var groupbyColumnCellValue = row[sqlGroupbyColumnKey];
-        var groupbyColumnCellValueKey = _this4.getLabel(groupbyColumn, sqlGroupbyColumnKey, row, groupby_geolocation_granularity, groupby_date_granularity);
+        var groupbyColumnOriginalLabel = _this4.getOriginalLabel(groupbyColumn, sqlGroupbyColumnKey, row, groupby_geolocation_granularity, groupby_date_granularity);
+        var groupbyColumnCellValueKey = _this4.getLabel(groupbyColumn, groupbyColumnOriginalLabel);
+        var groupbyColumnOriginalCellValueKey = _this4.getOriginalName(groupbyColumn, groupbyColumnOriginalLabel);
         var columnGroupbyColumnCellValue = row[sqlColumnGroupbyColumnKey];
-        var columnGroupbyColumnCellValueKey = _this4.getLabel(columnGroupbyColumn, sqlColumnGroupbyColumnKey, row, column_groupby_geolocation_granularity, column_groupby_date_granularity);
+        var columnGroupbyColumnOriginalLabel = _this4.getOriginalLabel(columnGroupbyColumn, sqlColumnGroupbyColumnKey, row, column_groupby_geolocation_granularity, column_groupby_date_granularity);
+        var columnGroupbyColumnCellValueKey = _this4.getLabel(columnGroupbyColumn, columnGroupbyColumnOriginalLabel);
+        var columnGroupbyColumnOriginalCellValueKey = _this4.getOriginalName(columnGroupbyColumn, columnGroupbyColumnOriginalLabel);
         var count = row[sqlSummaryColumnKey];
         if (_this4.isValidCellValue(columnGroupbyColumnCellValue, groupby_include_empty_cells)) {
-          _this4.updateTwoDimensionColumns(pivot_columns, columnGroupbyColumnCellValueKey, columnGroupbyColumnCellValue, {
+          _this4.updateTwoDimensionColumns(pivot_columns, columnGroupbyColumnCellValueKey, columnGroupbyColumnOriginalCellValueKey, {
             isIncludeEmpty: groupby_include_empty_cells,
             isCellValueAsAnArray: isRowGroupbyColumnDataAsAnArray
           });
@@ -474,7 +508,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
             var resName = r.name;
             return resName === null && groupbyColumnCellValueKey === null || resName === undefined && groupbyColumnCellValueKey === undefined || resName === 0 && groupbyColumnCellValueKey === 0 || resName === groupbyColumnCellValueKey;
           });
-          _this4.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, groupbyColumnCellValueKey, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, groupbyColumnCellValue, {
+          _this4.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, groupbyColumnCellValueKey, groupbyColumnOriginalCellValueKey, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
             summaryMethod: summaryMethod,
             summaryColumn: summaryColumn
           });
@@ -611,19 +645,37 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         key: getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[summaryMethod], columnName)
       };
     }
+  }, {
+    key: "getOriginalLabel",
+    value: function getOriginalLabel(groupColumn, groupName, statRow, groupby_date_granularity, groupby_geolocation_granularity) {
+      var isTimeColumn = TIME_COLUMN_LIST.includes(groupColumn.type);
+      if (isTimeColumn || groupColumn.type === CellType.GEOLOCATION) {
+        return statRow[groupName];
+      }
+      var currentGroupLabel = statRow[groupColumn.key];
+      return StatUtils.getGroupLabel(currentGroupLabel, {}, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
+    }
+  }, {
+    key: "getOriginalName",
+    value: function getOriginalName(groupColumn, originalLabel) {
+      var isTimeColumn = TIME_COLUMN_LIST.includes(groupColumn.type);
+      if (isTimeColumn || groupColumn.type === CellType.GEOLOCATION) {
+        return originalLabel;
+      }
+      var columnType = groupColumn.type;
+      if (columnType === CellType.MULTIPLE_SELECT || columnType === CellType.COLLABORATOR || columnType === CellType.LINK) {
+        return Array.isArray(originalLabel) ? originalLabel[0] : null;
+      }
+      return originalLabel;
+    }
   }, {
     key: "getLabel",
-    value: function getLabel(groupColumn, groupName, statRow, groupby_date_granularity, groupby_geolocation_granularity) {
+    value: function getLabel(groupColumn, originalLabel) {
       var isTimeColumn = TIME_COLUMN_LIST.includes(groupColumn.type);
-      var label;
       if (isTimeColumn || groupColumn.type === CellType.GEOLOCATION) {
-        label = statRow[groupName];
-      } else {
-        var currentGroupLabel = statRow[groupColumn.key];
-        label = StatUtils.getGroupLabel(currentGroupLabel, {}, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
-        label = getFormattedLabel(groupColumn, label, this.value.collaborators);
+        return originalLabel;
       }
-      return label;
+      return getFormattedLabel(groupColumn, originalLabel, this.value.collaborators);
     }
   }, {
     key: "initTotal",
@@ -637,7 +689,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
       var summaryMethod = _ref4.summaryMethod,
         summaryColumn = _ref4.summaryColumn;
       if (summaryColumn && isDateColumn(summaryColumn)) {
-        if (summaryMethod === 'Max') {
+        if (summaryMethod === SUMMARY_METHOD_MAP.Max) {
           if (currentValue && nextValue) {
             return dayjs(currentValue).isBefore(nextValue) ? nextValue : currentValue;
           }
@@ -646,7 +698,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           }
           return currentValue;
         }
-        if (summaryMethod === 'Min') {
+        if (summaryMethod === SUMMARY_METHOD_MAP.Min) {
           if (currentValue && nextValue) {
             return dayjs(currentValue).isBefore(nextValue) ? currentValue : nextValue;
           }
@@ -655,9 +707,12 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           }
           return currentValue;
         }
+        if (summaryMethod === SUMMARY_METHOD_MAP.Distinct_values) {
+          return (currentValue - 0 || 0) + (nextValue - 0 || 0);
+        }
         return currentValue;
       }
-      if (summaryMethod === 'MAX' || summaryMethod === 'MIN') {
+      if (summaryMethod === SUMMARY_METHOD_MAP.Max || SUMMARY_METHOD_MAP.Min) {
         if (currentValue === null && nextValue === null) return null;
         if (currentValue === null) return nextValue;
         if (nextValue === null) return currentValue;
@@ -672,17 +727,18 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
     }
   }, {
     key: "updateTwoDimensionColumns",
-    value: function updateTwoDimensionColumns(pivot_columns, key, columnCellValue, _ref5) {
+    value: function updateTwoDimensionColumns(pivot_columns, key, original_key, _ref5) {
       var isIncludeEmpty = _ref5.isIncludeEmpty,
         isCellValueAsAnArray = _ref5.isCellValueAsAnArray;
-      if (isCellValueAsAnArray) {
+      if (isCellValueAsAnArray && Array.isArray(key)) {
         if (key.length === 0 && isIncludeEmpty) {
           var _pivotColumnIndex = pivot_columns.findIndex(function (r) {
             return !r.key;
           });
           if (_pivotColumnIndex < 0) {
             pivot_columns.unshift({
-              key: null
+              key: null,
+              original_key: null
             });
           }
           return;
@@ -694,7 +750,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           if (pivotColumnIndex < 0) {
             pivot_columns.push({
               key: k,
-              original_name: k
+              original_key: k
             });
           }
         });
@@ -707,13 +763,13 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
       if (pivotColumnIndex < 0) {
         pivot_columns.push({
           key: key,
-          original_name: columnCellValue
+          original_key: original_key
         });
       }
     }
   }, {
     key: "updateTwoDimensionRows",
-    value: function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, count, row, isColumnDataAsAnArray, cellValue, format_cell_value, _ref6) {
+    value: function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, original_name, count, row, isColumnDataAsAnArray, cellValue, _ref6) {
       var _this5 = this;
       var summaryMethod = _ref6.summaryMethod,
         summaryColumn = _ref6.summaryColumn;
@@ -764,7 +820,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           name: name,
           cells: _cells,
           total: _total,
-          original_name: format_cell_value
+          original_name: original_name
         });
       }
     }

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

@@ -228,7 +228,7 @@ function updateChartValue(summaryColumn, summary_type, summary_method, formula_r
     var updated = _objectSpread({}, item);
     var value = StatUtils.getTotal(summaryColumnKey, summaryColumnType, summary_type, summary_method, rows, formula_rows);
     updated.value = value;
-    updated.formatted_value = StatUtils.getFormattedValue(value, summaryColumn);
+    updated.formatted_value = StatUtils.getFormattedValue(value, summaryColumn, summary_method);
     results[index] = updated;
   });
 }
@@ -306,13 +306,18 @@ 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 table_id = chart.table_id,
+  var type = chart.type,
+    table_id = chart.table_id,
     view_id = chart.view_id,
     geo_column = chart.geo_column,
     geolocation_granularity = chart.geolocation_granularity,
     summary_type = chart.summary_type,
     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) {
@@ -335,16 +340,26 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
         var list = formulaRow[geoColumn.key];
         list.forEach(function (n) {
           var nameIndex = results.findIndex(function (r) {
-            return n[geolocation_granularity] === r.name;
+            if (geolocationGranularity) {
+              return n[geolocationGranularity] === r.name;
+            }
+            return n = r.name;
           });
-          updateBasicChartRows(results, nameIndex, n[geolocation_granularity], row);
+          if (geolocationGranularity) {
+            updateBasicChartRows(results, nameIndex, n[geolocationGranularity], row, null);
+          } else {
+            updateBasicChartRows(results, nameIndex, n, row, null);
+          }
         });
       } else {
-        var name = row[geoColumn.key] ? row[geoColumn.key][geolocation_granularity] : null;
+        var name = row[geoColumn.key] || null;
+        if (name && geolocationGranularity) {
+          name = name[geolocationGranularity];
+        }
         var nameIndex = results.findIndex(function (r) {
           return r.name === name;
         });
-        updateBasicChartRows(results, nameIndex, name, row);
+        updateBasicChartRows(results, nameIndex, name, row, null);
       }
     }
   });

package/es/calculator/workers/combination-calculator-worker.js

@@ -42,6 +42,7 @@ export default function calculateResult(chart, value, username, userId) {
         method: y_axis_left_summary_method,
         column_name: column1.name,
         type: column1.type,
+        data: column1.data,
         color: LABEL_COLORS[0]
       };
     }
@@ -53,6 +54,7 @@ export default function calculateResult(chart, value, username, userId) {
             method: item.summary_method,
             column_name: summaryColumn.name,
             type: summaryColumn.type,
+            data: summaryColumn.data,
             color: LABEL_COLORS[(index + 1) % 12]
           };
         }
@@ -206,37 +208,50 @@ export default function calculateResult(chart, value, username, userId) {
       var item = _step.value;
       var key = item[0];
       var leftValue = item[1];
-      var value1 = 0,
-        value2 = 0;
+      var value1 = 0;
+      var value2 = 0;
+      var formattedValueLeft = value1;
+      var formattedValueRight = value2;
       var rightValue = rightResultMap.get(key);
       if (y_axis_right_summary_type === SUMMARY_TYPE.COUNT) {
         value2 = rightValue;
+        formattedValueRight = value2;
       }
       if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
         value2 = getSummaryResult(rightValue, y_axis_right_summary_method);
+        formattedValueRight = StatUtils.getFormattedValue(value2, column2, y_axis_right_summary_method);
       }
       if (!y_axis_left_group_by_multiple_numeric_column) {
         if (y_axis_left_summary_type === SUMMARY_TYPE.COUNT) {
           value1 = leftValue;
+          formattedValueLeft = value1;
         }
         if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
           var list = leftValue[column1.key];
           value1 = getSummaryResult(list, y_axis_left_summary_method);
+          formattedValueLeft = StatUtils.getFormattedValue(value1, column1, y_axis_left_summary_method);
         }
         results.push({
           name: key,
           value_left: value1,
-          value_right: value2
+          value_right: value2,
+          formatted_value_left: formattedValueLeft,
+          formatted_value_right: formattedValueRight
         });
       } else {
         leftSummaryColumnKeys.forEach(function (columnKey) {
+          var summaryColumn = leftSummaryColumn[columnKey];
+          var summaryMethod = summaryColumn.method;
           var list = leftValue[columnKey];
-          var value = getSummaryResult(list, leftSummaryColumn[columnKey].method);
+          var value = getSummaryResult(list, summaryMethod);
+          formattedValueLeft = StatUtils.getFormattedValue(value, summaryColumn, summaryMethod);
           results.push({
             name: key,
             value_left: value,
             color: leftSummaryColumn[columnKey].color,
-            value_right: value2
+            value_right: value2,
+            formatted_value_left: formattedValueLeft,
+            formatted_value_right: formattedValueRight
           });
         });
       }