sea-chart 0.0.31-beta → 0.0.32

package/dist/settings/mirror-settings/data-settings.js

@@ -82,7 +82,7 @@ const DataSettings = _ref => {
     label: intl.get('Statistic_field'),
     selectedTableId: table_id,
     selectedColumnKey: column_key,
-    onlySupportMirror: true,
+    isMirror: true,
     onGroupByChange: onXAxisColumnChange
   }), /*#__PURE__*/React.createElement(Switch, {
     key: "x_axis_include_empty_cells",

package/dist/settings/widgets/group-by.js

@@ -61,12 +61,12 @@ class GroupBy extends Component {
     this.getAvailableColumns = columns => {
       const {
         onlySupportDate,
-        onlySupportMirror,
+        isMirror,
         onlySupportSingleSelect
       } = this.props;
       if (!columns || !Array.isArray(columns)) return [];
       let newColumns = [];
-      if (onlySupportMirror) {
+      if (isMirror) {
         newColumns = columns.filter(column => MIRROR_COLUMN_LIST.includes(column.type));
         return newColumns;
       }
@@ -163,8 +163,10 @@ class GroupBy extends Component {
     };
     this.renderGroupBy = () => {
       const {
-        selectedColumnKey
+        selectedColumnKey,
+        isMirror
       } = this.props;
+      if (isMirror) return null;
       if (!selectedColumnKey) return null;
       const groupbyColumn = getTableColumnByKey(this.selectedTable, selectedColumnKey);
       if (!groupbyColumn) return null;

package/dist/utils/chart-utils/base-utils.js

@@ -1,4 +1,4 @@
-var _BaseUtils;
+var _class;
 import shallowEqual from 'shallowequal';
 import dayjs from 'dayjs';
 import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, getDateDisplayString, getNumberDisplayString, getOption, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, isNumericColumn, isDateColumn, sortText, sortNumber, sortDate, sortSingleSelect, sortFormula, getColumnOptions, DateUtils, getGeolocationDisplayString, getFormulaDisplayString } from 'dtable-utils';
@@ -31,7 +31,7 @@ class BaseUtils {
     };
   }
 }
-_BaseUtils = BaseUtils;
+_class = BaseUtils;
 // valid chart
 BaseUtils.isValidCombinationChart = (config, table) => {
   const summaryLeftColumnKey = config.y_axis_left_summary_column;
@@ -101,7 +101,7 @@ BaseUtils.isValidExistChart = (tables, chart) => {
   if (!groupByColumnKey) return false;
   if (!getTableColumnByKey(table, groupByColumnKey)) return false;
   if (type === CHART_TYPE.COMBINATION) {
-    const isExist = _BaseUtils.isValidCombinationChart(config, table);
+    const isExist = _class.isValidCombinationChart(config, table);
     if (!isExist) return false;
   } else {
     const summaryColumnKey = config.summary_column_key || config.y_axis_summary_column_key || config.horizontal_axis_column_key;
@@ -136,6 +136,9 @@ BaseUtils.getGroupColumn = (table, chart) => {
   if (type === CHART_TYPE.TREND) {
     return getTableColumnByKey(table, config.date_column_key);
   }
+  if (type === CHART_TYPE.HEAT_MAP) {
+    return getTableColumnByKey(table, config.time_column_key);
+  }
   return getTableColumnByKey(table, config.x_axis_column_key);
 };
 BaseUtils.getColumnGroupColumn = (table, chart) => {
@@ -154,6 +157,9 @@ BaseUtils.getColumnGroupColumn = (table, chart) => {
   if ([CHART_TYPE.MIRROR].includes(type)) {
     return getTableColumnByKey(table, config.group_column_key);
   }
+  if (type === CHART_TYPE.SCATTER) {
+    return getTableColumnByKey(table, config.column_groupby_column_key);
+  }
   return getTableColumnByKey(table, config.y_axis_summary_column_key);
 };
 BaseUtils.getSummaryColumn = (table, chart) => {
@@ -182,6 +188,10 @@ BaseUtils.getSummaryColumn = (table, chart) => {
       {
         return getTableColumnByKey(table, numeric_column_key);
       }
+    case CHART_TYPE.SCATTER:
+      {
+        return getTableColumnByKey(table, config.y_axis_column_key);
+      }
     default:
       {
         return getTableColumnByKey(table, summary_column_key);
@@ -193,7 +203,7 @@ BaseUtils.getGroupName = (tables, chart) => {
     config
   } = chart;
   const table = getTableById(tables, config.table_id);
-  const column = _BaseUtils.getGroupColumn(table, chart);
+  const column = _class.getGroupColumn(table, chart);
   return column.name;
 };
 BaseUtils.getChartGroups = charts => {
@@ -228,7 +238,7 @@ BaseUtils.getSummaryValueDisplayString = function (summaryColumn, summaryValue)
   const {
     data
   } = summaryColumn;
-  if (_BaseUtils.isDateSummaryColumn(summaryColumn)) {
+  if (_class.isDateSummaryColumn(summaryColumn)) {
     if (typeof summaryValue !== 'string') return summaryValue;
 
     // Compatible with previous data
@@ -263,7 +273,7 @@ BaseUtils.getSummaryValue = (_ref, currentValue, nextValue) => {
     summaryMethod,
     summaryColumn
   } = _ref;
-  if (_BaseUtils.isDateSummaryColumn(summaryColumn)) {
+  if (_class.isDateSummaryColumn(summaryColumn)) {
     if (summaryMethod === 'MAX') {
       if (currentValue && nextValue) {
         return dayjs(currentValue).isBefore(nextValue) ? nextValue : currentValue;
@@ -340,7 +350,7 @@ BaseUtils.isChartStyleChanged = (prevElement, currElement) => {
   return !shallowEqual(prevBorder, currBorder) || !shallowEqual(prevTitle, currTitle);
 };
 BaseUtils.shouldChartComponentUpdate = (prevProps, currentProps) => {
-  return !_BaseUtils.isChartEqual(prevProps.chart, currentProps.chart) ||
+  return !_class.isChartEqual(prevProps.chart, currentProps.chart) ||
   // chart attributes changed
   !shallowEqual(prevProps.canvasStyle, currentProps.canvasStyle) ||
   // canvasStyle
@@ -350,7 +360,7 @@ BaseUtils.shouldChartComponentUpdate = (prevProps, currentProps) => {
   // columnGroupbyColumn's data、type changed or not exist
   !shallowEqual(prevProps.summaryColumn, currentProps.summaryColumn) ||
   // summaryColumn's data、type changed or not exist
-  _BaseUtils._isChartDataChange(prevProps, currentProps) || _BaseUtils.isChartStyleChanged(prevProps.chart, currentProps.chart);
+  _class._isChartDataChange(prevProps, currentProps) || _class.isChartStyleChanged(prevProps.chart, currentProps.chart);
 };
 BaseUtils._isCombinationDataChange = (prevResult, currentResult) => {
   if (prevResult.value_left !== currentResult.value_left) return true;
@@ -366,7 +376,7 @@ BaseUtils._isChartDataChange = (prevProps, currentProps) => {
     result: oldData
   } = currentProps;
   if (chart.config.type === CHART_TYPE.COMBINATION) {
-    return _BaseUtils._isCombinationDataChange(newData, oldData);
+    return _class._isCombinationDataChange(newData, oldData);
   }
   if (!newData && !oldData) return false;
   if (!newData && oldData || newData && !oldData) return true;
@@ -421,7 +431,7 @@ BaseUtils.getPieColorSet = (tables, chart, result) => {
     table_id,
     groupby_column_key: column_id
   } = chart.config;
-  const column = _BaseUtils.getColumn(tables, table_id, column_id);
+  const column = _class.getColumn(tables, table_id, column_id);
   const {
     type: columnType
   } = column || {};
@@ -488,7 +498,7 @@ BaseUtils.formatPieChartData = (data, chart, tables) => {
     const value = item.value;
     if (value >= threshold) {
       item.percent = String(Number.parseFloat(value / sum * 100).toFixed(1)) + '%';
-      const color = _BaseUtils.getPieColor(column, index, item);
+      const color = _class.getPieColor(column, index, item);
       item.color = color;
       colorSet.push(color);
       filteredData.push(item);
@@ -603,7 +613,7 @@ BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorK
 };
 BaseUtils.updateTableViewList = (result, column, nameKey, colorKey) => {
   result.forEach(result => {
-    _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey);
+    _class.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey);
   });
 };
 // sort chart
@@ -739,10 +749,10 @@ BaseUtils.formatGroupsLabel = (results, chart, tables) => {
       group_name
     } = item;
     if (groupbyColumn) {
-      _BaseUtils.convertResultName(item, groupbyColumn, name, 'name', 'color');
+      _class.convertResultName(item, groupbyColumn, name, 'name', 'color');
     }
     if (columnGroupbyColumn) {
-      _BaseUtils.convertResultName(item, columnGroupbyColumn, group_name, 'group_name', 'group_color');
+      _class.convertResultName(item, columnGroupbyColumn, group_name, 'group_name', 'group_color');
     }
   });
 };
@@ -1166,19 +1176,19 @@ BaseUtils.getSummaryResult = function (results, summaryMethod) {
   switch (summaryMethod) {
     case CHART_SUMMARY_TYPE.MAX:
       {
-        return _BaseUtils.getMax(numericResults);
+        return _class.getMax(numericResults);
       }
     case CHART_SUMMARY_TYPE.MIN:
       {
-        return _BaseUtils.getMin(numericResults);
+        return _class.getMin(numericResults);
       }
     case CHART_SUMMARY_TYPE.SUM:
       {
-        return _BaseUtils.getSum(numericResults, precision);
+        return _class.getSum(numericResults, precision);
       }
     case CHART_SUMMARY_TYPE.MEAN:
       {
-        return _BaseUtils.getMean(numericResults, precision);
+        return _class.getMean(numericResults, precision);
       }
     case CHART_SUMMARY_TYPE.Distinct_values:
       {
@@ -1225,7 +1235,7 @@ BaseUtils.getSum = function (list) {
 BaseUtils.getMean = function (list) {
   let precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 8;
   if (list.length === 0) return 0;
-  const sum = _BaseUtils.getSum(list);
+  const sum = _class.getSum(list);
   return Number.parseFloat((sum / list.length).toFixed(precision));
 };
 BaseUtils.summaryDurationResult = (result, duration, summaryType, summaryMethod, useDataDb, dbDateKey, valueKey) => {
@@ -1271,11 +1281,11 @@ BaseUtils.summaryDurationResult = (result, duration, summaryType, summaryMethod,
   // }
 
   if (summaryType === CHART_SUMMARY_TYPE.ADVANCED) {
-    comparedValue = _BaseUtils.getSummaryResult(comparedValue, summaryMethod);
-    compareValue = _BaseUtils.getSummaryResult(compareValue, summaryMethod);
+    comparedValue = _class.getSummaryResult(comparedValue, summaryMethod);
+    compareValue = _class.getSummaryResult(compareValue, summaryMethod);
   } else {
-    compareValue = _BaseUtils.getSummaryResult(compareValue, 'Sum');
-    comparedValue = _BaseUtils.getSummaryResult(comparedValue, 'Sum');
+    compareValue = _class.getSummaryResult(compareValue, 'Sum');
+    comparedValue = _class.getSummaryResult(comparedValue, 'Sum');
   }
   return {
     compareValue,

package/dist/utils/chart-utils/original-data-utils/index.js

@@ -1,4 +1,4 @@
-var _OriginalDataUtils;
+var _class;
 import { getTableById, getViewById } from 'dtable-utils';
 import PivotTableCalculator from './pivot-table-calculator';
 import BasicChartCalculator from './basic-chart-calculator';
@@ -34,7 +34,7 @@ const calculatorMap = {
   [CHART_TYPE.DASHBOARD]: DashboardCalculator
 };
 class OriginalDataUtils {}
-_OriginalDataUtils = OriginalDataUtils;
+_class = OriginalDataUtils;
 OriginalDataUtils.dataSources = 'original_data';
 OriginalDataUtils.isValidExistChart = (tables, chart) => {
   const isValid = BaseUtils.isValidExistChart(tables || [], chart);
@@ -49,7 +49,7 @@ OriginalDataUtils.isValidExistChart = (tables, chart) => {
   return true;
 };
 OriginalDataUtils.calculateChart = async (chart, value, callback) => {
-  if (!_OriginalDataUtils.isValidExistChart((value === null || value === void 0 ? void 0 : value.tables) || [], chart)) {
+  if (!_class.isValidExistChart((value === null || value === void 0 ? void 0 : value.tables) || [], chart)) {
     const tip_message = 'Please_complete_the_chart_configuration_first';
     return callback && callback('', tip_message, null);
   }
@@ -76,7 +76,7 @@ OriginalDataUtils.calculateChart = async (chart, value, callback) => {
     const chartTableColumns = table.columns;
     return callback && callback('', '', {
       result,
-      data_sources: _OriginalDataUtils.dataSources,
+      data_sources: _class.dataSources,
       groupbyColumn,
       columnGroupbyColumn,
       summaryColumn,

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

@@ -1,17 +1,27 @@
-var _SQLStatisticsUtils;
+var _class;
 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, Y_AXIS_TYPE_PREFIX } 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 {}
-_SQLStatisticsUtils = SQLStatisticsUtils;
+class SQLStatisticsUtils {
+  constructor() {
+    this._get_completeness_name = (row, column) => {
+      let value = row[column.key];
+      if (Array.isArray(value)) {
+        value = value.join('、');
+      }
+      return value;
+    };
+  }
+}
+_class = SQLStatisticsUtils;
 SQLStatisticsUtils.dataSources = 'sql_statistics';
 SQLStatisticsUtils.getGroupLabelFromDB = (cellValue, column, tables) => {
   const collaborators = context.getCollaboratorsFromCache();
@@ -230,7 +240,7 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
   let newSqlRows = sqlRows;
   if (groupbyColumn.type === CellType.COLLABORATOR) {
-    newSqlRows = _SQLStatisticsUtils.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+    newSqlRows = _class.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
   if (isCount) {
     let allTotal = 0;
@@ -238,7 +248,7 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
       const total = row[sqlSummaryColumnKey] || 0;
       allTotal += total;
       pivot_rows.push({
-        name: _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
+        name: _class.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
         rows: [],
         total: {
           total
@@ -291,7 +301,7 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
       }
     });
     pivot_rows.push({
-      name: _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
+      name: _class.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
       rows: [row],
       total: rowTotal
     });
@@ -465,11 +475,11 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
     sqlColumnGroupbyColumnKey,
     sqlSummaryColumnKey
   } = chartSQLMap;
-  if (!sqlColumnGroupbyColumnKey) return _SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+  if (!sqlColumnGroupbyColumnKey) return _class.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
   const summaryMethod = (summary_method || 'sum').toUpperCase();
   let newSqlRows = sqlRows;
   if (groupbyColumn.type === CellType.COLLABORATOR) {
-    newSqlRows = _SQLStatisticsUtils.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+    newSqlRows = _class.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
   let pivot_columns = [];
   let pivot_rows = [];
@@ -477,12 +487,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 = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
+    const groupbyColumnCellValueKey = _class.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
     const columnGroupbyColumnCellValue = row[sqlColumnGroupbyColumnKey];
-    const columnGroupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
+    const columnGroupbyColumnCellValueKey = _class.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
     const count = !row[sqlSummaryColumnKey] && row[sqlSummaryColumnKey] !== 0 ? null : row[sqlSummaryColumnKey];
     if (BaseUtils.isValidCellValue(columnGroupbyColumnCellValue, groupby_include_empty_cells)) {
-      _SQLStatisticsUtils.updateTwoDimensionColumns(pivot_columns, columnGroupbyColumnCellValueKey, {
+      _class.updateTwoDimensionColumns(pivot_columns, columnGroupbyColumnCellValueKey, {
         isIncludeEmpty: groupby_include_empty_cells,
         isCellValueAsAnArray: isRowGroupbyColumnDataAsAnArray
       });
@@ -491,14 +501,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);
-          _SQLStatisticsUtils.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, null, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
+          _class.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);
-            _SQLStatisticsUtils.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, n, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
+            _class.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, n, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
               summaryMethod,
               summaryColumn
             });
@@ -509,14 +519,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;
         });
-        _SQLStatisticsUtils.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, groupbyColumnCellValueKey, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
+        _class.updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, groupbyColumnCellValueKey, count, row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
           summaryMethod,
           summaryColumn
         });
       }
     }
   });
-  let pivot_table_total = _SQLStatisticsUtils.getAndUpdateTwoDimensionTotal(pivot_columns_total, pivot_columns, pivot_rows, {
+  let pivot_table_total = _class.getAndUpdateTwoDimensionTotal(pivot_columns_total, pivot_columns, pivot_rows, {
     summaryMethod,
     summaryColumn
   });
@@ -558,7 +568,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 = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+      const key = _class.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
       if (isGroupbyColumnDataAsAnArray) {
         if (!Array.isArray(key) || key.length === 0) {
           let itemIdx = result.findIndex(v => v.name === null);
@@ -672,7 +682,7 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMa
   let result = [];
   sqlRows.forEach(row => {
     const cellValue = row[sqlGroupbyColumnKey];
-    const label = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+    const label = _class.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
     const isEmpty = !label;
     const groupItems = [];
     summaryMethods.forEach((summaryMethod, index) => {
@@ -695,46 +705,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 = _SQLStatisticsUtils.getGroupLabelFromDB(name, selectedColumn, tables);
-    const value = item[valueKey];
+    const name = item[sqlGroupbyColumnKey];
+    const label = _class.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) {
@@ -769,13 +768,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],
@@ -795,7 +794,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,
@@ -857,7 +856,7 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = (chart, sqlRows, chartSQLMa
     sqlRows.forEach(row => {
       const cellValue = row[sqlGroupbyColumnKey];
       const summaryValue = row[sqlSummaryColumnKey];
-      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+      const key = _class.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
       let valueLeft = row[sqlLeftSummaryColumnKey] || 0;
       let valueRight = row[sqlRightSummaryColumnKey] || 0;
       if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
@@ -944,7 +943,7 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = (chart, sqlRows, chartSQLMa
     });
     sqlRows.forEach((item, index) => {
       const cellValue = item[sqlGroupbyColumnKey];
-      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+      const key = _class.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);
@@ -1017,15 +1016,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) {
-      _SQLStatisticsUtils.updateGroupingChartRow(results, name, null, row, count);
+      _class.updateGroupingChartRow(results, name, null, row, count);
       return;
     }
     groupName.forEach(v => {
-      _SQLStatisticsUtils.updateGroupingChartRow(results, name, v, row, count);
+      _class.updateGroupingChartRow(results, name, v, row, count);
     });
     return;
   }
-  _SQLStatisticsUtils.updateGroupingChartRow(results, name, groupName, row, count);
+  _class.updateGroupingChartRow(results, name, groupName, row, count);
 };
 SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
   const {
@@ -1045,21 +1044,21 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = (chart, sqlRo
   const isColumnGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[columnGroupbyColumn.type];
   sqlRows.forEach(row => {
     const groupbyColumnCellValue = row[sqlGroupbyColumnKey];
-    const groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
+    const groupbyColumnCellValueKey = _class.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
     if (BaseUtils.isValidCellValue(groupbyColumnCellValueKey, includeEmpty)) {
       const columnGroupbyColumnCellValue = row[sqlColumnGroupbyColumnKey];
-      const columnGroupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
+      const columnGroupbyColumnCellValueKey = _class.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
       const count = row[sqlSummaryColumnKey];
       if (isGroupbyColumnDataAsAnArray) {
         if (!Array.isArray(groupbyColumnCellValueKey) || groupbyColumnCellValueKey.length === 0) {
-          _SQLStatisticsUtils.updateGroupingChartRows(result, null, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
+          _class.updateGroupingChartRows(result, null, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
         } else {
           groupbyColumnCellValueKey.forEach(n => {
-            _SQLStatisticsUtils.updateGroupingChartRows(result, n, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
+            _class.updateGroupingChartRows(result, n, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
           });
         }
       } else {
-        _SQLStatisticsUtils.updateGroupingChartRows(result, groupbyColumnCellValueKey, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
+        _class.updateGroupingChartRows(result, groupbyColumnCellValueKey, row, count, isColumnGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey);
       }
     }
   });
@@ -1076,15 +1075,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 _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+    return _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
   const {
     groupbyColumn,
     columnGroupbyColumn
   } = columnMap;
   if (y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT) {
-    if (!columnGroupbyColumn) return _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
-    return _SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+    if (!columnGroupbyColumn) return _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+    return _class.groupingTwoDimensionChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
   const {
     sqlGroupbyColumnKey
@@ -1097,7 +1096,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 = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
+      const groupbyColumnCellValueKey = _class.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
       if (BaseUtils.isValidCellValue(groupbyColumnCellValueKey, includeEmpty)) {
         Object.keys(summaryColumns).forEach(sqlSummaryColumnName => {
           const {
@@ -1107,14 +1106,14 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
           const numberColumnCellValue = row[sqlSummaryColumnKey];
           if (isGroupbyColumnDataAsAnArray) {
             if (!Array.isArray(groupbyColumnCellValueKey) || groupbyColumnCellValueKey.length === 0) {
-              _SQLStatisticsUtils.updateGroupingChartRows(result, null, row, numberColumnCellValue, false, columnName);
+              _class.updateGroupingChartRows(result, null, row, numberColumnCellValue, false, columnName);
             } else {
               groupbyColumnCellValueKey.forEach(n => {
-                _SQLStatisticsUtils.updateGroupingChartRows(result, n, row, numberColumnCellValue, false, columnName);
+                _class.updateGroupingChartRows(result, n, row, numberColumnCellValue, false, columnName);
               });
             }
           } else {
-            _SQLStatisticsUtils.updateGroupingChartRows(result, groupbyColumnCellValueKey, row, numberColumnCellValue, false, columnName);
+            _class.updateGroupingChartRows(result, groupbyColumnCellValueKey, row, numberColumnCellValue, false, columnName);
           }
         });
       }
@@ -1124,31 +1123,24 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
     return result;
   }
   if (!columnGroupbyColumn) {
-    return _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+    return _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
   }
-  return _SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
+  return _class.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;
@@ -1175,13 +1167,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,
@@ -1209,12 +1197,12 @@ SQLStatisticsUtils.mirrorMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQ
   } = chartSQLMap;
   const isAdvanced = summary_type === CHART_SUMMARY_TYPE.ADVANCED;
   const newResult = [];
-  const groupData = _SQLStatisticsUtils.getGroupData(sqlRows, columnGroupbyColumn);
+  const groupData = _class.getGroupData(sqlRows, columnGroupbyColumn);
   if (groupData.length > 0) {
     const groupData0 = groupData[0] || {};
     const groupData1 = groupData[1] || {};
     sqlRows.forEach(item => {
-      const label = _SQLStatisticsUtils.getGroupLabelFromDB(item[column_key], groupbyColumn, tables);
+      const label = _class.getGroupLabelFromDB(item[column_key], groupbyColumn, tables);
       const groupValue = item[group_column_key];
       const equal2GroupData0 = groupData0.id === groupValue;
       const equal2GroupData1 = groupData1.id === groupValue;
@@ -1309,11 +1297,11 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
         } = chart.config;
         if (!column_groupby_column_key) {
           return {
-            result: _SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+            result: _class.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
           };
         }
         return {
-          result: _SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.twoDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.PIE:
@@ -1321,19 +1309,19 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
     case CHART_TYPE.TREE_MAP:
       {
         return {
-          result: _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.BASIC_NUMBER_CARD:
       {
         return {
-          result: _SQLStatisticsUtils.basicNumberCardSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.basicNumberCardSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.DASHBOARD:
       {
         return {
-          result: _SQLStatisticsUtils.dashboardSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.dashboardSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.BAR:
@@ -1342,13 +1330,13 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
     case CHART_TYPE.AREA:
       {
         return {
-          result: _SQLStatisticsUtils.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.basicChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.COMPLETENESS:
     case CHART_TYPE.COMPLETENESS_GROUP:
       {
-        const result = _SQLStatisticsUtils.completenessSQlResult(chart, sqlRows, chartSQLMap, tables);
+        const result = _class.completenessSQlResult(chart, sqlRows, chartSQLMap, tables);
         return {
           result
         };
@@ -1356,13 +1344,13 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
     case CHART_TYPE.COMBINATION:
       {
         return {
-          result: _SQLStatisticsUtils.combinationSQLResult2Javascript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.combinationSQLResult2Javascript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.COMPARE_BAR:
       {
         return {
-          result: _SQLStatisticsUtils.compareSQLResult2Javascript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.compareSQLResult2Javascript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.BAR_GROUP:
@@ -1373,51 +1361,51 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
     case CHART_TYPE.STACKED_HORIZONTAL_BAR:
       {
         return {
-          result: _SQLStatisticsUtils.groupingChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.groupingChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.SCATTER:
       {
         return {
-          result: _SQLStatisticsUtils.scatterSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.scatterSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.BAR_CUSTOM:
       {
         return {
-          result: _SQLStatisticsUtils.customChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables, params)
+          result: _class.customChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables, params)
         };
       }
     case CHART_TYPE.MAP:
     case CHART_TYPE.MAP_BUBBLE:
       {
         return {
-          result: _SQLStatisticsUtils.mapSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.mapSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.WORLD_MAP:
     case CHART_TYPE.WORLD_MAP_BUBBLE:
       {
         return {
-          result: _SQLStatisticsUtils.worldMapSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.worldMapSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.HEAT_MAP:
       {
         return {
-          result: _SQLStatisticsUtils.heatMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.heatMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.MIRROR:
       {
         return {
-          result: _SQLStatisticsUtils.mirrorMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.mirrorMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.TREND:
       {
         return {
-          result: _SQLStatisticsUtils.trendMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: _class.trendMapChartSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     default:
@@ -1426,7 +1414,7 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
       }
   }
 };
-SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, tables) => {
+SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables) => {
   const {
     config: {
       type
@@ -1436,7 +1424,7 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, table
   const {
     sqlColumns,
     sqlColumnGroupByColumnKey
-  } = sqlStatistics;
+  } = chartSQLMap;
   const {
     name_column,
     completed_column,
@@ -1447,19 +1435,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 = _class._get_completeness_name(row, name_column);
       if (!acc[nameValue]) {
         acc[nameValue] = row;
       } else {
@@ -1471,10 +1451,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 = _class._get_completeness_name(row, name_column);
       const groupby = row[sqlColumnGroupByColumnKey];
       const key = "".concat(nameValue, "_").concat(groupby);
       if (!acc[key]) {
@@ -1489,10 +1469,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 = _class._get_completeness_name(row, name_column);
     let targetValue;
     let completedValue;
     let groupby;
@@ -1501,8 +1481,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 = _class._get_completeness_name(row, completed_column);
+      targetValue = _class._get_completeness_name(row, target_column);
     }
     let completedRate;
     if (!targetValue && completedValue) {
@@ -1540,26 +1520,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];
@@ -1668,7 +1643,7 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, sqlRows) => {
     const result = [];
     sqlRows.forEach((item, index) => {
       if (item.length !== 0) {
-        const chartResult = _SQLStatisticsUtils.sqlResult2JavaScript(newChart, item, chartSQLMap, columnMap, tables, {
+        const chartResult = _class.sqlResult2JavaScript(newChart, item, chartSQLMap, columnMap, tables, {
           index
         });
         result.push(...chartResult.result);
@@ -1680,7 +1655,7 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, sqlRows) => {
     }
     callback && callback('', '', {
       result,
-      data_sources: _SQLStatisticsUtils.dataSources,
+      data_sources: _class.dataSources,
       groupbyColumn,
       columnGroupbyColumn,
       summaryColumn,
@@ -1694,7 +1669,7 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, sqlRows) => {
     callback && callback('', tipMessage, null);
     return;
   }
-  const chartResult = _SQLStatisticsUtils.sqlResult2JavaScript(newChart, sqlRows, chartSQLMap, columnMap, tables);
+  const chartResult = _class.sqlResult2JavaScript(newChart, sqlRows, chartSQLMap, columnMap, tables);
 
   // map is special
   if (BaseUtils.imEmptyChartResult(chartResult) && !chartType.includes('map')) {
@@ -1703,7 +1678,7 @@ SQLStatisticsUtils.calculateChart = (chart, value, callback, sqlRows) => {
   }
   callback && callback('', '', {
     ...chartResult,
-    data_sources: _SQLStatisticsUtils.dataSources,
+    data_sources: _class.dataSources,
     groupbyColumn,
     columnGroupbyColumn,
     summaryColumn,

package/dist/utils/index.js

@@ -11,44 +11,6 @@ export { getDateColumnFormat, isCheckboxColumn, getColumnByKey, getColumnByName,
 export { generatorKey } from './key-generator';
 export { translateCalendar } from './date-translate';
 export { isFunction } from './common-utils';
-function removeStrBeforeMedia(url) {
-  const mediaIndex = url.indexOf('/media/');
-  if (mediaIndex !== -1) {
-    return url.substring(mediaIndex);
-  }
-  return null;
-}
-
-// don't use it unless on map json query
-export const getMediaUrlForMap = () => {
-  let {
-    mediaUrl,
-    server
-  } = window.seaChartConfig;
-
-  // proxy to dev server to aviod CORS
-  if (process.env.NODE_ENV === 'development' && server.includes('dev.seatable.cn')) {
-    server = process.env.DEV_SERVER_URL;
-  }
-  if (mediaUrl.startsWith('http')) {
-    mediaUrl = removeStrBeforeMedia(mediaUrl);
-    if (!mediaUrl) {
-      throw new Error('on getMediaUrl: mediaUrl is not valid');
-    }
-  }
-  return "".concat(server).concat(mediaUrl);
-};
-export const getMediaUrl = () => {
-  const {
-    media,
-    server
-  } = window.seaChartConfig;
-  if (media.startsWith('http')) {
-    return media;
-  } else {
-    return server + media;
-  }
-};
 export const getGeoGranularityByLevel = mapLevel => {
   switch (mapLevel) {
     case MAP_LEVEL.PROVINCE:

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

@@ -107,7 +107,9 @@ class ChartDataSQL {
         return '';
       }
       this._update_filter_sql(true, groupby_column);
-      const column_name = this._chart_column_name_to_sql(groupby_column, {});
+      const column_name = this._chart_column_name_to_sql(groupby_column, {
+        date_granularity: 'day'
+      });
       let summary_column_name = this._summary_column_2_sql('COUNT', groupby_column);
       if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
         const summary_column = this._get_column_by_key(summary_column_key);
@@ -117,7 +119,7 @@ class ChartDataSQL {
         }
         summary_column_name = this._summary_column_2_sql(summary_method.toUpperCase(), summary_column);
       }
-      return "SELECT ".concat(column_name, ", ").concat(summary_column_name, " FROM `").concat(this.table_name, "` ").concat(this.filter_sql, " GROUP BY ").concat(column_name, " LIMIT 0, 5000");
+      return "SELECT ".concat(column_name, ", ").concat(summary_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(column_name, " LIMIT 0, 5000");
     };
     this._mirror_map_statistic_2_sql = () => {
       const {
@@ -309,9 +311,10 @@ class ChartDataSQL {
     this._compare_chart_statistic_2_sql = () => {
       const {
         x_axis_column_key,
+        x_axis_date_granularity,
+        x_axis_geolocation_granularity,
         y_axis_summary_type,
         y_axis_column_key,
-        x_axis_geolocation_granularity,
         y_axis_summary_method,
         x_axis_include_empty_cells
       } = this.chart;
@@ -322,7 +325,7 @@ class ChartDataSQL {
       }
       this._update_filter_sql(x_axis_include_empty_cells, groupby_column);
       const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
-        'date_granularity': 'day',
+        'date_granularity': x_axis_date_granularity,
         'geolocation_granularity': x_axis_geolocation_granularity
       });
       let summary_column_name = this._summary_column_2_sql('COUNT', groupby_column);

package/dist/utils/sql/column-2-sql-column.js

@@ -319,7 +319,9 @@ const heatMapChartStatisticColumn2sqlColumn = (chart, table) => {
   if (!groupbyColumn) return {};
   const {
     key: sqlGroupbyColumnKey
-  } = column2SqlColumn(groupbyColumn);
+  } = column2SqlColumn(groupbyColumn, {
+    'dateGranularity': 'day'
+  });
   const summaryMethod = summary_method && summary_method.toUpperCase();
   let sqlSummaryColumnKey;
   if (summary_type === CHART_SUMMARY_TYPE.COUNT) {
@@ -766,6 +768,7 @@ const chartColumn2SqlColumn = (chartElement, table) => {
     case CHART_TYPE.LINE:
     case CHART_TYPE.HORIZONTAL_BAR:
     case CHART_TYPE.AREA:
+    case CHART_TYPE.COMPARE_BAR:
       {
         return basicChartStatisticColumn2sqlColumn(chart, table);
       }

package/dist/view/wrapper/map.js

@@ -3,11 +3,11 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { getTableById, getTableColumnByKey, getNumberDisplayString } from 'dtable-utils';
 import { DataSet } from '@antv/data-set';
 import Loading from "dtable-ui-component/lib/Loading";
-import { getMediaUrlForMap } from '../../utils';
 import { CHART_SUMMARY_TYPE, DEFAULT_NUMBER_FORMAT_OBJECT, MAP_LEVEL } from '../../constants';
 import { Chart } from '../../utils/custom-g2';
 import fetchMapJson from '../../services/map-json';
 import { COLOR_OPTIONS } from '../../constants/color-rules';
+import context from '../../context';
 const CHART_STYLE_CONFIG = {
   'g2-tooltip': {
     borderRadius: '2px',
@@ -87,9 +87,7 @@ const formatStatisticData = (statisticData, mapData, type) => {
 export default function Map(props) {
   const {
     result: statisticData,
-    chart,
-    tables,
-    theme
+    chart
   } = props;
 
   // mapLocation is initially set to null, in this case mapLevel is country, so doesn't here
@@ -256,7 +254,7 @@ export default function Map(props) {
   // used to fetch mapJson data
   useEffect(() => {
     (async () => {
-      const mediaUrl = getMediaUrlForMap();
+      const mediaUrl = context.getSetting('mediaUrl');
       const mapJson = await fetchMapJson(mapLevel, mapLocation, mediaUrl);
       setMapData(mapJson);
       setIsLoading(false);

package/dist/view/wrapper/world-map.js

@@ -5,9 +5,10 @@ import PropTypes from 'prop-types';
 import { debounce } from 'lodash-es';
 import intl from '../../intl';
 import fetchMapJson from '../../services/map-json';
-import { BaseUtils, getMediaUrlForMap } from '../../utils';
+import { BaseUtils } from '../../utils';
 import { COLOR_OPTIONS } from '../../constants/color-rules';
 import { CHART_SUMMARY_TYPE, MAP_LEVEL, CHART_TYPE, TITLE_AMOUNT, DEFAULT_NUMBER_FORMAT_OBJECT } from '../../constants';
+import context from '../../context';
 import ChartComponent from './chart-component';
 const WIDTH = 798;
 const HEIGHT = 394;
@@ -20,7 +21,7 @@ class WorldMap extends ChartComponent {
       this.drawChart();
     };
     this.queryMapJson = async () => {
-      const mediaUrl = getMediaUrlForMap();
+      const mediaUrl = context.getSetting('mediaUrl');
       const mapJson = await fetchMapJson(MAP_LEVEL.WORLD, '', mediaUrl);
       this.geoData = mapJson;
       this.geoData.features.forEach(item => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.31beta",
+  "version": "0.0.32",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",