dtable-statistic 4.0.6 → 4.0.8

package/es/assets/css/dashboard.css

@@ -43,6 +43,7 @@
 
 .statistic-header .add-stat {
   height: 26px;
+  margin-right: 8px;
   padding: 0 10px;
   font-weight: 400;
   border-radius: 3px;
@@ -76,11 +77,18 @@
 .statistic-header .op-item-icon-wrapper {
   display: flex;
   align-items: center;
+  justify-content: center;
   cursor: pointer;
+  width: 24px;
   line-height: 24px;
+  margin-right: 4px;
   color: var(--dashboard-header-icon-color);
 }
 
+.statistic-header .op-item-icon-wrapper:last-child {
+  margin-right: 0;
+}
+
 .statistic-header .op-item-icon-wrapper:hover,
 .statistic-header .add-stat:hover {
   color: var(--dashboard-header-icon-hover-color);
@@ -90,6 +98,10 @@
   color: var(--op-item-icon-hover-color);
 }
 
+.statistic-header .op-item-icon.btn-close {
+  font-weight: 700;
+}
+
 .statistic-main {
   flex: 1 1;
   display: flex;
@@ -559,3 +571,13 @@
 .statistic-panel .seatable-radio .seatable-radio-description {
   line-height: 16px;
 }
+
+/* column-formatter */
+.statistic-chart-container .single-select-option,
+.statistic-chart-container .multiple-select-option {
+  margin: 0 !important;
+}
+
+.statistic-chart-container .collaborators-formatter .collaborator {
+  margin-right: 0 !important;
+}

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

@@ -112,7 +112,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
     key: "queryDb",
     value: function () {
       var _queryDb = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(chart) {
-        var table_id, view_id, groupby_column_key, summary_type, summary_method, summary_column_key, groupby_date_granularity, include_empty, groupby_geolocation_granularity, column_groupby_multiple_numeric_column, column_groupby_column_key, sortType, yAxisType, selectedTable, selectedView, groupbyColumn, sqlCondition, groupbyName, isTimeColumn, results, column_groupby_numeric_columns, summaryColumn, column_groupby_date_granularity, column_groupby_geolocation_granularity;
+        var table_id, view_id, column_groupby_multiple_numeric_column, groupby_column_key, summary_type, summary_method, summary_column_key, groupby_date_granularity, include_empty, groupby_geolocation_granularity, column_groupby_column_key, sortType, yAxisType, selectedTable, selectedView, groupbyColumn, sqlCondition, groupbyName, isTimeColumn, results, column_groupby_numeric_columns, summaryColumn, column_groupby_date_granularity, column_groupby_geolocation_granularity;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -123,7 +123,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 }
                 return _context2.abrupt("return", this.queryDbFromCustomBar(chart));
               case 2:
-                table_id = chart.table_id, view_id = chart.view_id;
+                table_id = chart.table_id, view_id = chart.view_id, column_groupby_multiple_numeric_column = chart.column_groupby_multiple_numeric_column;
                 column_groupby_column_key = chart.column_groupby_column_key;
                 sortType = chart.sort_type;
                 if (chart.type === STAT_TYPE.PIE || chart.type === STAT_TYPE.RING || chart.type === STAT_TYPE.TREEMAP) {
@@ -341,16 +341,19 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 valueKey = isAdvanced ? "".concat(summaryColumnMethod) : "".concat(method, "(").concat(groupbyColumn.name, ")");
                 data.results.forEach(function (item) {
                   var label = _this.getLabel(groupbyColumn, groupbyName, item, groupbyDateGranularity, groupbyGeolocationGranularity);
+                  if (!includeEmpty && _this.isEmptyLabel(label)) {
+                    return;
+                  }
                   var value = item[valueKey] || 0;
+                  var formatted_value = value;
                   if (isAdvanced) {
                     value = formatNumericValue(value, selectedSummaryColumn);
-                  }
-                  if (!includeEmpty && _this.isEmptyLabel(label)) {
-                    return;
+                    formatted_value = StatUtils.getFormattedValue(value, selectedSummaryColumn, summaryMethod);
                   }
                   newResult.push({
                     name: label,
                     value: value,
+                    formatted_value: formatted_value,
                     original_name: item[groupbyColumn.key],
                     y_axis_type: yAxisType
                   });
@@ -423,14 +426,16 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 newResult = [];
                 valueKey = isAdvanced ? "".concat(summaryColumnMethod) : "".concat(method, "(").concat(groupbyColumn.name, ")");
                 data.results.forEach(function (item) {
-                  var value = item[valueKey] || 0;
-                  if (isAdvanced) {
-                    value = formatNumericValue(value, selectedSummaryColumn);
-                  }
                   var label = _this2.getLabel(groupbyColumn, groupbyName, item, groupbyDateGranularity, groupbyGeolocationGranularity);
                   if (!includeEmpty && _this2.isEmptyLabel(label)) {
                     return;
                   }
+                  var value = item[valueKey] || 0;
+                  var formatted_value = value;
+                  if (isAdvanced) {
+                    value = formatNumericValue(value, selectedSummaryColumn);
+                    formatted_value = StatUtils.getFormattedValue(value, selectedSummaryColumn, summaryMethod);
+                  }
                   var color;
                   if (columnGroupbyColumn.type === CellType.SINGLE_SELECT) {
                     var tempValue = StatUtils.getGroupLabel(item[columnGroupbyColumn.key], {}, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, _this2.value);
@@ -439,6 +444,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   var groupLabel = _this2.getLabel(columnGroupbyColumn, columnGroupbyColumnName, item, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity);
                   newResult.push({
                     value: value,
+                    formatted_value: formatted_value,
                     color: color,
                     name: label,
                     group_name: groupLabel,
@@ -465,7 +471,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
     value: function () {
       var _getGroupbyMultipleNumericColumnsResults = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(groupbyName, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, includeEmpty, summaryType, summaryColumn, summaryMethod, columnGroupbyNumericColumns, sqlCondition, table, yAxisType) {
         var _this3 = this;
-        var isAdvanced, numericColumns, groupColumnNames, groupMethods, summaryColumnName, method, summaryColumnMethod, sqlString, result, data, newResult;
+        var isAdvanced, numericColumns, groupColumnNames, groupMethods, originalMethods, summaryColumnName, method, summaryColumnMethod, sqlString, result, data, newResult;
         return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
@@ -474,6 +480,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 numericColumns = [];
                 groupColumnNames = [];
                 groupMethods = [];
+                originalMethods = [];
                 if (summaryColumn) {
                   summaryColumnName = isAdvanced ? summaryColumn.name : "`".concat(groupbyColumn.name, "`");
                   method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summaryMethod] : 'COUNT';
@@ -481,6 +488,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   numericColumns.push(summaryColumn);
                   groupColumnNames.push(summaryColumnName);
                   groupMethods.push(summaryColumnMethod);
+                  originalMethods.push(summaryMethod);
                 }
                 columnGroupbyNumericColumns.forEach(function (item) {
                   var numericColumn = TableUtils.getTableColumnByKey(table, item.column_key);
@@ -488,25 +496,26 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   numericColumns.push(numericColumn);
                   groupColumnNames.push(groupColumnName);
                   groupMethods.push(getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[item.summary_method], groupColumnName));
+                  originalMethods.push(item.summary_method);
                 });
                 sqlString = "select ".concat(groupbyName, ", ").concat(groupMethods.join(','), " from `").concat(table.name, "` ").concat(sqlCondition, " group by ").concat(groupbyName, " order by ").concat(groupbyName, " limit 5000");
-                _context6.next = 9;
+                _context6.next = 10;
                 return this.sqlQuery(sqlString);
-              case 9:
+              case 10:
                 result = _context6.sent;
                 if (!(result.status !== 200 || !result.data.success)) {
-                  _context6.next = 12;
+                  _context6.next = 13;
                   break;
                 }
                 return _context6.abrupt("return", []);
-              case 12:
+              case 13:
                 data = result.data;
                 if (data.results) {
-                  _context6.next = 15;
+                  _context6.next = 16;
                   break;
                 }
                 return _context6.abrupt("return", []);
-              case 15:
+              case 16:
                 newResult = [];
                 data.results.forEach(function (item) {
                   var label = _this3.getLabel(groupbyColumn, groupbyName, item, groupbyDateGranularity, groupbyGeolocationGranularity);
@@ -520,7 +529,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                     var formatted_value = value;
                     if (isAdvanced) {
                       value = formatNumericValue(value, numericColumns[index]);
-                      formatted_value = StatUtils.getFormattedValue(value, numericColumns[index]);
+                      formatted_value = StatUtils.getFormattedValue(value, numericColumns[index], originalMethods[index]);
                     }
                     groupItems.push({
                       name: label,
@@ -534,7 +543,7 @@ var BasicChartCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   newResult = newResult.concat(groupItems);
                 });
                 return _context6.abrupt("return", newResult);
-              case 18:
+              case 19:
               case "end":
                 return _context6.stop();
             }

package/es/calculator/combination-calculator.js

@@ -103,7 +103,7 @@ var CombinationCalculator = /*#__PURE__*/function (_BaseCalculator) {
     value: function () {
       var _queryDb = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(chart) {
         var _this2 = this;
-        var table_id, x_axis_column_key, x_axis_include_empty, groupby_date_granularity, groupby_geolocation_granularity, y_axis_left_summary_type, y_axis_right_summary_type, y_axis_right_summary_method, y_axis_left_summary_method, y_axis_left_summary_column, y_axis_right_summary_column, y_axis_left_group_by_multiple_numeric_column, y_axis_left_group_by_numeric_columns, selectedTable, selectedColumn, groupName, sqlString, result, newResult, results, data, value1Key, leftSummaryColumn, rightSummaryColumn, value2Key, _rightSummaryColumn, _value2Key, groupItems, _leftSummaryColumn, groupItem;
+        var table_id, x_axis_column_key, x_axis_include_empty, groupby_date_granularity, groupby_geolocation_granularity, y_axis_left_summary_type, y_axis_right_summary_type, y_axis_right_summary_method, y_axis_left_summary_method, y_axis_left_summary_column, y_axis_right_summary_column, y_axis_left_group_by_multiple_numeric_column, y_axis_left_group_by_numeric_columns, selectedTable, selectedColumn, groupName, sqlString, result, newResult, results, data, value1Key, leftSummaryColumn, rightSummaryColumn, value2Key, _rightSummaryColumn, _value2Key, groupItems, summaries, _leftSummaryColumn, groupItem;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -161,18 +161,24 @@ var CombinationCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   data.forEach(function (item) {
                     var label = _this2.getLabel(selectedColumn, groupName, item, groupby_date_granularity, groupby_geolocation_granularity);
                     var value1 = item[value1Key] || 0;
+                    var value2 = item[value2Key] || 0;
+                    var formattedValueLeft = value1;
+                    var formattedValueRight = value2;
                     if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
                       value1 = formatNumericValue(value1, leftSummaryColumn);
+                      formattedValueLeft = StatUtils.getFormattedValue(value1, leftSummaryColumn, y_axis_left_summary_method);
                     }
-                    var value2 = item[value2Key] || 0;
                     if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
                       value2 = formatNumericValue(value2, rightSummaryColumn);
+                      formattedValueRight = StatUtils.getFormattedValue(value2, rightSummaryColumn, y_axis_right_summary_method);
                     }
                     if (!_this2.isEmptyLabel(label) || x_axis_include_empty) {
                       newResult.push({
                         name: label,
                         value_left: value1,
                         value_right: value2,
+                        formatted_value_left: formattedValueLeft,
+                        formatted_value_right: formattedValueRight,
                         original_name: item[selectedColumn.key]
                       });
                     }
@@ -184,32 +190,51 @@ var CombinationCalculator = /*#__PURE__*/function (_BaseCalculator) {
                     _value2Key = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[y_axis_right_summary_method], _rightSummaryColumn.name);
                   }
                   groupItems = [];
+                  summaries = [];
                   _leftSummaryColumn = TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
                   groupItem = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[y_axis_left_summary_method], _leftSummaryColumn.name);
-                  _leftSummaryColumn && !groupItems.includes(groupItem) && groupItems.push(groupItem);
+                  if (_leftSummaryColumn && !groupItems.includes(groupItem)) {
+                    groupItems.push(groupItem);
+                    summaries.push({
+                      column: _leftSummaryColumn,
+                      method: y_axis_left_summary_method
+                    });
+                  }
                   y_axis_left_group_by_numeric_columns.forEach(function (item, index) {
                     var column = TableUtils.getTableColumnByKey(selectedTable, item.column_key);
                     if (column) {
-                      var _groupItem = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[item.summary_method], column.name);
-                      !groupItems.includes(_groupItem) && groupItems.push(_groupItem);
+                      var method = item.summary_method;
+                      var _groupItem = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[method], column.name);
+                      if (!groupItems.includes(_groupItem)) {
+                        groupItems.push(_groupItem);
+                        summaries.push({
+                          column: column,
+                          method: method
+                        });
+                      }
                     }
                   });
                   data.forEach(function (item, index) {
                     var label = _this2.getLabel(selectedColumn, groupName, item, groupby_date_granularity, groupby_geolocation_granularity);
                     var value2 = item[_value2Key] || 0;
+                    var formattedValueRight = value2;
                     if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
                       value2 = formatNumericValue(value2, _rightSummaryColumn);
+                      formattedValueRight = StatUtils.getFormattedValue(value2, _rightSummaryColumn, y_axis_right_summary_method);
                     }
                     groupItems.forEach(function (groupItem, index) {
                       if (!_this2.isEmptyLabel(label) || x_axis_include_empty) {
-                        var value = item[groupItems[index]] || 0;
-                        if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
-                          value = formatNumericValue(value, _leftSummaryColumn);
-                        }
+                        var summary = summaries[index];
+                        var method = summary.method,
+                          column = summary.column;
+                        var value = formatNumericValue(item[groupItems[index]] || 0, column);
+                        var formattedValueLeft = StatUtils.getFormattedValue(value, column, method);
                         newResult.push({
                           name: label,
                           value_left: value,
                           value_right: value2,
+                          formatted_value_left: formattedValueLeft,
+                          formatted_value_right: formattedValueRight,
                           color: LABEL_COLORS[index % 12],
                           original_name: item[selectedColumn.key]
                         });

package/es/calculator/compare-bar-calculator.js

@@ -11,7 +11,7 @@ import { filter2SqlCondition, TableUtils } from 'dtable-store';
 import BaseCalculator from './base-calculator';
 import { getSqlGroup, getSqlOrder } from '../utils/sql-utils';
 import StatUtils from '../utils/stat-utils';
-import { getSummaryResult } from '../utils/common-utils';
+import { getSummaryColumnMethod, getSummaryResult } from '../utils/common-utils';
 import { DTABLE_DB_SUMMARY_METHOD, SUMMARY_TYPE } from '../constants';
 var CompareBarCalculator = /*#__PURE__*/function (_BaseCalculator) {
   _inherits(CompareBarCalculator, _BaseCalculator);
@@ -99,7 +99,7 @@ var CompareBarCalculator = /*#__PURE__*/function (_BaseCalculator) {
     value: function () {
       var _queryDb = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(chart) {
         var _this = this;
-        var table_id, view_id, x_axis_column_key, x_axis_date_granularity, y_axis_summary_type, y_axis_summary_method, y_axis_column_key, x_axis_date_range_start, x_axis_date_range_end, x_axis_compared_date_range_start, x_axis_compared_date_range_end, display_increase, selectedTable, selectedView, selectedColumn, isAdvanced, method, sqlString, groupName, sqlOrder, summaryColumnName, selectedSummaryColumn, sqlCondition, result, groupName1, groupName2, dateRangeResult, dateComparedResult, valueKey, comparedResult, rangeResult, data, _iterator, _step, item, value, index, _iterator2, _step2, _item, dateRangeItem, _value, newItem, value1, increaseValue;
+        var table_id, view_id, x_axis_column_key, x_axis_date_granularity, y_axis_summary_type, y_axis_summary_method, y_axis_column_key, x_axis_date_range_start, x_axis_date_range_end, x_axis_compared_date_range_start, x_axis_compared_date_range_end, display_increase, selectedTable, selectedView, selectedColumn, isAdvanced, method, sqlString, groupName, sqlOrder, summaryColumnName, selectedSummaryColumn, summaryColumnMethod, sqlCondition, result, groupName1, groupName2, dateRangeResult, dateComparedResult, valueKey, comparedResult, rangeResult, data, _iterator, _step, item, value, formatted_value, index, _iterator2, _step2, _item, dateRangeItem, _value, _formatted_value, newItem, value1, increaseValue;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -109,7 +109,7 @@ var CompareBarCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 selectedView = this.getViewById(view_id, selectedTable);
                 selectedColumn = TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
                 isAdvanced = y_axis_summary_type === SUMMARY_TYPE.ADVANCED;
-                method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[y_axis_summary_method] : 'COUNT';
+                method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[y_axis_summary_method] : DTABLE_DB_SUMMARY_METHOD.Count;
                 sqlString = '';
                 groupName = getSqlGroup('day', selectedColumn);
                 sqlOrder = getSqlOrder(null, groupName);
@@ -128,17 +128,18 @@ var CompareBarCalculator = /*#__PURE__*/function (_BaseCalculator) {
               case 15:
                 summaryColumnName = "".concat(selectedSummaryColumn.name);
               case 16:
+                summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
                 sqlCondition = filter2SqlCondition(selectedTable, selectedView);
                 sqlCondition = this.getStatItemSqlCondition(chart, sqlCondition, "`".concat(selectedColumn.name, "`"));
-                sqlString = "select ".concat(groupName, ", ").concat(method, "(").concat(summaryColumnName, ") from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " ").concat(sqlOrder, " limit 5000");
-                _context2.next = 21;
+                sqlString = "select ".concat(groupName, ", ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " ").concat(sqlOrder, " limit 5000");
+                _context2.next = 22;
                 return this.sqlQuery(sqlString);
-              case 21:
+              case 22:
                 result = _context2.sent;
                 groupName1 = "".concat(x_axis_date_range_start, " - ").concat(x_axis_date_range_end);
                 groupName2 = "".concat(x_axis_compared_date_range_start, " - ").concat(x_axis_compared_date_range_end);
                 if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 61;
+                  _context2.next = 63;
                   break;
                 }
                 dateRangeResult = new Map();
@@ -188,14 +189,17 @@ var CompareBarCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   for (_iterator.s(); !(_step = _iterator.n()).done;) {
                     item = _step.value;
                     value = item[1];
+                    formatted_value = value;
                     if (isAdvanced) {
                       value = getSummaryResult(item[1], y_axis_summary_method, data.precision);
+                      formatted_value = StatUtils.getFormattedValue(value, selectedSummaryColumn, y_axis_summary_method);
                     }
                     rangeResult.push({
                       name: item[0],
-                      value: value,
                       group_name: groupName1,
-                      raw_name: item[0]
+                      raw_name: item[0],
+                      value: value,
+                      formatted_value: formatted_value
                     });
                   }
                 } catch (err) {
@@ -205,30 +209,33 @@ var CompareBarCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 }
                 index = 0;
                 _iterator2 = _createForOfIteratorHelper(dateComparedResult);
-                _context2.prev = 36;
+                _context2.prev = 37;
                 _iterator2.s();
-              case 38:
+              case 39:
                 if ((_step2 = _iterator2.n()).done) {
-                  _context2.next = 51;
+                  _context2.next = 53;
                   break;
                 }
                 _item = _step2.value;
                 dateRangeItem = rangeResult[index];
                 if (dateRangeItem) {
-                  _context2.next = 43;
+                  _context2.next = 44;
                   break;
                 }
-                return _context2.abrupt("break", 51);
-              case 43:
+                return _context2.abrupt("break", 53);
+              case 44:
                 _value = _item[1];
+                _formatted_value = _value;
                 if (isAdvanced) {
                   _value = getSummaryResult(_item[1], y_axis_summary_method, data.precision);
+                  _formatted_value = StatUtils.getFormattedValue(_value, selectedSummaryColumn, y_axis_summary_method);
                 }
                 newItem = {
                   name: dateRangeItem.name,
-                  value: _value,
                   group_name: groupName2,
-                  raw_name: _item[0]
+                  raw_name: _item[0],
+                  value: _value,
+                  formatted_value: _formatted_value
                 };
                 if (display_increase) {
                   value1 = dateRangeItem.value;
@@ -240,33 +247,33 @@ var CompareBarCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 }
                 comparedResult.push(newItem);
                 index++;
-              case 49:
-                _context2.next = 38;
-                break;
               case 51:
-                _context2.next = 56;
+                _context2.next = 39;
                 break;
               case 53:
-                _context2.prev = 53;
-                _context2.t0 = _context2["catch"](36);
+                _context2.next = 58;
+                break;
+              case 55:
+                _context2.prev = 55;
+                _context2.t0 = _context2["catch"](37);
                 _iterator2.e(_context2.t0);
-              case 56:
-                _context2.prev = 56;
+              case 58:
+                _context2.prev = 58;
                 _iterator2.f();
-                return _context2.finish(56);
-              case 59:
+                return _context2.finish(58);
+              case 61:
                 if (comparedResult.length > rangeResult.length) {
                   comparedResult = comparedResult.slice(0, rangeResult.length);
                 }
                 return _context2.abrupt("return", [].concat(_toConsumableArray(comparedResult), rangeResult));
-              case 61:
+              case 63:
                 return _context2.abrupt("return", []);
-              case 62:
+              case 64:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, this, [[36, 53, 56, 59]]);
+        }, _callee2, this, [[37, 55, 58, 61]]);
       }));
       function queryDb(_x2) {
         return _queryDb.apply(this, arguments);

package/es/calculator/heat-map-calculator.js

@@ -130,29 +130,40 @@ var HeatMapCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 sqlCondition = filter2SqlCondition(selectedTable, selectedView);
                 summaryColumnName = '';
                 sqlString = '';
-                if (isAdvanced) {
-                  summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
-                  summaryColumnName = summaryColumn.name;
-                  summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                  sqlString = "select `".concat(columnName, "`, ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "` limit 5000");
-                } else {
-                  sqlString = "select `".concat(columnName, "`, ").concat(method, "(").concat(columnName, ") from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "` limit 5000");
+                if (!isAdvanced) {
+                  _context2.next = 19;
+                  break;
+                }
+                summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
+                if (summaryColumn) {
+                  _context2.next = 14;
+                  break;
                 }
-                _context2.next = 13;
+                return _context2.abrupt("return", []);
+              case 14:
+                summaryColumnName = summaryColumn.name;
+                summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+                sqlString = "select `".concat(columnName, "`, ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "` limit 5000");
+                _context2.next = 20;
+                break;
+              case 19:
+                sqlString = "select `".concat(columnName, "`, ").concat(method, "(").concat(columnName, ") from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by `").concat(columnName, "` limit 5000");
+              case 20:
+                _context2.next = 22;
                 return this.sqlQuery(sqlString);
-              case 13:
+              case 22:
                 result = _context2.sent;
                 if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 23;
+                  _context2.next = 32;
                   break;
                 }
                 data = result.data;
                 if (data.results) {
-                  _context2.next = 18;
+                  _context2.next = 27;
                   break;
                 }
                 return _context2.abrupt("return", []);
-              case 18:
+              case 27:
                 newResult = [];
                 _summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
                 valueKey = isAdvanced ? "".concat(_summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
@@ -171,9 +182,9 @@ var HeatMapCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   }
                 });
                 return _context2.abrupt("return", newResult);
-              case 23:
+              case 32:
                 return _context2.abrupt("return", []);
-              case 24:
+              case 33:
               case "end":
                 return _context2.stop();
             }

package/es/calculator/map-calculator.js

@@ -109,29 +109,40 @@ var MapCalculator = /*#__PURE__*/function (_BaseCalculator) {
                 groupName = getSqlGroup(geolocation_granularity, column);
                 sqlString = '';
                 summaryColumnName = '';
-                if (isAdvanced) {
-                  summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
-                  summaryColumnName = summaryColumn.name;
-                  summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
-                  sqlString = "select ".concat(groupName, ", ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " limit 5000");
-                } else {
-                  sqlString = "select ".concat(groupName, ", ").concat(method, "(`").concat(columnName, "`) from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " limit 5000");
+                if (!isAdvanced) {
+                  _context2.next = 22;
+                  break;
+                }
+                summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
+                if (summaryColumn) {
+                  _context2.next = 17;
+                  break;
                 }
-                _context2.next = 16;
+                return _context2.abrupt("return", []);
+              case 17:
+                summaryColumnName = summaryColumn.name;
+                summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+                sqlString = "select ".concat(groupName, ", ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " limit 5000");
+                _context2.next = 23;
+                break;
+              case 22:
+                sqlString = "select ".concat(groupName, ", ").concat(method, "(`").concat(columnName, "`) from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " limit 5000");
+              case 23:
+                _context2.next = 25;
                 return this.sqlQuery(sqlString);
-              case 16:
+              case 25:
                 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 = 21;
+                  _context2.next = 30;
                   break;
                 }
                 return _context2.abrupt("return", []);
-              case 21:
+              case 30:
                 newResult = [];
                 _summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
                 valueKey = isAdvanced ? "".concat(_summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
@@ -149,9 +160,9 @@ var MapCalculator = /*#__PURE__*/function (_BaseCalculator) {
                   }
                 });
                 return _context2.abrupt("return", newResult);
-              case 26:
+              case 35:
                 return _context2.abrupt("return", []);
-              case 27:
+              case 36:
               case "end":
                 return _context2.stop();
             }