sea-chart 0.0.31 → 0.0.33-beta

package/dist/utils/chart-utils/sql-statistics-utils.js

@@ -1,17 +1,17 @@
-var _class;
+var _SQLStatisticsUtils;
 import dayjs from 'dayjs';
 import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey } from 'dtable-utils';
-import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, LABEL_COLORS, TABLE_DIMENSIONS, DTABLE_DB_SUMMARY_METHOD } from '../../constants';
+import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, LABEL_COLORS, TABLE_DIMENSIONS, Y_AXIS_TYPE_PREFIX } from '../../constants';
 import { chartColumn2SqlColumn, summaryMethodColumn2SqlColumn } from '../sql';
 import { getClientLinkDisplayString } from '../cell-format-utils';
 import context from '../../context';
 import { column2SqlColumn } from '../sql/column-2-sql-column';
-import { formatNumericValue, getFormattedValue, getColumnByKey, getSqlGroup, getSummaryResult } from '../column-utils';
+import { formatNumericValue, getFormattedValue, getSummaryResult } from '../column-utils';
 import { getCompareDate } from '../trend-utils';
 import intl from '../../intl';
 import BaseUtils from './base-utils';
 class SQLStatisticsUtils {}
-_class = SQLStatisticsUtils;
+_SQLStatisticsUtils = SQLStatisticsUtils;
 SQLStatisticsUtils.dataSources = 'sql_statistics';
 SQLStatisticsUtils.getGroupLabelFromDB = (cellValue, column, tables) => {
   const collaborators = context.getCollaboratorsFromCache();
@@ -230,7 +230,7 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
   let newSqlRows = sqlRows;
   if (groupbyColumn.type === CellType.COLLABORATOR) {
-    newSqlRows = _class.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+    newSqlRows = _SQLStatisticsUtils.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
   if (isCount) {
     let allTotal = 0;
@@ -238,7 +238,7 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
       const total = row[sqlSummaryColumnKey] || 0;
       allTotal += total;
       pivot_rows.push({
-        name: _class.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
+        name: _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
         rows: [],
         total: {
           total
@@ -291,7 +291,7 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
       }
     });
     pivot_rows.push({
-      name: _class.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
+      name: _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
       rows: [row],
       total: rowTotal
     });
@@ -465,11 +465,11 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
     sqlColumnGroupbyColumnKey,
     sqlSummaryColumnKey
   } = chartSQLMap;
-  if (!sqlColumnGroupbyColumnKey) return _class.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+  if (!sqlColumnGroupbyColumnKey) return _SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
   const summaryMethod = (summary_method || 'sum').toUpperCase();
   let newSqlRows = sqlRows;
   if (groupbyColumn.type === CellType.COLLABORATOR) {
-    newSqlRows = _class.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+    newSqlRows = _SQLStatisticsUtils.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
   let pivot_columns = [];
   let pivot_rows = [];
@@ -477,12 +477,12 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   const isRowGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[columnGroupbyColumn.type];
   newSqlRows.forEach(row => {
     const groupbyColumnCellValue = row[sqlGroupbyColumnKey];
-    const groupbyColumnCellValueKey = _class.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
+    const groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
     const columnGroupbyColumnCellValue = row[sqlColumnGroupbyColumnKey];
-    const columnGroupbyColumnCellValueKey = _class.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
+    const columnGroupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
     const count = !row[sqlSummaryColumnKey] && row[sqlSummaryColumnKey] !== 0 ? null : row[sqlSummaryColumnKey];
     if (BaseUtils.isValidCellValue(columnGroupbyColumnCellValue, groupby_include_empty_cells)) {
-      _class.updateTwoDimensionColumns(pivot_columns, columnGroupbyColumnCellValueKey, {
+      _SQLStatisticsUtils.updateTwoDimensionColumns(pivot_columns, columnGroupbyColumnCellValueKey, {
         isIncludeEmpty: groupby_include_empty_cells,
         isCellValueAsAnArray: isRowGroupbyColumnDataAsAnArray
       });
@@ -491,14 +491,14 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
       if (MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[groupbyColumn]) {
         if ((!Array.isArray(groupbyColumnCellValueKey) || groupbyColumnCellValueKey.length === 0) && groupby_include_empty_cells) {
           let pivotRowIndex = pivot_rows.findIndex(r => !r.name);
-          _class.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, null, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
+          _SQLStatisticsUtils.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, null, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
             summaryMethod,
             summaryColumn
           });
         } else {
           groupbyColumnCellValueKey.forEach(n => {
             let pivotRowIndex = pivot_rows.findIndex(r => n === r.name);
-            _class.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, n, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
+            _SQLStatisticsUtils.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, n, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
               summaryMethod,
               summaryColumn
             });
@@ -509,14 +509,14 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
           let resName = r.name;
           return resName === null && groupbyColumnCellValueKey === null || resName === undefined && groupbyColumnCellValueKey === undefined || resName === 0 && groupbyColumnCellValueKey === 0 || resName === groupbyColumnCellValueKey;
         });
-        _class.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, groupbyColumnCellValueKey, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
+        _SQLStatisticsUtils.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, groupbyColumnCellValueKey, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
           summaryMethod,
           summaryColumn
         });
       }
     }
   });
-  let pivot_table_total = _class.getAndUpdateTwoDimensionTotal(pivot_columns_total, pivot_columns, pivot_rows, {
+  let pivot_table_total = _SQLStatisticsUtils.getAndUpdateTwoDimensionTotal(pivot_columns_total, pivot_columns, pivot_rows, {
     summaryMethod,
     summaryColumn
   });
@@ -558,7 +558,7 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap
       formatted_value = getFormattedValue(cellValue, y_axis_summary_column_key, y_axis_summary_method);
     }
     if (BaseUtils.isValidCellValue(cellValue)) {
-      const key = _class.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
       if (isGroupbyColumnDataAsAnArray) {
         if (!Array.isArray(key) || key.length === 0) {
           let itemIdx = result.findIndex(v => v.name === null);
@@ -630,23 +630,39 @@ SQLStatisticsUtils.basicNumberCardSQLResult2JavaScript = (chart, sqlRows, chartS
   }
   return 0;
 };
-SQLStatisticsUtils.customChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables, params) => {
+SQLStatisticsUtils.customChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables, _ref4) => {
+  let {
+    index
+  } = _ref4;
   const {
     table_id,
-    x_axis_column_key,
     x_axis_date_granularity,
     x_axis_geolocation_granularity,
-    x_axis_include_empty
+    x_axis_include_empty,
+    y_axises
   } = chart.config;
   const {
-    groupMethods,
-    originalMethods,
-    numericColumns,
-    groupColumnNames,
-    yAxisType
-  } = params;
+    groupbyColumn
+  } = columnMap;
   const table = getTableById(tables, table_id);
-  const groupbyColumn = getTableColumnByKey(table, x_axis_column_key);
+  const stack = y_axises[index];
+  if (!stack) return [];
+  const {
+    column_groupby_numeric_columns
+  } = stack;
+  const y_axis_type = "".concat(Y_AXIS_TYPE_PREFIX).concat(index);
+  let summaryMethods = [];
+  let originalMethods = [];
+  let groupColumnNames = [];
+  let numericColumns = [];
+  column_groupby_numeric_columns.forEach(item => {
+    const numericColumn = getTableColumnByKey(table, item.column_key);
+    const groupColumnName = numericColumn.name;
+    numericColumns.push(numericColumn);
+    groupColumnNames.push(groupColumnName);
+    summaryMethods.push(summaryMethodColumn2SqlColumn(item.summary_method.toUpperCase(), numericColumn).key);
+    originalMethods.push(item.summary_method);
+  });
   const {
     key: sqlGroupbyColumnKey
   } = column2SqlColumn(groupbyColumn, {
@@ -656,24 +672,22 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMa
   let result = [];
   sqlRows.forEach(row => {
     const cellValue = row[sqlGroupbyColumnKey];
-    const label = _class.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+    const label = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
     const isEmpty = !label;
     const groupItems = [];
-    groupMethods.forEach((_, index) => {
-      if (!x_axis_include_empty && isEmpty) {
-        return;
-      }
-      let value = row[groupMethods[index]] || 0;
+    summaryMethods.forEach((summaryMethod, index) => {
+      if (!x_axis_include_empty && isEmpty) return;
+      let value = row[summaryMethod] || 0;
       let formatted_value = value;
       value = formatNumericValue(value, numericColumns[index]);
-      formatted_value = getFormattedValue(value, numericColumns, originalMethods[index]);
+      formatted_value = getFormattedValue(value, numericColumns[index], originalMethods[index]);
       groupItems.push({
         name: label,
         value,
         formatted_value,
         group_name: groupColumnNames[index],
         original_name: row[groupbyColumn.key],
-        y_axis_type: yAxisType
+        y_axis_type: y_axis_type
       });
     });
     result = result.concat(groupItems);
@@ -681,46 +695,35 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMa
   return result;
 };
 SQLStatisticsUtils.compareSQLResult2Javascript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
+  const {
+    groupbyColumn,
+    summaryColumn
+  } = columnMap;
+  const {
+    sqlGroupbyColumnKey,
+    sqlSummaryColumnKey
+  } = chartSQLMap;
   const {
     config
   } = chart;
   const {
-    table_id,
     x_axis_date_range_start,
     x_axis_date_range_end,
     x_axis_compared_date_range_start,
     x_axis_compared_date_range_end,
     y_axis_summary_type,
     y_axis_summary_method,
-    x_axis_column_key,
-    y_axis_column_key,
-    x_axis_geolocation_granularity,
     display_increase
   } = config;
   const groupName1 = "".concat(x_axis_date_range_start, " - ").concat(x_axis_date_range_end);
   const groupName2 = "".concat(x_axis_compared_date_range_start, " - ").concat(x_axis_compared_date_range_end);
   const dateRangeResult = new Map();
   let dateComparedResult = new Map();
-  const selectedTable = getTableById(tables, table_id);
-  const selectedColumn = getColumnByKey(x_axis_column_key, selectedTable.columns);
-  const groupName = getSqlGroup(selectedColumn, {
-    'date_granularity': 'day',
-    'geolocation_granularity': x_axis_geolocation_granularity
-  });
-  let summaryColumnName = "".concat(selectedColumn.name);
-  let selectedSummaryColumn = {};
   const isAdvanced = y_axis_summary_type === CHART_SUMMARY_TYPE.ADVANCED;
-  if (isAdvanced) {
-    selectedSummaryColumn = getColumnByKey(y_axis_column_key, selectedTable.columns);
-    if (!selectedSummaryColumn) return [];
-    summaryColumnName = "".concat(selectedSummaryColumn.name);
-  }
-  const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[y_axis_summary_method] : DTABLE_DB_SUMMARY_METHOD.COUNT;
-  const valueKey = isAdvanced ? "".concat(method, "(").concat(summaryColumnName, ")") : "".concat(method, "(").concat(selectedColumn.name, ")");
   sqlRows.forEach(item => {
-    const name = item[groupName];
-    const label = _class.getGroupLabelFromDB(name, selectedColumn, tables);
-    const value = item[valueKey];
+    const name = item[sqlGroupbyColumnKey];
+    const label = _SQLStatisticsUtils.getGroupLabelFromDB(name, groupbyColumn, tables);
+    const value = item[sqlSummaryColumnKey];
     if (name >= x_axis_date_range_start && name <= x_axis_date_range_end) {
       const currentValue = dateRangeResult.get(label);
       if (!currentValue) {
@@ -755,13 +758,13 @@ SQLStatisticsUtils.compareSQLResult2Javascript = (chart, sqlRows, chartSQLMap, c
   });
   let comparedResult = [];
   let rangeResult = [];
-  const data = selectedSummaryColumn.data || {};
+  const data = (summaryColumn === null || summaryColumn === void 0 ? void 0 : summaryColumn.data) || {};
   for (let item of dateRangeResult) {
     let value = item[1];
     let formatted_value = value;
     if (isAdvanced) {
       value = getSummaryResult(item[1], y_axis_summary_method, data.precision);
-      formatted_value = getFormattedValue(value, selectedSummaryColumn, y_axis_summary_method);
+      formatted_value = getFormattedValue(value, summaryColumn, y_axis_summary_method);
     }
     rangeResult.push({
       name: item[0],
@@ -781,7 +784,7 @@ SQLStatisticsUtils.compareSQLResult2Javascript = (chart, sqlRows, chartSQLMap, c
     let formatted_value = value;
     if (isAdvanced) {
       value = getSummaryResult(item[1], y_axis_summary_method, data.precision);
-      formatted_value = getFormattedValue(value, selectedSummaryColumn, y_axis_summary_method);
+      formatted_value = getFormattedValue(value, summaryColumn, y_axis_summary_method);
     }
     const newItem = {
       name: dateRangeItem.name,
@@ -843,7 +846,7 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = (chart, sqlRows, chartSQLMa
     sqlRows.forEach(row => {
       const cellValue = row[sqlGroupbyColumnKey];
       const summaryValue = row[sqlSummaryColumnKey];
-      const key = _class.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
       let valueLeft = row[sqlLeftSummaryColumnKey] || 0;
       let valueRight = row[sqlRightSummaryColumnKey] || 0;
       if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
@@ -930,7 +933,7 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = (chart, sqlRows, chartSQLMa
     });
     sqlRows.forEach((item, index) => {
       const cellValue = item[sqlGroupbyColumnKey];
-      const key = _class.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
       let valueRight = item[sqlRightSummaryColumnKey] || 0;
       if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
         valueRight = BaseUtils.getPrecisionNumber(valueRight, rightSummaryColumn.data);
@@ -1003,15 +1006,15 @@ SQLStatisticsUtils.updateGroupingChartRow = (results, name, groupName, row, coun
 SQLStatisticsUtils.updateGroupingChartRows = (results, name, row, count, isColumnGroupbyColumnDataAsAnArray, groupName) => {
   if (isColumnGroupbyColumnDataAsAnArray) {
     if (!Array.isArray(groupName) || groupName.length === 0) {
-      _class.updateGroupingChartRow(results, name, null, row, count);
+      _SQLStatisticsUtils.updateGroupingChartRow(results, name, null, row, count);
       return;
     }
     groupName.forEach(v => {
-      _class.updateGroupingChartRow(results, name, v, row, count);
+      _SQLStatisticsUtils.updateGroupingChartRow(results, name, v, row, count);
     });
     return;
   }
-  _class.updateGroupingChartRow(results, name, groupName, row, count);
+  _SQLStatisticsUtils.updateGroupingChartRow(results, name, groupName, row, count);
 };
 SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
   const {
@@ -1031,21 +1034,21 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = (chart, sqlRo
   const isColumnGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[columnGroupbyColumn.type];
   sqlRows.forEach(row => {
     const groupbyColumnCellValue = row[sqlGroupbyColumnKey];
-    const groupbyColumnCellValueKey = _class.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
+    const groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
     if (BaseUtils.isValidCellValue(groupbyColumnCellValueKey, includeEmpty)) {
       const columnGroupbyColumnCellValue = row[sqlColumnGroupbyColumnKey];
-      const columnGroupbyColumnCellValueKey = _class.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
+      const columnGroupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
       const count = row[sqlSummaryColumnKey];
       if (isGroupbyColumnDataAsAnArray) {
         if (!Array.isArray(groupbyColumnCellValueKey) || groupbyColumnCellValueKey.length === 0) {
-          _class.updateGroupingChartRows(result, null, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
+          _SQLStatisticsUtils.updateGroupingChartRows(result, null, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
         } else {
           groupbyColumnCellValueKey.forEach(n => {
-            _class.updateGroupingChartRows(result, n, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
+            _SQLStatisticsUtils.updateGroupingChartRows(result, n, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
           });
         }
       } else {
-        _class.updateGroupingChartRows(result, groupbyColumnCellValueKey, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
+        _SQLStatisticsUtils.updateGroupingChartRows(result, groupbyColumnCellValueKey, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
       }
     }
   });
@@ -1062,15 +1065,15 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
     x_axis_include_empty_cells: includeEmpty
   } = chart.config;
   if (!column_groupby_column_key && !column_groupby_multiple_numeric_column) {
-    return _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+    return _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
   const {
     groupbyColumn,
     columnGroupbyColumn
   } = columnMap;
   if (y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT) {
-    if (!columnGroupbyColumn) return _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
-    return _class.groupingTwoDimensionChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+    if (!columnGroupbyColumn) return _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+    return _SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
   const {
     sqlGroupbyColumnKey
@@ -1083,7 +1086,7 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
     const isGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[groupbyColumn.type];
     sqlRows.forEach(row => {
       const groupbyColumnCellValue = row[sqlGroupbyColumnKey];
-      const groupbyColumnCellValueKey = _class.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
+      const groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
       if (BaseUtils.isValidCellValue(groupbyColumnCellValueKey, includeEmpty)) {
         Object.keys(summaryColumns).forEach(sqlSummaryColumnName => {
           const {
@@ -1093,14 +1096,14 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
           const numberColumnCellValue = row[sqlSummaryColumnKey];
           if (isGroupbyColumnDataAsAnArray) {
             if (!Array.isArray(groupbyColumnCellValueKey) || groupbyColumnCellValueKey.length === 0) {
-              _class.updateGroupingChartRows(result, null, row, numberColumnCellValue, false, columnName);
+              _SQLStatisticsUtils.updateGroupingChartRows(result, null, row, numberColumnCellValue, false, columnName);
             } else {
               groupbyColumnCellValueKey.forEach(n => {
-                _class.updateGroupingChartRows(result, n, row, numberColumnCellValue, false, columnName);
+                _SQLStatisticsUtils.updateGroupingChartRows(result, n, row, numberColumnCellValue, false, columnName);
               });
             }
           } else {
-            _class.updateGroupingChartRows(result, groupbyColumnCellValueKey, row, numberColumnCellValue, false, columnName);
+            _SQLStatisticsUtils.updateGroupingChartRows(result, groupbyColumnCellValueKey, row, numberColumnCellValue, false, columnName);
           }
         });
       }
@@ -1110,31 +1113,24 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
     return result;
   }
   if (!columnGroupbyColumn) {
-    return _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+    return _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
-  return _class.groupingTwoDimensionChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+  return _SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
 };
 SQLStatisticsUtils.heatMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
-  const {
-    config
-  } = chart;
-  const {
-    time_column_key,
-    summary_type
-  } = config;
   const {
     summaryColumn
   } = columnMap;
   const {
+    sqlGroupbyColumnKey,
     sqlSummaryColumnKey
   } = chartSQLMap;
   let result = [];
-  const isAdvanced = summary_type === CHART_SUMMARY_TYPE.ADVANCED;
   sqlRows.forEach(item => {
-    const currentValue = item[time_column_key];
-    if (currentValue) {
+    const currentValue = item[sqlGroupbyColumnKey];
+    if (currentValue || currentValue === 0) {
       let value = item[sqlSummaryColumnKey];
-      if (isAdvanced) {
+      if (summaryColumn) {
         value = formatNumericValue(value, summaryColumn);
       }
       const name = typeof currentValue === 'string' ? currentValue : currentValue.country_region;
@@ -1161,13 +1157,9 @@ SQLStatisticsUtils.heatMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQLM
     }
   });
   data.sort((current, next) => {
-    if (current.year > next.year) {
-      return -1;
-    } else if (current.year < next.year) {
-      return 1;
-    } else {
-      return 0;
-    }
+    if (current.year > next.year) return -1;
+    if (current.year < next.year) return 1;
+    return 0;
   });
   return {
     data,
@@ -1195,12 +1187,12 @@ SQLStatisticsUtils.mirrorMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQ
   } = chartSQLMap;
   const isAdvanced = summary_type === CHART_SUMMARY_TYPE.ADVANCED;
   const newResult = [];
-  const groupData = _class.getGroupData(sqlRows, columnGroupbyColumn);
+  const groupData = _SQLStatisticsUtils.getGroupData(sqlRows, columnGroupbyColumn);
   if (groupData.length > 0) {
     const groupData0 = groupData[0] || {};
     const groupData1 = groupData[1] || {};
     sqlRows.forEach(item => {
-      const label = _class.getGroupLabelFromDB(item[column_key], groupbyColumn, tables);
+      const label = _SQLStatisticsUtils.getGroupLabelFromDB(item[column_key], groupbyColumn, tables);
       const groupValue = item[group_column_key];
       const equal2GroupData0 = groupData0.id === groupValue;
       const equal2GroupData1 = groupData1.id === groupValue;
@@ -1295,11 +1287,11 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
         } = chart.config;
         if (!column_groupby_column_key) {
           return {
-            result: _class.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+            result: _SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
           };
         }
         return {
-          result: _class.twoDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.PIE:
@@ -1307,19 +1299,19 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
     case CHART_TYPE.TREE_MAP:
       {
         return {
-          result: _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.BASIC_NUMBER_CARD:
       {
         return {
-          result: _class.basicNumberCardSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.basicNumberCardSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.DASHBOARD:
       {
         return {
-          result: _class.dashboardSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.dashboardSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.BAR:
@@ -1328,13 +1320,13 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
     case CHART_TYPE.AREA:
       {
         return {
-          result: _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.COMPLETENESS:
     case CHART_TYPE.COMPLETENESS_GROUP:
       {
-        const result = _class.completenessSQlResult(chart, sqlRows, chartSQLMap, tables);
+        const result = _SQLStatisticsUtils.completenessSQlResult(chart, sqlRows, chartSQLMap, tables);
         return {
           result
         };
@@ -1342,13 +1334,13 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
     case CHART_TYPE.COMBINATION:
       {
         return {
-          result: _class.combinationSQLResult2Javascript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.combinationSQLResult2Javascript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.COMPARE_BAR:
       {
         return {
-          result: _class.compareSQLResult2Javascript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.compareSQLResult2Javascript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.BAR_GROUP:
@@ -1359,51 +1351,51 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
     case CHART_TYPE.STACKED_HORIZONTAL_BAR:
       {
         return {
-          result: _class.groupingChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.groupingChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.SCATTER:
       {
         return {
-          result: _class.scatterSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.scatterSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.BAR_CUSTOM:
       {
         return {
-          result: _class.customChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables, params)
+          result: _SQLStatisticsUtils.customChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables, params)
         };
       }
     case CHART_TYPE.MAP:
     case CHART_TYPE.MAP_BUBBLE:
       {
         return {
-          result: _class.mapSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.mapSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.WORLD_MAP:
     case CHART_TYPE.WORLD_MAP_BUBBLE:
       {
         return {
-          result: _class.worldMapSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.worldMapSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.HEAT_MAP:
       {
         return {
-          result: _class.heatMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.heatMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.MIRROR:
       {
         return {
-          result: _class.mirrorMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.mirrorMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.TREND:
       {
         return {
-          result: _class.trendMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _SQLStatisticsUtils.trendMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     default:
@@ -1412,7 +1404,14 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
       }
   }
 };
-SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, tables) => {
+SQLStatisticsUtils._get_completeness_name = (row, column) => {
+  let value = row[column.key];
+  if (Array.isArray(value)) {
+    value = value.join('、');
+  }
+  return value;
+};
+SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables) => {
   const {
     config: {
       type
@@ -1422,7 +1421,7 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, table
   const {
     sqlColumns,
     sqlColumnGroupByColumnKey
-  } = sqlStatistics;
+  } = chartSQLMap;
   const {
     name_column,
     completed_column,
@@ -1433,19 +1432,11 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, table
   // format the fetched value
   BaseUtils.updateTableViewList(sqlRows, name_column, name_column.key, 'color');
   if (sqlColumnGroupByColumnKey) BaseUtils.updateTableViewList(sqlRows, column_groupby_column, sqlColumnGroupByColumnKey, 'color');
-  function getFormatedKey(row, column) {
-    // const newKey = column.name;
-    let value = row[column.key];
-    if (Array.isArray(value)) {
-      value = value.join('、');
-    }
-    return value;
-  }
   const res = [];
-  let sumedSqlRows;
+  let summedSqlRows;
   if (!isGroup) {
     const sumSqlRows = sqlRows.reduce((acc, row) => {
-      const nameValue = getFormatedKey(row, name_column);
+      const nameValue = _SQLStatisticsUtils._get_completeness_name(row, name_column);
       if (!acc[nameValue]) {
         acc[nameValue] = row;
       } else {
@@ -1457,10 +1448,10 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, table
       }
       return acc;
     }, {});
-    sumedSqlRows = Object.values(sumSqlRows);
+    summedSqlRows = Object.values(sumSqlRows);
   } else {
     const sumSqlRowsWithGroupBy = sqlRows.reduce((acc, row) => {
-      const nameValue = getFormatedKey(row, name_column);
+      const nameValue = _SQLStatisticsUtils._get_completeness_name(row, name_column);
       const groupby = row[sqlColumnGroupByColumnKey];
       const key = "".concat(nameValue, "_").concat(groupby);
       if (!acc[key]) {
@@ -1475,10 +1466,10 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, table
       }
       return acc;
     }, {});
-    sumedSqlRows = Object.values(sumSqlRowsWithGroupBy);
+    summedSqlRows = Object.values(sumSqlRowsWithGroupBy);
   }
-  sumedSqlRows.forEach(row => {
-    const nameValue = getFormatedKey(row, name_column);
+  summedSqlRows.forEach(row => {
+    const nameValue = _SQLStatisticsUtils._get_completeness_name(row, name_column);
     let targetValue;
     let completedValue;
     let groupby;
@@ -1487,8 +1478,8 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, table
       completedValue = row["SUM(".concat(completed_column.name, ")")];
       groupby = row[sqlColumnGroupByColumnKey] || intl.get('Empty');
     } else {
-      completedValue = getFormatedKey(row, completed_column);
-      targetValue = getFormatedKey(row, target_column);
+      completedValue = _SQLStatisticsUtils._get_completeness_name(row, completed_column);
+      targetValue = _SQLStatisticsUtils._get_completeness_name(row, target_column);
     }
     let completedRate;
     if (!targetValue && completedValue) {
@@ -1526,26 +1517,21 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, table
   return res;
 };
 SQLStatisticsUtils.scatterSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
-  const {
-    x_axis_column_key,
-    y_axis_column_key,
-    column_groupby_column_key,
-    table_id
-  } = chart.config;
   const {
     sqlXColumnKey,
     sqlYColumnKey,
     sqlColumnGroupbyColumnKey
   } = chartSQLMap;
-  const selectedTable = getTableById(tables, table_id);
-  const sqlXColumn = getColumnByKey(x_axis_column_key, selectedTable.columns);
-  const sqlYColumn = getColumnByKey(y_axis_column_key, selectedTable.columns);
-  const sqlColumnGroupByColumn = getColumnByKey(column_groupby_column_key, selectedTable.columns);
+  const {
+    groupbyColumn,
+    columnGroupbyColumn,
+    summaryColumn
+  } = columnMap;
 
   // format sql rows
-  BaseUtils.updateTableViewList(sqlRows, sqlXColumn, sqlXColumn.key, 'color');
-  BaseUtils.updateTableViewList(sqlRows, sqlYColumn, sqlYColumn.key, 'color');
-  if (sqlColumnGroupbyColumnKey) BaseUtils.updateTableViewList(sqlRows, sqlColumnGroupByColumn, sqlColumnGroupbyColumnKey, 'color');
+  BaseUtils.updateTableViewList(sqlRows, groupbyColumn, groupbyColumn.key, 'color');
+  BaseUtils.updateTableViewList(sqlRows, summaryColumn, summaryColumn.key, 'color');
+  if (sqlColumnGroupbyColumnKey) BaseUtils.updateTableViewList(sqlRows, columnGroupbyColumn, sqlColumnGroupbyColumnKey, 'color');
   const res = [];
   sqlRows.forEach(row => {
     const xValue = row[sqlXColumnKey];
@@ -1607,7 +1593,7 @@ SQLStatisticsUtils.worldMapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap,
   });
   return result;
 };
-SQLStatisticsUtils.calculateChart = (chart, value, callback, res) => {
+SQLStatisticsUtils.calculateChart = (chart, value, callback, sqlRows) => {
   const {
     tables
   } = value;
@@ -1650,14 +1636,15 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, res) => {
   const tipMessage = 'There_are_no_statistic_results_yet';
 
   // Custom Bar
-  if (Array.isArray(res)) {
+  if (chartType === CHART_TYPE.BAR_CUSTOM) {
     const result = [];
-    res.forEach(item => {
-      const {
-        results: sqlRows
-      } = item.res.data;
-      const chartResult = _class.sqlResult2JavaScript(newChart, sqlRows, chartSQLMap, columnMap, tables, item);
-      result.push(...chartResult.result);
+    sqlRows.forEach((item, index) => {
+      if (item.length !== 0) {
+        const chartResult = _SQLStatisticsUtils.sqlResult2JavaScript(newChart, item, chartSQLMap, columnMap, tables, {
+          index
+        });
+        result.push(...chartResult.result);
+      }
     });
     if (result.length === 0) {
       callback && callback('', tipMessage, null);
@@ -1665,7 +1652,7 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, res) => {
     }
     callback && callback('', '', {
       result,
-      data_sources: _class.dataSources,
+      data_sources: _SQLStatisticsUtils.dataSources,
       groupbyColumn,
       columnGroupbyColumn,
       summaryColumn,
@@ -1673,15 +1660,14 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, res) => {
     });
     return;
   }
-  const {
-    results: sqlRows
-  } = res.data;
+
   // map is special, still need to show map even data is empty
   if (!Array.isArray(sqlRows) || sqlRows.length === 0 && !chartType.includes('map')) {
     callback && callback('', tipMessage, null);
     return;
   }
-  const chartResult = _class.sqlResult2JavaScript(newChart, sqlRows, chartSQLMap, columnMap, tables);
+  const chartResult = _SQLStatisticsUtils.sqlResult2JavaScript(newChart, sqlRows, chartSQLMap, columnMap, tables);
+
   // map is special
   if (BaseUtils.imEmptyChartResult(chartResult) && !chartType.includes('map')) {
     callback && callback('', tipMessage, null);
@@ -1689,7 +1675,7 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, res) => {
   }
   callback && callback('', '', {
     ...chartResult,
-    data_sources: _class.dataSources,
+    data_sources: _SQLStatisticsUtils.dataSources,
     groupbyColumn,
     columnGroupbyColumn,
     summaryColumn,