sea-chart 0.0.31 → 0.0.32

package/dist/context.js

@@ -1,7 +1,7 @@
 import { getTableById } from 'dtable-utils';
 import CollaboratorManager from './utils/collaborator-manager';
 import { ChartDataSQL } from './utils';
-import { CHART_TYPE_IMAGE } from './constants';
+import { CHART_TYPE, CHART_TYPE_IMAGE } from './constants';
 class Context {
   constructor() {
     this.queryChartResult = async _ref => {
@@ -32,28 +32,55 @@ class Context {
         onFail && onFail(error);
         return;
       }
-
-      // Custom bar
-      if (Array.isArray(sql) && sql.length !== 0) {
-        for (let i = 0; i < sql.length; i++) {
-          await this.api.sqlQuery(sql[i].sqlString).then(res => {
-            sql[i].res = res;
-          }).catch(error => {
-            onFail && onFail(error);
+      const type = chart.config.type;
+      if (type === CHART_TYPE.BAR_CUSTOM) {
+        let allPromises = [];
+        Array.isArray(sql) && sql.forEach(item => {
+          if (item) {
+            const res = this.api.sqlQuery(item);
+            allPromises.push(res);
+          } else {
+            allPromises.push(new Promise((resolve, reject) => {
+              return resolve({
+                data: {
+                  success: true,
+                  results: []
+                }
+              });
+            }));
+          }
+        });
+        let newRes = {
+          data: {
+            success: true,
+            results: []
+          }
+        };
+        return Promise.all(allPromises).then(allRes => {
+          if (!allRes.every(item => item.data.success)) {
+            onFail && onFail('Network_error');
+            return;
+          }
+          allRes.forEach(res => {
+            const {
+              results
+            } = res.data;
+            newRes.data.results.push(results);
           });
-        }
-        onSuccess && onSuccess(sql);
-        return;
+          onSuccess && onSuccess(newRes);
+        }).catch(error => {
+          onFail && onFail(error);
+        });
       }
       return this.api.sqlQuery(sql).then(res => {
         onSuccess && onSuccess(res);
       }).catch(error => {
         var _error$response, _error$response$data;
         // if geolocation format is wrong, still display the chart
-        if (chart.config.type.includes('map') && (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.error_message.includes('invalid geolocation format'))) {
+        if (type.includes('map') && (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.error_message.includes('invalid geolocation format'))) {
           var _error$response2, _error$response2$data;
           console.error(error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.message);
-          onSuccess({
+          onSuccess && onSuccess({
             data: {
               results: [],
               success: true

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

@@ -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);

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

@@ -12,16 +12,8 @@ ChartUtils.calculateChart = (chart, value, callback) => {
     chart,
     tables: value.tables,
     onSuccess: function (res) {
+      var _res$data;
       let dataSources = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SQLStatisticsUtils.dataSources;
-      // Custom Bar
-      if (Array.isArray(res)) {
-        if (dataSources === OriginalDataUtils.dataSources) {
-          OriginalDataUtils.calculateChart(chart, value, callback);
-          return;
-        }
-        SQLStatisticsUtils.calculateChart(chart, value, callback, res);
-        return;
-      }
       const {
         success,
         error_message
@@ -34,7 +26,7 @@ ChartUtils.calculateChart = (chart, value, callback) => {
         OriginalDataUtils.calculateChart(chart, value, callback);
         return;
       }
-      SQLStatisticsUtils.calculateChart(chart, value, callback, res);
+      SQLStatisticsUtils.calculateChart(chart, value, callback, (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.results) || []);
     },
     onFail: err => {
       let errorMessage = String(err) || 'Network_error';

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

@@ -1,16 +1,26 @@
 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 } 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 {
+  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) => {
@@ -630,23 +640,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, {
@@ -659,21 +685,19 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMa
     const label = _class.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 +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 = _class.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) {
@@ -755,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],
@@ -781,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,
@@ -1115,26 +1128,19 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
   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;
@@ -1161,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,
@@ -1412,7 +1414,7 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
       }
   }
 };
-SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, tables) => {
+SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables) => {
   const {
     config: {
       type
@@ -1422,7 +1424,7 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, sqlStatistics, table
   const {
     sqlColumns,
     sqlColumnGroupByColumnKey
-  } = sqlStatistics;
+  } = chartSQLMap;
   const {
     name_column,
     completed_column,
@@ -1433,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 {
@@ -1457,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]) {
@@ -1475,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;
@@ -1487,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) {
@@ -1526,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];
@@ -1607,7 +1596,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 +1639,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 = _class.sqlResult2JavaScript(newChart, item, chartSQLMap, columnMap, tables, {
+          index
+        });
+        result.push(...chartResult.result);
+      }
     });
     if (result.length === 0) {
       callback && callback('', tipMessage, null);
@@ -1673,15 +1663,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);
+
   // map is special
   if (BaseUtils.imEmptyChartResult(chartResult) && !chartType.includes('map')) {
     callback && callback('', tipMessage, null);

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/map.js

@@ -1,4 +1,4 @@
-import { GEOLOCATION_GRANULARITY, CHART_TYPE, MAP_LEVEL, MUNICIPALITIES, regions } from '../constants';
+import { GEOLOCATION_GRANULARITY, MAP_LEVEL, MUNICIPALITIES, regions } from '../constants';
 const COUNTY_SCALE_WIDTH = 5.95;
 const COUNTY_SCALE_HEIGHT = 4.37;
 export const getGeoGranularityByLevel = mapLevel => {