sea-chart 1.1.63-alpha.9 → 1.1.64

package/dist/services/map-json.js

@@ -69,8 +69,7 @@ function getMapJsonQueryUrl(mapLevel, mapLocation) {
   }
 }
 function handleLoadedMapJson(url, mapJson) {
-  // geo json and topology json
-  const isValid = mapJson && mapJson.features || mapJson && mapJson.type === 'Topology';
+  const isValid = mapJson && mapJson.features;
   if (isValid) {
     setMapJson(url, mapJson);
     return mapJson;
@@ -90,7 +89,6 @@ export default async function fetchMapJson(mapLevel, mapLocation, mediaUrl) {
   let mapJson;
   try {
     const res = await fetch("".concat(mediaUrl, "dtable-statistic/geolocation/").concat(url, ".json"));
-    console.log('res', res);
     mapJson = await res.json();
   } catch (error) {
     console.error('on fetchMapJson: fetch error', error);

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

@@ -1,9 +1,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 } from '../../constants';
+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 { getClientFormulaDisplayString } from '../cell-format-utils';
 import { getKnownCollaboratorByEmail, generateDefaultUser, getUsers } from '../collaborator-utils';
 import { getDateColumnFormat, getColumnByKey } from '../column-utils';
@@ -190,6 +189,9 @@ BaseUtils.getGroupColumn = (table, chart) => {
   if (type === CHART_TYPE.HEAT_MAP) {
     return getTableColumnByKey(table, config.time_column_key);
   }
+  if (MAP_CHART_TYPES.includes(type)) {
+    return getTableColumnByKey(table, config.geo_column_key);
+  }
   return getTableColumnByKey(table, config.x_axis_column_key);
 };
 BaseUtils.getColumnGroupColumn = (table, chart) => {
@@ -544,9 +546,6 @@ BaseUtils.formatEmptyName = (dataList, column_groupby_column_key, emptyName) =>
     if (!item.name) {
       item.name = emptyName;
     }
-    if (!item.slugid) {
-      item.slugId = slugid.nice();
-    }
     if (column_groupby_column_key && !item.group_name) {
       item.group_name = emptyName;
     }

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

@@ -1933,16 +1933,53 @@ SQLStatisticsUtils.mapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, colum
     sqlGeoColumnKey,
     sqlSummaryColumnKey
   } = chartSQLMap;
-  const result = [];
-  return sqlRows.reduce((acc, row) => {
-    const name = row[sqlGeoColumnKey];
-    const value = row[sqlSummaryColumnKey];
-    acc.push({
-      name,
-      value
-    });
-    return acc;
-  }, result);
+  const {
+    groupbyColumn
+  } = columnMap;
+  if (groupbyColumn.type === 'link-formula') {
+    const {
+      data,
+      key
+    } = groupbyColumn;
+    const {
+      array_data: {
+        geo_format
+      }
+    } = data;
+    if (!geo_format) {
+      return [];
+    }
+    const nameValueMap = sqlRows.reduce((acc, row) => {
+      const geoList = row[key];
+      const value = row[sqlSummaryColumnKey];
+      geoList.forEach(geo => {
+        const name = geo[geo_format];
+        if (!acc[name]) {
+          acc[name] = value;
+        } else {
+          acc[name] += value;
+        }
+      });
+      return acc;
+    }, {});
+    return Object.keys(nameValueMap).reduce((acc, name) => {
+      acc.push({
+        name,
+        value: nameValueMap[name]
+      });
+      return acc;
+    }, []);
+  } else {
+    return sqlRows.reduce((acc, row) => {
+      const name = row[sqlGeoColumnKey];
+      const value = row[sqlSummaryColumnKey];
+      acc.push({
+        name,
+        value
+      });
+      return acc;
+    }, []);
+  }
 };
 SQLStatisticsUtils.worldMapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
   const {
@@ -1956,25 +1993,67 @@ SQLStatisticsUtils.worldMapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap,
   const {
     sqlSummaryColumnKey
   } = chartSQLMap;
-  const result = [];
-  sqlRows.forEach(item => {
-    const currentValue = item[groupbyColumn.key];
-    let value = item[sqlSummaryColumnKey];
-    let formatted_value = value;
-    if (summary_type === 'advanced') {
-      value = formatNumericValue(value, summaryColumn);
-      formatted_value = getFormattedValue(value, summaryColumn, summary_method);
+  if (groupbyColumn.type === 'link-formula') {
+    const {
+      data,
+      key
+    } = groupbyColumn;
+    const {
+      array_data: {
+        geo_format
+      }
+    } = data;
+    if (!geo_format) {
+      return [];
     }
-    if (currentValue) {
-      const name = typeof currentValue === 'string' ? currentValue : currentValue.country_region;
-      result.push({
+    const nameValueMap = sqlRows.reduce((acc, row) => {
+      const geoList = row[key];
+      const value = row[sqlSummaryColumnKey];
+      geoList.forEach(geo => {
+        const name = geo[geo_format];
+        if (!acc[name]) {
+          acc[name] = value;
+        } else {
+          acc[name] += value;
+        }
+      });
+      return acc;
+    }, {});
+    return Object.keys(nameValueMap).reduce((acc, name) => {
+      let value = nameValueMap[name];
+      let formatted_value = value;
+      if (summary_type === 'advanced') {
+        value = formatNumericValue(value, summaryColumn);
+        formatted_value = getFormattedValue(value, summaryColumn, summary_method);
+      }
+      acc.push({
         name,
         value,
         formatted_value
       });
-    }
-  });
-  return result;
+      return acc;
+    }, []);
+  } else {
+    const result = [];
+    sqlRows.forEach(item => {
+      const currentValue = item[groupbyColumn.key];
+      let value = item[sqlSummaryColumnKey];
+      let formatted_value = value;
+      if (summary_type === 'advanced') {
+        value = formatNumericValue(value, summaryColumn);
+        formatted_value = getFormattedValue(value, summaryColumn, summary_method);
+      }
+      if (currentValue) {
+        const name = typeof currentValue === 'string' ? currentValue : currentValue.country_region;
+        result.push({
+          name,
+          value,
+          formatted_value
+        });
+      }
+    });
+    return result;
+  }
 };
 SQLStatisticsUtils.calculateChart = async (chart, value, callback, sqlRows) => {
   const {