sea-chart 0.0.48 → 0.0.49

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

@@ -1,7 +1,7 @@
 var _BaseUtils;
 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';
+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 } 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 } from '../../constants';
 import { getClientFormulaDisplayString } from '../cell-format-utils';
 import { getKnownCollaboratorByEmail, generateDefaultUser, getUsers } from '../collaborator-utils';
@@ -107,7 +107,10 @@ BaseUtils.isValidExistChart = (tables, chart) => {
     const isExist = _BaseUtils.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;
+    let summaryColumnKey = config.summary_column_key || config.y_axis_summary_column_key || config.horizontal_axis_column_key;
+    if ([CHART_TYPE.TABLE].includes(config.type) && config.column_groupby_multiple_numeric_column && (config === null || config === void 0 ? void 0 : config.summary_columns.length) > 0) {
+      summaryColumnKey = config.summary_columns[0].key;
+    }
     const summaryType = config.summary_type || config.y_axis_summary_type || config.horizontal_axis_summary_type;
     if (summaryType === CHART_SUMMARY_TYPE.ADVANCED && !summaryColumnKey) return false;
     if (summaryColumnKey) {
@@ -357,6 +360,21 @@ BaseUtils.isChartTypeChange = (preChartElement, curChartElement) => {
   if (elementType !== curChartElement.config.type) return true;
   return false;
 };
+BaseUtils.isChartViewChange = (preChartElement, curChartElement) => {
+  var _preChartElement$conf, _curChartElement$conf;
+  const elementView = (_preChartElement$conf = preChartElement.config) === null || _preChartElement$conf === void 0 ? void 0 : _preChartElement$conf.view_id;
+  if (elementView !== ((_curChartElement$conf = curChartElement.config) === null || _curChartElement$conf === void 0 ? void 0 : _curChartElement$conf.view_id)) return true;
+  return false;
+};
+BaseUtils.isArchiveView = (chart, tables) => {
+  const {
+    table_id,
+    view_id
+  } = chart;
+  const table = getTableById(tables, table_id);
+  const view = getViewById(table === null || table === void 0 ? void 0 : table.views, view_id);
+  return view && isArchiveView(view);
+};
 BaseUtils.isChartSortChange = (preChartElement, curChartElement) => {
   return preChartElement.config.sort_type !== curChartElement.config.sort_type;
 };
@@ -390,6 +408,10 @@ 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
+  !shallowEqual(prevProps.globalTheme, currentProps.globalTheme) ||
+  // global theme changed
+  !shallowEqual(prevProps.chartColorTheme, currentProps.chartColorTheme) ||
+  // chart color theme changed
   _BaseUtils._isChartDataChange(prevProps, currentProps) || _BaseUtils.isChartStyleChanged(prevProps.chart, currentProps.chart);
 };
 BaseUtils._isCombinationDataChange = (prevResult, currentResult) => {
@@ -482,25 +504,28 @@ BaseUtils.getPieColorSet = (tables, chart, result) => {
   });
   return backgroundColor;
 };
-BaseUtils.getPieColor = (column, index, data) => {
+BaseUtils.getPieColor = (column, index, data, currentTheme) => {
   let {
     type: columnType,
     data: columnData
   } = column;
+  const {
+    colors
+  } = currentTheme;
   if (columnType === 'single-select' || columnType === 'multiple-select') {
     if (columnData && columnData.options) {
       const selectedItem = columnData.options.find(item => {
-        return item.name === data.name;
+        return item.name === data.name.trim();
       }) || {};
       return selectedItem.color || '#dbdbdb';
     }
   } else {
-    const pieChartColorsLength = PIE_CHART_COLORS.length - 1;
+    const pieChartColorsLength = colors.length - 1;
     const newIndex = index > pieChartColorsLength ? index % pieChartColorsLength : index;
-    return PIE_CHART_COLORS[newIndex];
+    return colors[newIndex];
   }
 };
-BaseUtils.formatPieChartData = (data, chart, tables) => {
+BaseUtils.formatPieChartData = (data, chart, tables, currentTheme) => {
   if (!Array.isArray(data) || data.length === 0 || !chart) {
     return {
       data: [],
@@ -529,7 +554,7 @@ BaseUtils.formatPieChartData = (data, chart, tables) => {
     item.name = item.name + ' ';
     if (value >= threshold) {
       item.percent = String(Number.parseFloat(value / sum * 100).toFixed(1)) + '%';
-      const color = _BaseUtils.getPieColor(column, index, item);
+      const color = _BaseUtils.getPieColor(column, index, item, currentTheme);
       item.color = color;
       colorSet.push(color);
       filteredData.push(item);
@@ -969,7 +994,7 @@ BaseUtils.getGroupLabel = (cellValue, formulaRow, column, dateGranularity, geoGr
     type,
     key,
     data
-  } = column;
+  } = column || {};
   switch (type) {
     case CellType.TEXT:
       {

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

@@ -55,7 +55,7 @@ ChartUtils.calculateStaticChart = (chart, value, statisticalResult, callback) =>
     data_sources: dataSources
   } = statisticalResult;
   if (dataSources === OriginalDataUtils.dataSources) {
-    OriginalDataUtils.calculateStaticChart(chart, value, callback);
+    OriginalDataUtils.calculateChart(chart, value, callback);
     return;
   }
   SQLStatisticsUtils.calculateStaticChart(chart, value, statisticalResult, callback);

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

@@ -1,3 +1,4 @@
+import dayjs from 'dayjs';
 import { CellType, DATE_COLUMN_OPTIONS, FORMULA_COLUMN_TYPES_MAP, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
 import { CHART_SUMMARY_TYPE, CHART_TYPE, Y_AXIS_TYPE_PREFIX } from '../../../constants';
 import { getColorFromSingleSelectColumn } from '../../column-utils';
@@ -23,7 +24,7 @@ async function calculateBasicChart(chart, value, _ref) {
   let groupby_date_granularity;
   let include_empty;
   let groupby_geolocation_granularity;
-  if (chart.type === CHART_TYPE.PIE || chart.type === CHART_TYPE.RING || chart.type === CHART_TYPE.TREEMAP) {
+  if (chart.type === CHART_TYPE.PIE || chart.type === CHART_TYPE.RING || chart.type === CHART_TYPE.TREE_MAP) {
     groupby_column_key = chart.groupby_column_key;
     summary_type = chart.summary_type;
     summary_method = chart.summary_method;
@@ -31,14 +32,27 @@ async function calculateBasicChart(chart, value, _ref) {
     groupby_date_granularity = chart.groupby_date_granularity;
     include_empty = chart.groupby_include_empty_cells;
     groupby_geolocation_granularity = chart.groupby_geolocation_granularity;
+  } else if ([CHART_TYPE.HORIZONTAL_BAR, CHART_TYPE.HORIZONTAL_GROUP_BAR].includes(chart.type)) {
+    groupby_column_key = chart.vertical_axis_column_key;
+    summary_type = chart.horizontal_axis_summary_type;
+    summary_method = chart.horizontal_axis_summary_method;
+    summary_column_key = chart.horizontal_axis_column_key;
+    groupby_date_granularity = chart.vertical_axis_date_granularity;
+    groupby_geolocation_granularity = chart.vertical_axis_geolocation_granularity;
+    include_empty = chart.vertical_axis_include_empty;
+  } else if ([CHART_TYPE.HEAT_MAP].includes(chart.type)) {
+    groupby_column_key = chart.time_column_key;
+    summary_type = chart.summary_type;
+    summary_method = chart.summary_method;
+    summary_column_key = chart.summary_column_key;
   } else {
     groupby_column_key = chart.x_axis_column_key;
     summary_type = chart.y_axis_summary_type;
     summary_method = chart.y_axis_summary_method;
-    summary_column_key = chart.y_axis_column_key;
+    summary_column_key = chart.y_axis_summary_column_key;
     groupby_date_granularity = chart.x_axis_date_granularity;
     groupby_geolocation_granularity = chart.x_axis_geolocation_granularity;
-    include_empty = chart.x_axis_include_empty;
+    include_empty = chart.x_axis_include_empty_cells;
   }
   const table = getTableById(value.tables, table_id);
   const view = table && getViewById(table.views, view_id);
@@ -55,6 +69,9 @@ async function calculateBasicChart(chart, value, _ref) {
   } = groupbyColumn;
   if (DATE_COLUMN_OPTIONS.includes(groupby_column_type) && !groupby_date_granularity) {
     groupby_date_granularity = CHART_SUMMARY_TYPE.MONTH;
+    if ([CHART_TYPE.HEAT_MAP].includes(chart.type)) {
+      groupby_date_granularity = CHART_SUMMARY_TYPE.DAY;
+    }
   }
   if (groupby_column_type === CellType.GEOLOCATION && !groupby_geolocation_granularity) {
     groupby_geolocation_granularity = CHART_SUMMARY_TYPE.PROVINCE;
@@ -72,6 +89,33 @@ async function calculateBasicChart(chart, value, _ref) {
   results.forEach(item => {
     item.name = getFormattedLabel(groupbyColumn, item.name, value.collaborators);
   });
+  if ([CHART_TYPE.HEAT_MAP].includes(chart.type)) {
+    let data = [];
+    let years = [];
+    results.forEach(item => {
+      if (!item.name) {
+        data.push(item);
+        return;
+      }
+      const year = dayjs(item.name).year();
+      data.push({
+        ...item,
+        year
+      });
+      if (years.indexOf(year) < 0) {
+        years.push(year);
+      }
+    });
+    data.sort((current, next) => {
+      if (current.year > next.year) return -1;
+      if (current.year < next.year) return 1;
+      return 0;
+    });
+    return {
+      data,
+      years
+    };
+  }
   return results;
 }
 async function calculateGroupingChart(chart, value, _ref2) {
@@ -79,23 +123,32 @@ async function calculateGroupingChart(chart, value, _ref2) {
     getViewRows,
     getTableFormulaResults
   } = _ref2;
-  const {
+  let {
     table_id,
     view_id,
     x_axis_column_key,
-    x_axis_include_empty,
-    y_axis_column_key,
+    x_axis_include_empty_cells,
+    y_axis_summary_column_key,
     y_axis_summary_type,
     y_axis_summary_method,
     column_groupby_multiple_numeric_column
   } = chart;
-  const groupby_column_key = x_axis_column_key;
+  let groupby_column_key = x_axis_column_key;
   const column_groupby_column_key = chart.column_groupby_column_key;
   const column_groupby_date_granularity = chart.column_groupby_date_granularity;
   const column_groupby_geolocation_granularity = chart.column_groupby_geolocation_granularity;
   let groupby_date_granularity = chart.x_axis_date_granularity;
   let groupby_geolocation_granularity = chart.x_axis_geolocation_granularity;
-  let column_groupby_numeric_columns = chart.column_groupby_numeric_columns || [];
+  let column_groupby_numeric_columns = chart.summary_columns || [];
+  if ([CHART_TYPE.HORIZONTAL_GROUP_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR].includes(chart.type)) {
+    groupby_column_key = chart.vertical_axis_column_key;
+    groupby_date_granularity = chart.vertical_axis_date_granularity;
+    groupby_geolocation_granularity = chart.vertical_axis_geolocation_granularity;
+    x_axis_include_empty_cells = chart.vertical_axis_include_empty;
+    y_axis_summary_column_key = chart.horizontal_axis_column_key;
+    y_axis_summary_type = chart.horizontal_axis_summary_type;
+    y_axis_summary_method = chart.horizontal_axis_summary_method;
+  }
   const table = getTableById(value.tables, table_id);
   const view = table && getViewById(table.views, view_id);
   if (!view) {
@@ -117,7 +170,7 @@ async function calculateGroupingChart(chart, value, _ref2) {
   const yAxisType = null;
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
-  let results = getGroupingChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty, groupby_date_granularity, groupby_geolocation_granularity, column_groupby_column_key, column_groupby_date_granularity, column_groupby_geolocation_granularity, y_axis_column_key, y_axis_summary_type, y_axis_summary_method, column_groupby_multiple_numeric_column, column_groupby_numeric_columns, yAxisType, table, value);
+  let results = getGroupingChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty_cells, groupby_date_granularity, groupby_geolocation_granularity, column_groupby_column_key, column_groupby_date_granularity, column_groupby_geolocation_granularity, y_axis_summary_column_key, y_axis_summary_type, y_axis_summary_method, column_groupby_multiple_numeric_column, column_groupby_numeric_columns, yAxisType, table, value);
   BaseUtils.sortCharts(results, groupbyColumn, 'name');
   results = results.map(result => {
     return {
@@ -321,9 +374,9 @@ async function calculateGeolocationBasicChart(chart, value, _ref3) {
     type,
     table_id,
     view_id,
-    geo_column,
+    geo_column_key,
     summary_type,
-    summary_column,
+    summary_column_key,
     summary_method
   } = chart;
   const table = getTableById(value.tables, table_id);
@@ -331,7 +384,7 @@ async function calculateGeolocationBasicChart(chart, value, _ref3) {
   if (!view) {
     return;
   }
-  const geoColumn = geo_column && getTableColumnByKey(table, geo_column);
+  const geoColumn = geo_column_key && getTableColumnByKey(table, geo_column_key);
   if (!geoColumn) {
     return;
   }
@@ -341,7 +394,7 @@ async function calculateGeolocationBasicChart(chart, value, _ref3) {
   } else {
     geolocationGranularity = fixGeoGranularity(chart);
   }
-  const summaryColumn = getTableColumnByKey(table, summary_column);
+  const summaryColumn = getTableColumnByKey(table, summary_column_key);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   const geoColumnType = geoColumn.type;
@@ -391,7 +444,7 @@ async function calculateCustomBar(statItem, value, _ref4) {
     x_axis_column_key,
     x_axis_date_granularity,
     x_axis_geolocation_granularity,
-    x_axis_include_empty,
+    x_axis_include_empty_cells,
     y_axises
   } = statItem;
   const table = getTableById(value.tables, table_id);
@@ -435,7 +488,7 @@ async function calculateCustomBar(statItem, value, _ref4) {
           column_key: summary_column_key,
           summary_method
         } = numericSummaryColumn;
-        const currentResults = getGroupbyNumericColumnsChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty, groupbyDateGranularity, groupbyGeolocationGranularity, summary_column_key, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, CHART_SUMMARY_TYPE.ADVANCED, summary_method, yAxisType, table, value);
+        const currentResults = getGroupbyNumericColumnsChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty_cells, groupbyDateGranularity, groupbyGeolocationGranularity, summary_column_key, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, CHART_SUMMARY_TYPE.ADVANCED, summary_method, yAxisType, table, value);
         results = results.concat(currentResults);
       });
     }
@@ -463,7 +516,7 @@ function calculator(chart, value, _ref5) {
       getTableFormulaResults
     });
   }
-  if (type === CHART_TYPE.CUSTOM_BAR) {
+  if (type === CHART_TYPE.BAR_CUSTOM) {
     return calculateCustomBar(chart, value, {
       getViewRows,
       getTableFormulaResults

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

@@ -9,12 +9,12 @@ async function calculator(chart, dtableValue, _ref) {
   const {
     table_id,
     view_id,
-    numeric_column,
+    numeric_column_key,
     summary_method
   } = chart;
   const selectedTable = getTableById(dtableValue.tables, table_id);
   const selectedView = selectedTable && getViewById(selectedTable.views, view_id);
-  const selectedColumn = getTableColumnByKey(selectedTable, numeric_column);
+  const selectedColumn = getTableColumnByKey(selectedTable, numeric_column_key);
   const _isNumericColumn = selectedColumn && isNumericColumn(selectedColumn);
   const statRows = await getViewRows(selectedView, selectedTable);
   const formulaRows = _isNumericColumn ? await getTableFormulaResults(selectedTable, statRows) : {};

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

@@ -12,7 +12,7 @@ async function calculator(chart, value, _ref) {
     table_id,
     view_id,
     x_axis_column_key,
-    x_axis_include_empty,
+    x_axis_include_empty_cells,
     x_axis_date_granularity: groupby_date_granularity,
     x_axis_geolocation_granularity: groupby_geolocation_granularity,
     y_axis_left_summary_column,
@@ -84,13 +84,13 @@ async function calculator(chart, value, _ref) {
             leftResultMap.set(name, currentValue);
           });
         }
-        if (label.length === 0 && x_axis_include_empty) {
+        if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = leftResultMap.get(null) || 0;
           currentValue += 1;
           leftResultMap.set(null, currentValue);
         }
       } else {
-        if (x_axis_include_empty || label) {
+        if (x_axis_include_empty_cells || label) {
           let currentLabelCount = leftResultMap.get(label) || 0;
           currentLabelCount = currentLabelCount + 1;
           leftResultMap.set(label, currentLabelCount);
@@ -116,7 +116,7 @@ async function calculator(chart, value, _ref) {
             leftResultMap.set(name, currentLabelMap);
           });
         }
-        if (label.length === 0 && x_axis_include_empty) {
+        if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = leftResultMap.get(null) || {};
           leftSummaryColumnKeys.forEach(key => {
             const cellValue = getCellValue(row, formulaRow, {
@@ -132,7 +132,7 @@ async function calculator(chart, value, _ref) {
           leftResultMap.set(null, currentValue);
         }
       } else {
-        if (x_axis_include_empty || label) {
+        if (x_axis_include_empty_cells || label) {
           const currentValue = leftResultMap.get(label) || {};
           leftSummaryColumnKeys.forEach(key => {
             const cellValue = getCellValue(row, formulaRow, {
@@ -160,13 +160,13 @@ async function calculator(chart, value, _ref) {
             rightResultMap.set(name, currentValue);
           });
         }
-        if (label.length === 0 && x_axis_include_empty) {
+        if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = rightResultMap.get(null) || 0;
           currentValue += 1;
           rightResultMap.set(null, currentValue);
         }
       } else {
-        if (x_axis_include_empty || label) {
+        if (x_axis_include_empty_cells || label) {
           let currentLabelCount = rightResultMap.get(label) || 0;
           currentLabelCount = currentLabelCount + 1;
           rightResultMap.set(label, currentLabelCount);
@@ -185,7 +185,7 @@ async function calculator(chart, value, _ref) {
             rightResultMap.set(name, currentLabelList);
           });
         }
-        if (label.length === 0 && x_axis_include_empty) {
+        if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = rightResultMap.get(null) || [];
           if (isNumber(cellValue)) {
             currentValue.push(cellValue);
@@ -193,7 +193,7 @@ async function calculator(chart, value, _ref) {
           rightResultMap.set(null, currentValue);
         }
       } else {
-        if (x_axis_include_empty || label) {
+        if (x_axis_include_empty_cells || label) {
           const currentLabelList = rightResultMap.get(label) || [];
           if (isNumber(cellValue)) {
             currentLabelList.push(cellValue);

package/dist/utils/chart-utils/original-data-utils/compare-bar-chart-calculator.js

@@ -13,7 +13,7 @@ async function calculator(chart, value, _ref) {
     x_axis_column_key,
     y_axis_summary_type,
     y_axis_summary_method,
-    y_axis_column_key,
+    y_axis_summary_column_key,
     x_axis_date_granularity,
     x_axis_date_range_start,
     x_axis_date_range_end,
@@ -32,7 +32,7 @@ async function calculator(chart, value, _ref) {
   if (!groupbyColumn) {
     return [];
   }
-  const summaryColumn = getTableColumnByKey(table, y_axis_column_key) || {};
+  const summaryColumn = getTableColumnByKey(table, y_axis_summary_column_key) || {};
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   const dateRangeResultMap = new Map();

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

@@ -11,10 +11,10 @@ async function calculator(chart, value, _ref) {
   const {
     table_id,
     view_id,
-    name_column,
-    completed_column,
-    target_column,
-    group_column,
+    groupby_column_key,
+    completed_column_key,
+    target_column_key,
+    column_groupby_column_key,
     date_granularity,
     geolocation_granularity
   } = chart;
@@ -23,17 +23,17 @@ async function calculator(chart, value, _ref) {
   if (!view) {
     return [];
   }
-  const nameColumn = getTableColumnByKey(table, name_column);
+  const nameColumn = getTableColumnByKey(table, groupby_column_key);
   if (!nameColumn) return [];
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
-  const groupColumn = getTableColumnByKey(table, group_column);
+  const groupColumn = getTableColumnByKey(table, column_groupby_column_key);
   const isColumnDataAsAnArray = isArrayCellValue(nameColumn);
   const isGroupChart = !!groupColumn;
   let result = [];
   if (!isGroupChart) {
-    const completedColumn = getTableColumnByKey(table, completed_column);
-    const targetColumn = getTableColumnByKey(table, target_column);
+    const completedColumn = getTableColumnByKey(table, completed_column_key);
+    const targetColumn = getTableColumnByKey(table, target_column_key);
     let labelCountMap = {};
     let labels = [];
     statRows.forEach(row => {
@@ -96,8 +96,8 @@ async function calculator(chart, value, _ref) {
       }
     });
   } else {
-    const completedColumn = getTableColumnByKey(table, completed_column);
-    const targetColumn = getTableColumnByKey(table, target_column);
+    const completedColumn = getTableColumnByKey(table, completed_column_key);
+    const targetColumn = getTableColumnByKey(table, target_column_key);
     let labelCountMap = {};
     let colorMap = {};
     let labelGroups = [];

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

@@ -9,15 +9,15 @@ async function calculator(chart, value, _ref) {
   const {
     table_id,
     view_id,
-    target_value_column,
+    target_value_column_key,
     target_value_column_summary_method,
-    total_value_column,
+    total_value_column_key,
     total_value_column_summary_method
   } = chart;
   const selectedTable = getTableById(value.tables, table_id);
   const selectedView = selectedTable && getViewById(selectedTable.views, view_id);
-  const selectedColumn1 = getTableColumnByKey(selectedTable, target_value_column);
-  const selectedColumn2 = getTableColumnByKey(selectedTable, total_value_column);
+  const selectedColumn1 = getTableColumnByKey(selectedTable, target_value_column_key);
+  const selectedColumn2 = getTableColumnByKey(selectedTable, total_value_column_key);
   const statRows = await getViewRows(selectedView, selectedTable);
   if (statRows.length === 0) {
     return 0;

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

@@ -1,5 +1,8 @@
 var _OriginalDataUtils;
 import { getTableById, getViewById } from 'dtable-utils';
+import { CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES } from '../../../constants';
+import BaseUtils from '../base-utils';
+import context from '../../../context';
 import PivotTableCalculator from './pivot-table-calculator';
 import BasicChartCalculator from './basic-chart-calculator';
 import CompareBarCalculator from './compare-bar-chart-calculator';
@@ -10,9 +13,6 @@ import MirrorCalculator from './mirror-calculator';
 import CardCalculator from './card-calculator';
 import TrendCalculator from './trend-calculator';
 import DashboardCalculator from './dashboard-calculator';
-import { CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES } from '../../../constants';
-import BaseUtils from '../base-utils';
-import context from '../../../context';
 const BASIC_CHART = 'basic_chart';
 const calculatorMap = {
   [CHART_TYPE.TABLE]: PivotTableCalculator,

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

@@ -60,19 +60,19 @@ async function calculator(chart, dtableValue, _ref) {
   const {
     table_id,
     view_id,
-    column,
+    column_key,
     summary_type,
-    summary_column,
+    summary_column_key,
     summary_method,
-    group_column
+    group_column_key
   } = chart;
   const table = getTableById(dtableValue.tables, table_id);
   const view = table && getViewById(table.views, view_id);
-  const columnItem = getTableColumnByKey(table, column);
+  const columnItem = getTableColumnByKey(table, column_key);
   const rows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, rows);
-  const groupColumn = getTableColumnByKey(table, group_column);
-  const numericColumn = summary_column && getTableColumnByKey(table, summary_column);
+  const groupColumn = getTableColumnByKey(table, group_column_key);
+  const numericColumn = summary_column_key && getTableColumnByKey(table, summary_column_key);
   const groupItems = getGroupItems(rows, groupColumn);
   if (groupColumn.length === 0) return;
   let result = {};

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

@@ -18,7 +18,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
     groupby_include_empty_cells: include_empty,
     groupby_date_granularity,
     groupby_geolocation_granularity,
-    summary_columns_option
+    summary_columns
   } = chart;
   const table = getTableById(value.tables, table_id);
   const view = table && getViewById(table.views, view_id);
@@ -54,7 +54,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
       }
     }
   });
-  const summary_columns_option_keys = Array.isArray(summary_columns_option) ? summary_columns_option.map(option => option.key) : [];
+  const summary_columns_option_keys = Array.isArray(summary_columns) ? summary_columns.map(option => option.key) : [];
   const statisticColumnKeys = [summary_column_key, ...summary_columns_option_keys];
   const validStatisticColumnKeys = statisticColumnKeys;
   let statisticColumns = validStatisticColumnKeys.map(key => {
@@ -66,7 +66,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
   if (statisticColumns.length > 0) {
     statisticColumns[0].method = summary_method;
   }
-  Array.isArray(summary_columns_option) && summary_columns_option.forEach((option, index) => {
+  Array.isArray(summary_columns) && summary_columns.forEach((option, index) => {
     if (statisticColumns[index + 1]) {
       statisticColumns[index + 1].method = option.method;
     }

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

@@ -35,18 +35,18 @@ async function calculator(chart, value, _ref) {
   const {
     table_id,
     view_id,
-    x_axis_column,
-    y_axis_column,
-    group_column
+    x_axis_column_key,
+    y_axis_column_key,
+    column_groupby_column_key
   } = chart;
   const table = getTableById(value.tables, table_id);
   const view = table && getViewById(table.views, view_id);
   if (!view) {
     return [];
   }
-  const selectedXAxisColumn = getTableColumnByKey(table, x_axis_column);
-  const selectedYAxisColumn = getTableColumnByKey(table, y_axis_column);
-  const selectedGroupColumn = getTableColumnByKey(table, group_column);
+  const selectedXAxisColumn = getTableColumnByKey(table, x_axis_column_key);
+  const selectedYAxisColumn = getTableColumnByKey(table, y_axis_column_key);
+  const selectedGroupColumn = getTableColumnByKey(table, column_groupby_column_key);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   const data = [];
@@ -62,9 +62,9 @@ async function calculator(chart, value, _ref) {
     const name = getColumnValue(row, formulaRow, selectedGroupColumn, value);
     const nameIndex = data.findIndex(r => r.name === name && r.x_axis === x_axis && r.y_axis === y_axis);
     const dataItem = {
-      x_axis,
-      y_axis,
-      group_by: name
+      name: x_axis,
+      value: y_axis,
+      groupby: name
     };
     updateBasicChartRows(data, nameIndex, name, dataItem, row);
   });

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

@@ -14,19 +14,19 @@ async function calculator(chart, value, _ref) {
   const {
     table_id,
     view_id,
-    date_column,
+    date_column_key,
     date_granularity,
-    summary_column,
+    summary_column_key,
     summary_type,
     summary_method
   } = chart;
   const selectedTable = getTableById(value.tables, table_id);
   const selectedView = selectedTable && getViewById(selectedTable.views, view_id);
-  const selectedColumn = getTableColumnByKey(selectedTable, date_column);
+  const selectedColumn = getTableColumnByKey(selectedTable, date_column_key);
   const resultMap = new Map();
   let formulaRows = {};
   const rows = await getViewRows(selectedView, selectedTable);
-  const numericColumn = getTableColumnByKey(selectedTable, summary_column);
+  const numericColumn = getTableColumnByKey(selectedTable, summary_column_key);
   if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
     if (FORMULA_COLUMN_TYPES_MAP[numericColumn.type]) {
       formulaRows = await getTableFormulaResults(selectedTable, rows);
@@ -59,7 +59,7 @@ async function calculator(chart, value, _ref) {
     const {
       compareValue: value1,
       comparedValue: value2
-    } = summaryDurationResult(resultMap, date_granularity, summary_type, summary_column, false);
+    } = summaryDurationResult(resultMap, date_granularity, summary_type, summary_column_key, false);
     currentValues = value1;
     previousValues = value2;
   } else {