sea-chart 2.0.42 → 2.0.44

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

@@ -2,8 +2,8 @@ var _BaseUtils;
 import shallowEqual from 'shallowequal';
 import dayjs from 'dayjs';
 import slugid from 'slugid';
-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, isArchiveView, getViewById, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP } from 'dtable-utils';
-import { PIE_CHART_COLORS, CHART_SUMMARY_TYPE, CHART_SUPPORT_SORT_COLUMNS, CHART_TYPE, CHART_STYLE_SETTING_KEYS, DEFAULT_LABEL_FONT_SIZE, DEFAULT_NUMBER_FORMAT_OBJECT, X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES, STYLE_COLORS, CHART_DATA_SORT_TYPE, CHART_Y_GROUP_TYPE, HORIZONTAL_BAR_CHART_TYPES, COMPLTETELESS_CHART_TYPES, CHART_STYLE_CONFIG_SETTING_KEYS, MAP_CHART_TYPES } from '../../constants';
+import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, getDateDisplayString, getNumberDisplayString, getOption, getMultipleOptionName, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, isEmpty, isNumericColumn, isDateColumn, sortText, sortNumber, sortDate, sortSingleSelect, sortFormula, getColumnOptions, DateUtils, getGeolocationDisplayString, getFormulaDisplayString, isArchiveView, getViewById, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP } from 'dtable-utils';
+import { PIE_CHART_COLORS, CHART_SUMMARY_TYPE, CHART_SUPPORT_SORT_COLUMNS, CHART_TYPE, CHART_STYLE_SETTING_KEYS, DEFAULT_LABEL_FONT_SIZE, DEFAULT_NUMBER_FORMAT_OBJECT, X_AXIS_IS_GROUPBY_COLUMN_KEY_CHART_TYPES, STYLE_COLORS, CHART_DATA_SORT_TYPE, CHART_Y_GROUP_TYPE, HORIZONTAL_BAR_CHART_TYPES, COMPLTETELESS_CHART_TYPES, CHART_STYLE_CONFIG_SETTING_KEYS, MAP_CHART_TYPES, DEFAULT_ITEM_COLOR } from '../../constants';
 import { getClientFormulaDisplayString } from '../cell-format-utils';
 import { getKnownCollaboratorByEmail, generateDefaultUser } from '../collaborator-utils';
 import { getDateColumnFormat, getColumnByKey } from '../column-utils';
@@ -625,7 +625,7 @@ BaseUtils.getPieColor = (column, index, data, currentTheme, useColumnColor) => {
       const selectedItem = columnData.options.find(item => {
         return item.name === data.name.trim();
       }) || {};
-      return selectedItem.color || '#dbdbdb';
+      return selectedItem.color || DEFAULT_ITEM_COLOR;
     }
   } else {
     const pieChartColorsLength = colors.length - 1;
@@ -678,11 +678,11 @@ BaseUtils.formatPieChartData = (data, chart, tables, currentTheme, useColumnColo
     filteredData.push({
       name: '_Others',
       value: filteredSum,
-      color: '#dbdbdb',
+      color: DEFAULT_ITEM_COLOR,
       percent: String(Number.parseFloat(filteredSum / sum * 100).toFixed(1)) + '%',
       rows
     });
-    colorMap['_Others'] = '#dbdbdb';
+    colorMap['_Others'] = DEFAULT_ITEM_COLOR;
   }
   return {
     data: filteredData,
@@ -700,7 +700,12 @@ BaseUtils.updateTableViewListItemNameAndColor = async (result, column, nameKey,
       data: columnData
     } = column;
     let name = result[nameKey];
-    if (columnType === CellType.SINGLE_SELECT || columnType === CellType.MULTIPLE_SELECT) {
+    if (isEmpty(name)) {
+      result[colorKey] = result[colorKey] || DEFAULT_ITEM_COLOR;
+      resolve(resultPromise);
+      return;
+    }
+    if (columnType === CellType.SINGLE_SELECT) {
       const options = getColumnOptions(column);
       let selectedOption = getOption(options, name);
       let {
@@ -713,7 +718,19 @@ BaseUtils.updateTableViewListItemNameAndColor = async (result, column, nameKey,
         result[colorKey] = optionColor;
         isNameField && (result.original_name = id);
       } else {
-        result[colorKey] = '#dbdbdb';
+        result[colorKey] = DEFAULT_ITEM_COLOR;
+      }
+    } else if (columnType === CellType.MULTIPLE_SELECT) {
+      const options = getColumnOptions(column);
+      const optionIds = Array.isArray(name) ? name : [name];
+      const optionNames = getMultipleOptionName(options, optionIds);
+      if (optionNames) {
+        result[nameKey] = optionNames;
+        const firstOption = options.find(o => optionIds.includes(o.id));
+        result[colorKey] = (firstOption === null || firstOption === void 0 ? void 0 : firstOption.color) || DEFAULT_ITEM_COLOR;
+        isNameField && (result.original_name = optionIds);
+      } else {
+        result[colorKey] = DEFAULT_ITEM_COLOR;
       }
     } else if (columnType === CellType.COLLABORATOR) {
       const users = context.getCollaboratorsFromCache();
@@ -954,8 +971,8 @@ BaseUtils.sortChartData = (charts, sort_key) => {
     const {
       value: next
     } = nextResult;
-    if (!current && current !== 0) return -1;
-    if (!next && next !== 0) return 1;
+    if (isEmpty(current)) return -1;
+    if (isEmpty(next)) return 1;
     if (sort_key === 'ascending') {
       return current > next ? 1 : -1;
     }
@@ -1035,14 +1052,25 @@ BaseUtils.convertResultName = (result, column, name, nameKey, colorKey) => {
     type: columnType,
     data: columnData
   } = column;
-  if (columnType === CellType.SINGLE_SELECT || columnType === CellType.MULTIPLE_SELECT) {
+  if (columnType === CellType.SINGLE_SELECT) {
     const options = getColumnOptions(column);
     const selectedOption = getOption(options, name);
     if (selectedOption) {
       result[nameKey] = selectedOption.name;
       result[colorKey] = selectedOption.color;
     } else {
-      result[colorKey] = '#dbdbdb';
+      result[colorKey] = DEFAULT_ITEM_COLOR;
+    }
+  } else if (columnType === CellType.MULTIPLE_SELECT) {
+    const options = getColumnOptions(column);
+    const optionIds = Array.isArray(name) ? name : [name];
+    const optionNames = getMultipleOptionName(options, optionIds);
+    if (optionNames) {
+      result[nameKey] = optionNames;
+      const firstOption = options.find(o => optionIds.includes(o.id));
+      result[colorKey] = (firstOption === null || firstOption === void 0 ? void 0 : firstOption.color) || DEFAULT_ITEM_COLOR;
+    } else {
+      result[colorKey] = DEFAULT_ITEM_COLOR;
     }
   } else if (columnType === CellType.COLLABORATOR) {
     let collaborator = getKnownCollaboratorByEmail(name);
@@ -1183,7 +1211,11 @@ BaseUtils.convertConfig = config => {
       vertical_axis_label_position,
       show_horizontal_axis_label,
       horizontal_axis_label_position,
-      horizontal_axis_label_color
+      horizontal_axis_label_color,
+      vertical_axis_label_font_size,
+      vertical_axis_label_font_color,
+      horizontal_axis_label_font_size,
+      horizontal_axis_label_font_color
     } = config;
     const newConfig = {
       x_axis_column_key: vertical_axis_column_key,
@@ -1195,8 +1227,12 @@ BaseUtils.convertConfig = config => {
       y_axis_summary_column_key: horizontal_axis_column_key,
       x_axis_show_label: show_vertical_axis_label,
       x_axis_label_position: vertical_axis_label_position,
+      x_axis_label_font_size: vertical_axis_label_font_size,
+      x_axis_label_font_color: vertical_axis_label_font_color,
       y_axis_show_label: show_horizontal_axis_label,
       y_axis_label_position: horizontal_axis_label_position,
+      y_axis_label_font_size: horizontal_axis_label_font_size,
+      y_axis_label_font_color: horizontal_axis_label_font_color,
       y_axis_label_color: horizontal_axis_label_color,
       y_axis_auto_range: config.horizontal_axis_auto_range,
       y_axis_max: config.horizontal_axis_max,
@@ -1432,7 +1468,7 @@ BaseUtils.getTotal = function (summary_column_key, summary_column_type, summary_
                 currentValue = current[summary_column_key];
                 nextValue = next[summary_column_key];
               }
-              if (!nextValue && nextValue !== 0) {
+              if (isEmpty(nextValue)) {
                 return current;
               }
               let isNextGreater = currentValue < nextValue;

package/dist/utils/chart-utils/original-data-utils/basic-chart-calculator.js

@@ -1,5 +1,5 @@
 import dayjs from 'dayjs';
-import { CellType, DATE_COLUMN_OPTIONS, FORMULA_COLUMN_TYPES_MAP, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import { CellType, DATE_COLUMN_OPTIONS, FORMULA_COLUMN_TYPES_MAP, getTableById, getViewById, getTableColumnByKey, isEmpty } from 'dtable-utils';
 import { CHART_STYLE_COLORS, CHART_SUMMARY_TYPE, CHART_TYPE, Y_AXIS_TYPE_PREFIX } from '../../../constants';
 import { getColorFromSingleSelectColumn, isDateFormulaColumn } from '../../column-utils';
 import { isArrayCellValue } from '../../cell-value-utils';
@@ -103,7 +103,7 @@ async function calculateBasicChart(chart, value, _ref) {
         ...item,
         year
       });
-      if (years.indexOf(year) < 0) {
+      if (!isNaN(year) && years.indexOf(year) < 0) {
         years.push(year);
       }
     });
@@ -112,6 +112,7 @@ async function calculateBasicChart(chart, value, _ref) {
       if (current.year < next.year) return 1;
       return 0;
     });
+    years.sort((current, next) => next - current);
     return {
       data,
       years
@@ -244,7 +245,7 @@ function groupChartRows(results, name, row, isColumnGroupbyColumnDataAsAnArray,
       });
     }
   } else {
-    if (!groupName && groupName !== 0 && !include_empty) {
+    if (isEmpty(groupName) && !include_empty) {
       return;
     }
     updateGroupingChartRows(results, name, groupName, row, yAxisType);

package/dist/utils/chart-utils/original-data-utils/mirror-calculator.js

@@ -1,4 +1,4 @@
-import { isNumber, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import { isNumber, getTableById, getViewById, getTableColumnByKey, isEmpty } from 'dtable-utils';
 import { getClientCellValueDisplayString } from '../../cell-format-utils';
 import BaseUtils from '../base-utils';
 import { getCellValue } from '../../row-utils';
@@ -88,7 +88,7 @@ async function calculator(chart, dtableValue, _ref) {
           data: columnItem.data,
           formulaRows
         });
-        if (!value && value !== 0 || value.length === 0) value = null;
+        if (isEmpty(value) || value.length === 0) value = null;
         const groupValue = row[groupColumn.key];
         if (groupItems.includes(groupValue)) {
           const count = result[groupItem][value];
@@ -114,7 +114,7 @@ async function calculator(chart, dtableValue, _ref) {
           data: columnItem.data,
           formulaRows
         });
-        if (!value && value !== 0 || value.length === 0) value = null;
+        if (isEmpty(value) || value.length === 0) value = null;
         const groupValue = row[groupColumn.key];
         if (groupItems.includes(groupValue)) {
           const list = result[groupItem][value];

package/dist/utils/chart-utils/original-data-utils/pivot-table-calculator.js

@@ -1,4 +1,4 @@
-import { FORMULA_COLUMN_TYPES_MAP, isNumber, isDateColumn, isNumericColumn, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
+import { FORMULA_COLUMN_TYPES_MAP, isNumber, isDateColumn, isNumericColumn, getTableById, getViewById, getTableColumnByKey, isEmpty } from 'dtable-utils';
 import { isObject } from 'lodash';
 import { CHART_SUMMARY_TYPE, TABLE_DIMENSIONS } from '../../../constants';
 import { isArrayCellValue } from '../../cell-value-utils';
@@ -752,7 +752,7 @@ function getTotal(summary_column, summary_type, summary_method) {
                   currentValue = current[summary_column_key];
                   nextValue = next[summary_column_key];
                 }
-                if (!nextValue && nextValue !== 0) {
+                if (isEmpty(nextValue)) {
                   return current;
                 }
                 let isNextGreater = currentValue < nextValue;

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

@@ -1,6 +1,6 @@
 var _SQLStatisticsUtils;
 import dayjs from 'dayjs';
-import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber } from 'dtable-utils';
+import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getGeolocationByGranularity, getGeolocationDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, GROUP_GEOLOCATION_GRANULARITY, isNumber, isEmpty } from 'dtable-utils';
 import { isObject } from 'lodash';
 import { cloneDeep } from 'lodash-es';
 import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, TABLE_DIMENSIONS, Y_AXIS_TYPE_PREFIX, STYLE_COLORS, TREND_TYPES, CHART_STYLE_COLORS, MAP_CHART_TYPES } from '../../constants';
@@ -9,6 +9,7 @@ import { getClientLinkDisplayString } from '../cell-format-utils';
 import { column2SqlColumn } from '../sql/column-2-sql-column';
 import { formatNumericValue, getFormattedValue, getSummaryResult } from '../column-utils';
 import { getCompareDate } from '../trend-utils';
+import { fixGeoGranularity } from '../map';
 import intl from '../../intl';
 import { convertQuarterToDate } from '../date-translate';
 import BaseUtils, { findIfColumnDataIsArray } from './base-utils';
@@ -60,7 +61,8 @@ SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivo
       }
     case CellType.GEOLOCATION:
       {
-        return cellValue || null;
+        if (typeof cellValue === 'string') return cellValue || null;
+        return getGeolocationDisplayString(cellValue, data) || null;
       }
     case CellType.FORMULA:
       {
@@ -80,7 +82,7 @@ SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivo
           return cellValue;
         }
         const validValue = getFormulaDisplayString(cellValue, data) || [];
-        if (!validValue && validValue !== 0) {
+        if (isEmpty(validValue)) {
           return null;
         }
         return validValue;
@@ -641,7 +643,6 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = async (chart, sqlRows, chart
     type,
     sort_type,
     y_axis_summary_type,
-    y_axis_summary_column_key,
     y_axis_summary_method,
     x_axis_include_empty_cells,
     groupby_include_empty_cells
@@ -661,7 +662,7 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = async (chart, sqlRows, chart
     const summaryValue = row[sqlSummaryColumnKey];
     let formatted_value = cellValue;
     if (y_axis_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
-      formatted_value = getFormattedValue(cellValue, y_axis_summary_column_key, y_axis_summary_method);
+      formatted_value = getFormattedValue(summaryValue, summaryColumn, y_axis_summary_method);
     }
     if (BaseUtils.isValidCellValue(cellValue, x_axis_include_empty_cells || groupby_include_empty_cells)) {
       const key = await _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, chart.config);
@@ -783,10 +784,10 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = async (chart, sqlRows, char
   for (const row of sqlRows) {
     const cellValue = row[sqlGroupbyColumnKey];
     const label = await _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, chart.config);
-    const isEmpty = !label;
+    const isEmptyLabel = !label;
     const groupItems = [];
     summaryMethods.forEach((summaryMethod, index) => {
-      if (!(x_axis_include_empty_cells || x_axis_include_empty) && isEmpty) return;
+      if (!(x_axis_include_empty_cells || x_axis_include_empty) && isEmptyLabel) return;
       let value = row[summaryMethod] || 0;
       let formatted_value = value;
       value = formatNumericValue(value, numericColumns[index]);
@@ -1328,6 +1329,8 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = async (chart,
   // fill empty group name with value 0
   const allGroupNames = new Set();
   const nameGroupMap = new Map();
+  const nameRawValueMap = new Map();
+  const groupNameRawValueMap = new Map();
   result.forEach(item => {
     const {
       name,
@@ -1338,8 +1341,18 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = async (chart,
       nameGroupMap.set(name, new Set());
     }
     nameGroupMap.get(name).add(groupName);
+    if (!nameRawValueMap.has(name)) {
+      var _item$rows$;
+      const rawName = (_item$rows$ = item.rows[0]) === null || _item$rows$ === void 0 ? void 0 : _item$rows$[sqlGroupbyColumnKey];
+      nameRawValueMap.set(name, isGroupbyColumnDataAsAnArray ? name : rawName !== null && rawName !== void 0 ? rawName : name);
+    }
+    if (groupName && !groupNameRawValueMap.has(groupName)) {
+      var _item$rows$2;
+      const rawGroupName = (_item$rows$2 = item.rows[0]) === null || _item$rows$2 === void 0 ? void 0 : _item$rows$2[sqlColumnGroupbyColumnKey];
+      groupNameRawValueMap.set(groupName, isColumnGroupbyColumnDataAsAnArray ? groupName : rawGroupName !== null && rawGroupName !== void 0 ? rawGroupName : groupName);
+    }
   });
-  const isEmptyGroupName = groupName => groupName === undefined || groupName === null || groupName === '';
+  const isEmptyGroupName = groupName => isEmpty(groupName);
   const groupNameList = Array.from(allGroupNames).sort((a, b) => {
     const aEmpty = isEmptyGroupName(a);
     const bEmpty = isEmptyGroupName(b);
@@ -1350,9 +1363,14 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = async (chart,
   nameGroupMap.forEach((groupSet, name) => {
     groupNameList.forEach(groupName => {
       if (!groupSet.has(groupName)) {
+        var _nameRawValueMap$get, _groupNameRawValueMap;
+        const rawName = (_nameRawValueMap$get = nameRawValueMap.get(name)) !== null && _nameRawValueMap$get !== void 0 ? _nameRawValueMap$get : name;
+        const rawGroupName = (_groupNameRawValueMap = groupNameRawValueMap.get(groupName)) !== null && _groupNameRawValueMap !== void 0 ? _groupNameRawValueMap : groupName;
         result.push({
           name,
           rows: [],
+          original_name: rawName,
+          original_group_name: rawGroupName,
           group_name: groupName,
           value: 0
         });
@@ -1504,7 +1522,7 @@ SQLStatisticsUtils.heatMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQLM
       ...item,
       year
     });
-    if (years.indexOf(year) < 0) {
+    if (!isNaN(year) && years.indexOf(year) < 0) {
       years.push(year);
     }
   });
@@ -1513,6 +1531,7 @@ SQLStatisticsUtils.heatMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQLM
     if (current.year < next.year) return 1;
     return 0;
   });
+  years.sort((current, next) => next - current);
   return {
     data,
     years
@@ -1870,12 +1889,11 @@ SQLStatisticsUtils.completenessSQlResult = async (chart, sqlRows, chartSQLMap, t
       return 1;
     }
   });
-
-  // deduplicate by (name, group_name)
+  const isGroup = chart.config.type === CHART_TYPE.COMPLETENESS_GROUP;
   const deduplicatedRes = [];
   const keyMap = {};
   res.forEach(item => {
-    const key = `${item.name}_${item.group_name}`;
+    const key = isGroup ? `${item.name}_${item.groupby}_${item.group_name}` : `${item.name}_${item.group_name}`;
     if (!keyMap[key]) {
       keyMap[key] = item;
       deduplicatedRes.push(item);
@@ -1933,6 +1951,21 @@ SQLStatisticsUtils.scatterSQLResult2JavaScript = async (chart, sqlRows, chartSQL
   BaseUtils.sortCharts(res, groupbyColumn, 'name');
   return res;
 };
+SQLStatisticsUtils.formatMapGeolocationName = (cellValue, mapLevel, mapLocation) => {
+  if (isEmpty(cellValue)) return '';
+  if (typeof cellValue === 'object' && !Array.isArray(cellValue)) {
+    const granularity = fixGeoGranularity(mapLevel, mapLocation);
+    return getGeolocationByGranularity(cellValue, granularity) || '';
+  }
+  return cellValue;
+};
+SQLStatisticsUtils.formatWorldMapGeolocationName = cellValue => {
+  if (isEmpty(cellValue)) return '';
+  if (typeof cellValue === 'object' && !Array.isArray(cellValue)) {
+    return getGeolocationByGranularity(cellValue, GROUP_GEOLOCATION_GRANULARITY.COUNTRY) || '';
+  }
+  return cellValue;
+};
 SQLStatisticsUtils.mapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
   const {
     sqlGeoColumnKey,
@@ -1941,6 +1974,10 @@ SQLStatisticsUtils.mapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, colum
   const {
     groupbyColumn
   } = columnMap;
+  const {
+    map_level,
+    map_location
+  } = (chart === null || chart === void 0 ? void 0 : chart.config) || {};
   if (groupbyColumn.type === 'link-formula') {
     const {
       data,
@@ -1955,9 +1992,10 @@ SQLStatisticsUtils.mapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, colum
       return [];
     }
     const nameValueMap = sqlRows.reduce((acc, row) => {
-      const geoList = row[key];
+      const geoList = row[key] || [];
       const value = row[sqlSummaryColumnKey];
       geoList.forEach(geo => {
+        if (!geo) return;
         const name = geo[geo_format];
         if (!acc[name]) {
           acc[name] = value;
@@ -1976,8 +2014,9 @@ SQLStatisticsUtils.mapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, colum
     }, []);
   } else {
     return sqlRows.reduce((acc, row) => {
-      const name = row[sqlGeoColumnKey];
+      const rawName = row[sqlGeoColumnKey];
       const value = row[sqlSummaryColumnKey];
+      const name = _SQLStatisticsUtils.formatMapGeolocationName(rawName, map_level, map_location);
       acc.push({
         name,
         value
@@ -2012,9 +2051,10 @@ SQLStatisticsUtils.worldMapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap,
       return [];
     }
     const nameValueMap = sqlRows.reduce((acc, row) => {
-      const geoList = row[key];
+      const geoList = row[key] || [];
       const value = row[sqlSummaryColumnKey];
       geoList.forEach(geo => {
+        if (!geo) return;
         const name = geo[geo_format];
         if (!acc[name]) {
           acc[name] = value;
@@ -2048,8 +2088,8 @@ SQLStatisticsUtils.worldMapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap,
         value = formatNumericValue(value, summaryColumn);
         formatted_value = getFormattedValue(value, summaryColumn, summary_method);
       }
-      if (currentValue) {
-        const name = typeof currentValue === 'string' ? currentValue : currentValue.country_region;
+      const name = _SQLStatisticsUtils.formatWorldMapGeolocationName(currentValue);
+      if (name) {
         result.push({
           name,
           value,
@@ -2139,7 +2179,13 @@ SQLStatisticsUtils.calculateChart = async (chart, value, callback, sqlRows) => {
     callback && callback('', tipMessage, null);
     return;
   }
-  const chartResult = await _SQLStatisticsUtils.sqlResult2JavaScript(newChart, sqlRows, chartSQLMap, columnMap, tables);
+  let chartResult = null;
+  try {
+    chartResult = await _SQLStatisticsUtils.sqlResult2JavaScript(newChart, sqlRows, chartSQLMap, columnMap, tables);
+  } catch (error) {
+    const errorMessage = (error === null || error === void 0 ? void 0 : error.message) || error;
+    return callback && callback(errorMessage, '', null);
+  }
 
   // map is special
   if (BaseUtils.imEmptyChartResult(chartResult) && !chartType.includes('map')) {

package/dist/utils/row-record-utils.js

@@ -1,7 +1,7 @@
 import _ButtonFormatter from "dtable-ui-component/lib/ButtonFormatter";
 import _RateFormatter from "dtable-ui-component/lib/RateFormatter";
 import React from 'react';
-import { CellType, FORMULA_RESULT_TYPE, COLLABORATOR_COLUMN_TYPES, getNumberDisplayString, getDateDisplayString, getCellValueStringResult, isNumber, isValidLink, getColumnOptions } from 'dtable-utils';
+import { CellType, FORMULA_RESULT_TYPE, COLLABORATOR_COLUMN_TYPES, getNumberDisplayString, getDateDisplayString, getCellValueStringResult, isNumber, isValidLink, getColumnOptions, getGeolocationDisplayString } from 'dtable-utils';
 import dayjs from 'dayjs';
 import { isEqual } from 'lodash-es';
 import cellFormatterFactory from '../components/cell-factory/cell-formatter-factory';
@@ -550,7 +550,11 @@ const getFilterByColumnTypeForPivot = (columnKey, columns, value, rows) => {
       value = value[0].display_value;
     }
   }
-  if (column && [CellType.GEOLOCATION, CellType.DATE, CellType.MTIME, CellType.CTIME].includes(type)) {
+  if (type === CellType.GEOLOCATION) {
+    filter['value'] = getGeolocationDisplayString(Array.isArray(value) ? value[0] : value, column.data);
+    return filter;
+  }
+  if (column && [CellType.DATE, CellType.MTIME, CellType.CTIME].includes(type)) {
     filter['value'] = value;
     return filter;
   }
@@ -632,7 +636,11 @@ const getFilterByColumnType = (columnKey, columns, rows, sqlColumnKey) => {
       value = value[0].display_value;
     }
   }
-  if (column && [CellType.GEOLOCATION, CellType.DATE, CellType.MTIME, CellType.CTIME].includes(type)) {
+  if (type === CellType.GEOLOCATION) {
+    filter['value'] = getGeolocationDisplayString(Array.isArray(value) ? value[0] : value, column.data);
+    return filter;
+  }
+  if (column && [CellType.DATE, CellType.MTIME, CellType.CTIME].includes(type)) {
     // link_formula result is an array, but can't pass the value directly as an array here
     if (Array.isArray(value)) value = value[0];
     filter['value'] = value;
@@ -664,9 +672,11 @@ export const getFilterConditions = (statisticRecord, chart, table) => {
   const columns = table.columns || [];
   const {
     name = '',
-    rows,
     isPivot
   } = statisticRecord || {};
+  let {
+    rows
+  } = statisticRecord || {};
   const {
     config
   } = chart;
@@ -690,6 +700,12 @@ export const getFilterConditions = (statisticRecord, chart, table) => {
     } = chartSQLMap;
     sqlGroupbyColumnKey = sqlColumns.name_column.key;
   }
+  if ((!Array.isArray(rows) || rows.length === 0) && statisticRecord && Object.prototype.hasOwnProperty.call(statisticRecord, 'original_name')) {
+    rows = [{
+      [sqlGroupbyColumnKey]: statisticRecord.original_name,
+      [sqlColumnGroupbyColumnKey]: statisticRecord.original_group_name
+    }];
+  }
   if (isPivot && rows.length) {
     const xValueList = [];
     const yValueList = [];
@@ -716,7 +732,7 @@ export const getFilterConditions = (statisticRecord, chart, table) => {
       const flters = rows.map(row => getFilterByColumnType(config[columnKey], columns, [row], sqlGroupbyColumnKey));
       filters.push(...flters);
     } else {
-      if (['map', 'map_bubble'].includes(type)) {
+      if (['map', 'map_bubble', 'heat_map'].includes(type)) {
         const filter = {
           column_key: config[columnKey],
           value: name

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

@@ -784,6 +784,7 @@ const chartColumn2SqlColumn = (chartElement, table) => {
         return pieChartStatisticColumn2sqlColumn(chart, table);
       }
     case CHART_TYPE.BAR:
+    case CHART_TYPE.BAR_CUSTOM:
     case CHART_TYPE.LINE:
     case CHART_TYPE.HORIZONTAL_BAR:
     case CHART_TYPE.AREA:
@@ -855,6 +856,7 @@ export const getDatabaseGroupName = (statItem, selectedTable) => {
   let groupName, selectedColumn, columnGroupName, columnSelectedColumn;
   switch (type) {
     case CHART_TYPE.BAR:
+    case CHART_TYPE.BAR_CUSTOM:
     case CHART_TYPE.BAR_GROUP:
     case CHART_TYPE.BAR_STACK:
     case CHART_TYPE.LINE:

package/dist/view/index.css

@@ -67,23 +67,6 @@
   padding-bottom: 0;
 }
 
-.sea-chart-formatter .sea-chart-container.show-x-axis-label,
-.sea-chart-formatter .sea-chart-container.show-horizontal-axis-label {
-  padding-bottom: 20px;
-}
-
-
-
-.sea-chart-formatter .sea-chart-container.show-y-axis-label,
-.sea-chart-formatter .sea-chart-container.show-y-axis-left-label,
-.sea-chart-formatter .sea-chart-container.show-vertical-axis-label {
-  padding-left: 20px;
-}
-
-.sea-chart-formatter .sea-chart-container.show-y-axis-right-label {
-  padding-right: 20px;
-}
-
 .sea-chart-formatter .g2-html-annotation {
   transform: translate(-50%, -50%);
   width: fit-content;