sea-chart 2.0.35 → 2.0.36

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

@@ -122,6 +122,22 @@ BaseUtils.isValidExistChart = (tables, chart) => {
     return (0, _dtableUtils.getTableColumnByKey)(table, totalColumnKey);
   }
 
+  // completeness chart requires groupby_column_key, completed_column_key, and target_column_key
+  if (config.type === _constants.CHART_TYPE.COMPLETENESS || config.type === _constants.CHART_TYPE.COMPLETENESS_GROUP) {
+    const {
+      groupby_column_key,
+      completed_column_key,
+      target_column_key
+    } = config;
+    if (!groupby_column_key) return false;
+    if (!completed_column_key) return false;
+    if (!target_column_key) return false;
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, groupby_column_key)) return false;
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, completed_column_key)) return false;
+    if (!(0, _dtableUtils.getTableColumnByKey)(table, target_column_key)) return false;
+    return true;
+  }
+
   // if current chart is using "groupby_column_key" as key
   // if groupby_column_key is null, still return false
   let groupByColumnKey = config.groupby_column_key || config.x_axis_column_key || config.vertical_axis_column_key || config.columnKey || config.date_column_key;
@@ -158,7 +174,7 @@ BaseUtils.isValidExistChart = (tables, chart) => {
       // "key" and "column_key" are both exists currently, "column_key" is defined in public component, to avoid bugs, better not to change "column_key" to "key"
       summaryColumnKey = config.summary_columns[0].key || config.summary_columns[0].column_key;
     }
-    const summaryType = config.summary_type || config.y_axis_summary_type || config.horizontal_axis_summary_type;
+    const summaryType = _BaseUtils.getSummaryType(config);
     if (summaryType === _constants.CHART_SUMMARY_TYPE.ADVANCED && !summaryColumnKey) return false;
     if (summaryColumnKey) {
       return (0, _dtableUtils.getTableColumnByKey)(table, summaryColumnKey);
@@ -553,7 +569,8 @@ BaseUtils.formatEmptyName = (dataList, column_groupby_column_key, emptyName) =>
   let updatedStatistics = [];
   for (let i = 0; i < dataList.length; i++) {
     let item = dataList[i];
-    if (!item.name) {
+    // let updated = {};
+    if (!item.name && item.name !== 0) {
       item.name = emptyName;
     }
     if (column_groupby_column_key && !item.group_name) {
@@ -683,94 +700,156 @@ BaseUtils.formatPieChartData = (data, chart, tables, currentTheme, useColumnColo
 };
 // table
 // format SINGLE_SELECT, LAST_MODIFIER, CREATOR, COLLABORATOR, DATE, NUMBER
-BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
-  let {
-    type: columnType,
-    data: columnData
-  } = column;
-  let name = result[nameKey];
-  if (columnType === _dtableUtils.CellType.SINGLE_SELECT || columnType === _dtableUtils.CellType.MULTIPLE_SELECT) {
-    const options = (0, _dtableUtils.getColumnOptions)(column);
-    let selectedOption = (0, _dtableUtils.getOption)(options, name);
+BaseUtils.updateTableViewListItemNameAndColor = async (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
+  return new Promise((resolve, reject) => {
+    let resultPromise = Promise.resolve();
     let {
-      name: optionName,
-      color: optionColor,
-      id
-    } = selectedOption || {};
-    if (selectedOption) {
-      result[nameKey] = optionName;
-      result[colorKey] = optionColor;
-      isNameField && (result.original_name = id);
-    } else {
-      result[colorKey] = '#dbdbdb';
-    }
-  } else if (columnType === _dtableUtils.CellType.COLLABORATOR) {
-    (0, _collaboratorUtils.getUsers)(name, users => {
-      // if users not found , use name instead
-      if (!users.length) {
-        if (!Array.isArray(name)) {
-          name = [name];
-        }
-        result[nameKey] = name.join(', ');
-        return;
+      type: columnType,
+      data: columnData
+    } = column;
+    let name = result[nameKey];
+    if (columnType === _dtableUtils.CellType.SINGLE_SELECT || columnType === _dtableUtils.CellType.MULTIPLE_SELECT) {
+      const options = (0, _dtableUtils.getColumnOptions)(column);
+      let selectedOption = (0, _dtableUtils.getOption)(options, name);
+      let {
+        name: optionName,
+        color: optionColor,
+        id
+      } = selectedOption || {};
+      if (selectedOption) {
+        result[nameKey] = optionName;
+        result[colorKey] = optionColor;
+        isNameField && (result.original_name = id);
+      } else {
+        result[colorKey] = '#dbdbdb';
       }
-      result[nameKey] = users.map(user => user.name).join(', ');
-      isNameField && (result.original_name = users.map(user => user.email).join(', '));
-    });
-  } else if (columnType === _dtableUtils.CellType.CREATOR || columnType === _dtableUtils.CellType.LAST_MODIFIER) {
-    // move collaborators logic to collaborator-utils.js
-    (0, _collaboratorUtils.getUsers)(name, users => {
-      // if users not found , use name instead
-      if (!users.length) {
-        if (!Array.isArray(name)) {
-          name = [name];
-        }
-        result[nameKey] = name.join(', ');
-        return;
+    } else if (columnType === _dtableUtils.CellType.COLLABORATOR) {
+      const users = _context.default.getCollaboratorsFromCache();
+      const user = users.find(user => user.email === name);
+      if (user) {
+        result[nameKey] = (user === null || user === void 0 ? void 0 : user.name) || name;
+        isNameField && (result.original_name = name);
+        resolve();
+      } else {
+        _context.default.queryUsers([name], users => {
+          const userEmail = name;
+          const user = users[userEmail] || (0, _collaboratorUtils.generateDefaultUser)(userEmail);
+          const userName = user.name || userEmail;
+          result[nameKey] = userName;
+          isNameField && (result.original_name = userEmail);
+          user.loaded = true;
+          _context.default.updateCollaboratorsCache(userEmail, user);
+          resolve();
+        });
       }
-      result[nameKey] = users.map(user => user.name).join(', ');
-      isNameField && (result.original_name = users.map(user => user.email).join(', '));
-    });
-  } else if (columnType === _dtableUtils.CellType.NUMBER) {
-    let valueNumber = parseFloat(name);
-    result[nameKey] = (0, _dtableUtils.isNumber)(valueNumber) ? (0, _dtableUtils.getNumberDisplayString)(valueNumber, columnData) : name;
-    isNameField && (result.original_name = name);
-  } else if (columnType === _dtableUtils.CellType.DATE) {
-    name = name + '';
-    if (name && name.split('-').length === 3) {
-      let format = (0, _columnUtils.getDateColumnFormat)(column);
-      let spaceIndex = format.indexOf(' ');
-      if (spaceIndex > -1) {
-        format = format.slice(0, spaceIndex);
+      return;
+    } else if (columnType === _dtableUtils.CellType.CREATOR || columnType === _dtableUtils.CellType.LAST_MODIFIER) {
+      const users = _context.default.getCollaboratorsFromCache();
+      const user = users.find(user => user.email === name);
+      if (user) {
+        result[nameKey] = (user === null || user === void 0 ? void 0 : user.name) || name;
+        isNameField && (result.original_name = name);
+        resolve();
+      } else {
+        _context.default.queryUsers([name], users => {
+          const userEmail = name;
+          const user = users[userEmail] || (0, _collaboratorUtils.generateDefaultUser)(userEmail);
+          const userName = user.name || userEmail;
+          result[nameKey] = userName;
+          isNameField && (result.original_name = userEmail);
+          user.loaded = true;
+          _context.default.updateCollaboratorsCache(userEmail, user);
+          resolve();
+        });
       }
-      result[nameKey] = (0, _dayjs.default)(name).format(format);
-    }
-  } else if (columnType === _dtableUtils.CellType.LINK_FORMULA) {
-    // scatter only use number
-    if (isScatterChart) {
-      name.length && (name = name[0]);
+      return;
+    } else if (columnType === _dtableUtils.CellType.NUMBER) {
       let valueNumber = parseFloat(name);
       result[nameKey] = (0, _dtableUtils.isNumber)(valueNumber) ? (0, _dtableUtils.getNumberDisplayString)(valueNumber, columnData) : name;
+      isNameField && (result.original_name = name);
+    } else if (columnType === _dtableUtils.CellType.DATE) {
+      name = name + '';
+      if (name && name.split('-').length === 3) {
+        let format = (0, _columnUtils.getDateColumnFormat)(column);
+        let spaceIndex = format.indexOf(' ');
+        if (spaceIndex > -1) {
+          format = format.slice(0, spaceIndex);
+        }
+        result[nameKey] = (0, _dayjs.default)(name).format(format);
+      }
+    } else if (columnType === _dtableUtils.CellType.LINK_FORMULA) {
+      // scatter only use number
+      if (isScatterChart) {
+        name.length && (name = name[0]);
+        let valueNumber = parseFloat(name);
+        result[nameKey] = (0, _dtableUtils.isNumber)(valueNumber) ? (0, _dtableUtils.getNumberDisplayString)(valueNumber, columnData) : name;
+      }
+      const {
+        array_data,
+        array_type
+      } = columnData;
+      const linkedColumn = {
+        ...column,
+        type: array_type,
+        data: array_data
+      };
+      // for linked formula, need to call recursively, using it's result as the result of the promise
+      resultPromise = _BaseUtils.updateTableViewListItemNameAndColor(result, linkedColumn, nameKey, colorKey, isScatterChart);
+    } else if (columnType === _dtableUtils.CellType.FORMULA) {
+      const {
+        result_type: resultType,
+        array_type: arrayType,
+        array_data: arrayData
+      } = columnData || {};
+      if (resultType === _dtableUtils.FORMULA_RESULT_TYPE.NUMBER) {
+        const valueNumber = parseFloat(name);
+        result[nameKey] = (0, _dtableUtils.isNumber)(valueNumber) ? (0, _dtableUtils.getNumberDisplayString)(valueNumber, columnData) : name;
+        isNameField && (result.original_name = name);
+      } else if (resultType === _dtableUtils.FORMULA_RESULT_TYPE.DATE || resultType === _dtableUtils.CellType.CTIME || resultType === _dtableUtils.CellType.MTIME) {
+        result[nameKey] = (0, _dtableUtils.getFormulaDisplayString)(name, columnData);
+        isNameField && (result.original_name = name);
+      } else if (arrayType && arrayData) {
+        const formulaArrayColumn = {
+          ...column,
+          type: arrayType,
+          data: arrayData
+        };
+        resultPromise = _BaseUtils.updateTableViewListItemNameAndColor(result, formulaArrayColumn, nameKey, colorKey, isScatterChart, isNameField);
+      } else if (Array.isArray(name)) {
+        result[nameKey] = name.map(item => {
+          if ((0, _collaborator.isValidCollaboratorEmail)(item)) {
+            const collaborator = (0, _collaboratorUtils.getKnownCollaboratorByEmail)(item);
+            return collaborator ? collaborator.name : item;
+          }
+          return item;
+        }).join(', ');
+        isNameField && (result.original_name = name.join(', '));
+      } else if (typeof name === 'string' && (0, _collaborator.isValidCollaboratorEmail)(name)) {
+        const collaborator = (0, _collaboratorUtils.getKnownCollaboratorByEmail)(name);
+        result[nameKey] = collaborator ? collaborator.name : name;
+        isNameField && (result.original_name = name);
+      } else {
+        result[nameKey] = (0, _dtableUtils.getFormulaDisplayString)(name, columnData);
+        isNameField && (result.original_name = name);
+      }
     }
-    const {
-      array_data,
-      array_type
-    } = columnData;
-    const linkedColumn = {
-      ...column,
-      type: array_type,
-      data: array_data
-    };
-    return _BaseUtils.updateTableViewListItemNameAndColor(result, linkedColumn, nameKey, colorKey, isScatterChart);
-  }
+    resolve(resultPromise);
+  });
 };
-BaseUtils.updateTableViewList = (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
+BaseUtils.updateTableViewList = async (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
+  const promises = [];
   result.forEach(result => {
-    _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey, isScatterChart, isNameField);
+    const promise = _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey, isScatterChart, isNameField);
+    promises.push(promise);
   });
+  try {
+    await Promise.all(promises);
+  } catch (e) {
+    console.error(e);
+  }
 };
-// sort chart
-BaseUtils.sortCharts = (charts, column, sortKey, isPivot) => {
+// sort chart result
+BaseUtils.sortCharts = (results, column, sortKey, isPivot) => {
   let {
     type: columnType,
     data
@@ -797,7 +876,7 @@ BaseUtils.sortCharts = (charts, column, sortKey, isPivot) => {
       optionIdIndexMap[option.id] = index;
     });
   }
-  charts.sort((currResult, nextResult) => {
+  results.sort((currResult, nextResult) => {
     let {
       [sortKey]: current
     } = currResult;
@@ -1136,6 +1215,32 @@ BaseUtils.convertConfig = config => {
   }
   return config;
 };
+BaseUtils.getSummaryType = config => {
+  switch (config.type) {
+    case _constants.CHART_TYPE.HORIZONTAL_BAR:
+    case _constants.CHART_TYPE.HORIZONTAL_GROUP_BAR:
+    case _constants.CHART_TYPE.STACKED_HORIZONTAL_BAR:
+      {
+        return config.horizontal_axis_summary_type;
+      }
+    case _constants.CHART_TYPE.BAR:
+    case _constants.CHART_TYPE.BAR_GROUP:
+    case _constants.CHART_TYPE.BAR_STACK:
+    case _constants.CHART_TYPE.LINE:
+    case _constants.CHART_TYPE.LINE_GROUP:
+    case _constants.CHART_TYPE.AREA:
+    case _constants.CHART_TYPE.AREA_GROUP:
+    case _constants.CHART_TYPE.SCATTER:
+      {
+        return config.y_axis_summary_type;
+      }
+    case _constants.CHART_TYPE.TABLE:
+    default:
+      {
+        return config.summary_type;
+      }
+  }
+};
 BaseUtils.getGroupLabel = (cellValue, formulaRow, column, dateGranularity, geoGranularity, value) => {
   let {
     type,
@@ -1171,11 +1276,11 @@ BaseUtils.getGroupLabel = (cellValue, formulaRow, column, dateGranularity, geoGr
         if (!dateGranularity) {
           return (0, _dtableUtils.getDateDisplayString)(cellValue);
         }
+        const firstDayOfWeek = (0, _index.getFirstDayOfWeekForGroupby)('base');
         if (dateGranularity.toUpperCase() === 'QUARTER') {
-          // TODO: fix the unknown word 'QUARTAR'
-          return _dtableUtils.DateUtils.getDateByGranularity(cellValue, 'QUARTAR');
+          return _dtableUtils.DateUtils.getDateByGranularity(cellValue, 'QUARTAR', firstDayOfWeek);
         }
-        return _dtableUtils.DateUtils.getDateByGranularity(cellValue, dateGranularity);
+        return _dtableUtils.DateUtils.getDateByGranularity(cellValue, dateGranularity, firstDayOfWeek);
       }
     case _dtableUtils.CellType.MULTIPLE_SELECT:
       {
@@ -1209,8 +1314,9 @@ BaseUtils.getGroupLabel = (cellValue, formulaRow, column, dateGranularity, geoGr
           if (array_type === 'date' && (formulaCellValue === null || formulaCellValue === void 0 ? void 0 : formulaCellValue.length) === 1) {
             const dateCellValue = formulaCellValue[0];
             if (!dateGranularity) return (0, _dtableUtils.getDateDisplayString)(dateCellValue);
-            if (dateGranularity.toUpperCase() === 'QUARTER') return _dtableUtils.DateUtils.getDateByGranularity(dateCellValue, 'QUARTAR');
-            return _dtableUtils.DateUtils.getDateByGranularity(dateCellValue, dateGranularity);
+            const firstDayOfWeek = (0, _index.getFirstDayOfWeekForGroupby)('base');
+            if (dateGranularity.toUpperCase() === 'QUARTER') return _dtableUtils.DateUtils.getDateByGranularity(dateCellValue, 'QUARTAR', firstDayOfWeek);
+            return _dtableUtils.DateUtils.getDateByGranularity(dateCellValue, dateGranularity, firstDayOfWeek);
           }
           return (0, _dtableUtils.getFormulaDisplayString)(formulaCellValue, data, {
             tables: value.tables
@@ -1802,7 +1908,9 @@ BaseUtils.sortDataByGroupName = function (data, groupKey, groupColumn) {
         });
         _BaseUtils.sortCharts(data, groupColumn, 'name');
         data.forEach(item => {
-          item.name = item['oldName'];
+          if (Object.prototype.hasOwnProperty.call(item, 'oldName')) {
+            item.name = item['oldName'];
+          }
         });
         return data;
       }

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

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "BaseUtils", {
   }
 });
 exports.ChartUtils = void 0;
-var _lodashEs = require("lodash-es");
+var _lodash = require("lodash");
 var _context = _interopRequireDefault(require("../../context"));
 var _ = require("..");
 var _intl = _interopRequireDefault(require("../../intl"));
@@ -23,10 +23,12 @@ class ChartUtils {}
 exports.ChartUtils = ChartUtils;
 ChartUtils.calculateChart = async (chart, value, callback) => {
   if (!_baseUtils.default.isValidExistChart(value.tables, chart)) {
-    const tip_message = 'Please_complete_the_chart_configuration_first';
+    const roleId = _context.default.getSetting('roleId');
+    const isEditAppPage = _context.default.getSetting('isEditAppPage');
+    const tip_message = !roleId && !isEditAppPage ? 'The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations' : 'Please_complete_the_chart_configuration_first';
     return callback && callback('', tip_message, null);
   }
-  const id = (0, _lodashEs.uniqueId)();
+  const id = (0, _lodash.uniqueId)();
   const requestData = () => {
     _context.default.queryChartResult({
       chart,

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

@@ -74,7 +74,7 @@ async function calculateBasicChart(chart, value, _ref) {
   const {
     type: groupby_column_type
   } = groupbyColumn;
-  if ((_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupby_column_type) || (0, _columnUtils.islinkDateFormula)(groupbyColumn)) && !groupby_date_granularity) {
+  if ((_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupby_column_type) || (0, _columnUtils.isDateFormulaColumn)(groupbyColumn)) && !groupby_date_granularity) {
     groupby_date_granularity = _constants.CHART_SUMMARY_TYPE.MONTH;
     if ([_constants.CHART_TYPE.HEAT_MAP].includes(chart.type)) {
       groupby_date_granularity = _constants.CHART_SUMMARY_TYPE.DAY;
@@ -169,7 +169,7 @@ async function calculateGroupingChart(chart, value, _ref2) {
   const {
     type: groupby_column_type
   } = groupbyColumn;
-  if ((_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupby_column_type) || (0, _columnUtils.islinkDateFormula)(groupbyColumn)) && !groupby_date_granularity) {
+  if ((_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupby_column_type) || (0, _columnUtils.isDateFormulaColumn)(groupbyColumn)) && !groupby_date_granularity) {
     groupby_date_granularity = _constants.CHART_SUMMARY_TYPE.MONTH;
   }
   if (groupby_column_type === _dtableUtils.CellType.GEOLOCATION && !groupby_geolocation_granularity) {
@@ -189,7 +189,7 @@ async function calculateGroupingChart(chart, value, _ref2) {
   });
   return results;
 }
-function getGroupChartStatResult(table, value, groupbyColumn, groupColumnKey, statRows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyGateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType) {
+function getGroupChartStatResult(table, value, groupbyColumn, groupColumnKey, statRows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType) {
   let columnGroupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, groupColumnKey);
   if (!columnGroupbyColumn) {
     return [];
@@ -206,7 +206,7 @@ function getGroupChartStatResult(table, value, groupbyColumn, groupColumnKey, st
       let name = _baseUtils.default.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, value);
       let groupName = columnGroupbyColumn.name;
       if (!columnGroupbyMultipleNumericColumn) {
-        groupName = _baseUtils.default.getGroupLabel(row[columnGroupbyColumn.key], formulaRow, columnGroupbyColumn, columnGroupbyGateGranularity, columnGroupbyGeolocationGranularity, value);
+        groupName = _baseUtils.default.getGroupLabel(row[columnGroupbyColumn.key], formulaRow, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, value);
       }
       if (isGroupbyColumnDataAsAnArray) {
         if (name.length === 0 && includeEmpty) {
@@ -471,7 +471,7 @@ async function calculateCustomBar(statItem, value, _ref4) {
   } = groupbyColumn;
   let groupbyDateGranularity = x_axis_date_granularity;
   let groupbyGeolocationGranularity = x_axis_geolocation_granularity;
-  if ((_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || (0, _columnUtils.islinkDateFormula)(groupbyColumn)) && !groupbyDateGranularity) {
+  if ((_dtableUtils.DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || (0, _columnUtils.isDateFormulaColumn)(groupbyColumn)) && !groupbyDateGranularity) {
     groupbyDateGranularity = _constants.CHART_SUMMARY_TYPE.MONTH;
   }
   if (groupbyColumnType === _dtableUtils.CellType.GEOLOCATION && !groupbyGeolocationGranularity) {

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

@@ -35,9 +35,15 @@ async function calculator(chart, dtableValue, _ref) {
       numberList.push(cellValue);
     }
   });
+  let value;
   if (summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
-    return statRows.length;
+    value = statRows.length;
+  } else {
+    value = _baseUtils.default.getSummaryResult(numberList, summary_method);
   }
-  return _baseUtils.default.getSummaryResult(numberList, summary_method);
+  return {
+    value,
+    rows: statRows
+  };
 }
 var _default = exports.default = calculator;

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

@@ -27,7 +27,10 @@ async function calculator(chart, value, _ref) {
   const selectedColumn2 = (0, _dtableUtils.getTableColumnByKey)(selectedTable, total_value_column_key);
   const statRows = await getViewRows(selectedView, selectedTable);
   if (statRows.length === 0) {
-    return 0;
+    return {
+      value: 0,
+      rows: []
+    };
   }
   const isNumericColumn1 = selectedColumn1 && (0, _dtableUtils.isNumericColumn)(selectedColumn1);
   const isNumericColumn2 = selectedColumn2 && (0, _dtableUtils.isNumericColumn)(selectedColumn2);
@@ -62,8 +65,14 @@ async function calculator(chart, value, _ref) {
     result2 = _baseUtils.default.getSummaryResult(numberList2, total_value_column_summary_method);
   }
   if (result2 === 0) {
-    return 0;
+    return {
+      value: 0,
+      rows: statRows
+    };
   }
-  return result1 / result2;
+  return {
+    value: result1 / result2,
+    rows: statRows
+  };
 }
 var _default = exports.default = calculator;

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

@@ -243,7 +243,10 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
   const isGroupbyColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(groupbyColumn);
   const rowGroupbyColumn = (0, _dtableUtils.getTableColumnByKey)(table, column_groupby_column_key);
   if (!rowGroupbyColumn) {
-    return calculateOneDimensionTable(chart, value);
+    return calculateOneDimensionTable(chart, value, {
+      getViewRows,
+      getTableFormulaResults
+    });
   }
   const isRowGroupbyColumnDataAsAnArray = (0, _cellValueUtils.isArrayCellValue)(rowGroupbyColumn);
   const statRows = await getViewRows(view, table);

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

@@ -74,6 +74,7 @@ async function calculator(chart, value, _ref) {
     };
     updateBasicChartRows(data, nameIndex, name, dataItem, row);
   });
+  _baseUtils.default.sortCharts(data, selectedXAxisColumn, 'name');
   return data;
 }
 var _default = exports.default = calculator;

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

@@ -31,6 +31,7 @@ async function calculator(chart, value, _ref) {
   const selectedView = selectedTable && (0, _dtableUtils.getViewById)(selectedTable.views, view_id);
   const selectedColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, date_column_key);
   const resultMap = new Map();
+  const rowsMap = new Map(); // Store rows for each time period
   let formulaRows = {};
   const rows = await getViewRows(selectedView, selectedTable);
   const numericColumn = (0, _dtableUtils.getTableColumnByKey)(selectedTable, summary_column_key);
@@ -47,6 +48,10 @@ async function calculator(chart, value, _ref) {
     const dateValue = row[selectedColumn.key];
     const label = _baseUtils.default.getGroupLabel(dateValue, {}, selectedColumn, granularity, '', value);
     if (dateValue) {
+      // Store rows for each time period
+      const currentRows = rowsMap.get(label) || [];
+      currentRows.push(row);
+      rowsMap.set(label, currentRows);
       if (summary_type === _constants.CHART_SUMMARY_TYPE.COUNT) {
         const currentCount = resultMap.get(label) || 0;
         resultMap.set(label, currentCount + 1);
@@ -61,7 +66,7 @@ async function calculator(chart, value, _ref) {
       }
     }
   });
-  let currentValues, previousValues;
+  let currentValues, previousValues, currentPeriodRows;
   if (date_granularity === 'days_30' || date_granularity === 'days_7') {
     const {
       compareValue: value1,
@@ -69,13 +74,28 @@ async function calculator(chart, value, _ref) {
     } = (0, _trendUtils.summaryDurationResult)(resultMap, date_granularity, summary_type, summary_method, false);
     currentValues = value1;
     previousValues = value2;
+    // Collect rows for the current period (last 7 or 30 days)
+    currentPeriodRows = [];
+    const currentTime = (0, _dayjs.default)();
+    const days = date_granularity === 'days_30' ? 30 : 7;
+    const formattedEndDate = currentTime.format('YYYY-MM-DD');
+    const formattedMiddleDate = currentTime.subtract(days, 'days').format('YYYY-MM-DD');
+    const endDate = (0, _dayjs.default)(formattedEndDate);
+    const middleDate = (0, _dayjs.default)(formattedMiddleDate);
+    rowsMap.forEach((periodRows, label) => {
+      const key = (0, _dayjs.default)(label);
+      if (key.isValid() && key >= middleDate && key < endDate) {
+        currentPeriodRows = currentPeriodRows.concat(periodRows);
+      }
+    });
   } else {
     const {
       compareDate,
       comparedDate
-    } = (0, _trendUtils.getCompareDate)(date_granularity);
+    } = (0, _trendUtils.getCompareDate)(date_granularity, 'base');
     currentValues = resultMap.get(compareDate);
     previousValues = resultMap.get(comparedDate);
+    currentPeriodRows = rowsMap.get(compareDate) || [];
     if (summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
       if (currentValues) {
         currentValues = _baseUtils.default.getSummaryResult(currentValues, summary_method);
@@ -116,7 +136,8 @@ async function calculator(chart, value, _ref) {
     latest: currentValues,
     previous: previousValues,
     result,
-    type
+    type,
+    rows: currentPeriodRows
   };
 }
 var _default = exports.default = calculator;