sea-chart 2.0.37 → 2.0.39

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

@@ -24,7 +24,6 @@ class SQLStatisticsUtils {}
 _SQLStatisticsUtils = SQLStatisticsUtils;
 SQLStatisticsUtils.DATA_SOURCE = 'sql_statistics';
 SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivot) => {
-  const dateGranularity = _baseUtils.default.getDateGranularityByType(chart);
   const {
     type,
     data
@@ -38,7 +37,6 @@ SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivo
     case _dtableUtils.CellType.CTIME:
     case _dtableUtils.CellType.MTIME:
       {
-        // handled in sql query result
         return cellValue;
       }
     case _dtableUtils.CellType.NUMBER:
@@ -73,23 +71,23 @@ SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivo
         return cellValue || null;
       }
     case _dtableUtils.CellType.FORMULA:
+      {
+        if (Array.isArray(cellValue)) {
+          const validValue = (0, _dtableUtils.getFormulaDisplayString)(cellValue, data) || [];
+          return validValue;
+        }
+        return cellValue || null;
+      }
     case _dtableUtils.CellType.LINK_FORMULA:
       {
         const {
-          array_type,
           result_type
         } = data || {};
-        const validValue = (0, _dtableUtils.getFormulaDisplayString)(cellValue, data) || [];
-        if (array_type === 'date' && (cellValue === null || cellValue === void 0 ? void 0 : cellValue.length) === 1) {
-          if (!dateGranularity) return validValue;
-          if (dateGranularity.toUpperCase() === 'QUARTER') return _dtableUtils.DateUtils.getDateByGranularity(validValue, 'QUARTAR');
-          return _dtableUtils.DateUtils.getDateByGranularity(validValue, dateGranularity);
-        }
-
         // handles mutiple select
         if (result_type === 'array') {
           return cellValue;
         }
+        const validValue = (0, _dtableUtils.getFormulaDisplayString)(cellValue, data) || [];
         if (!validValue && validValue !== 0) {
           return null;
         }
@@ -732,7 +730,7 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = async (chart, sqlRows, chart
     }
   }
   _baseUtils.default.sortCharts(result, groupbyColumn, 'name');
-  _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
+  await _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
   _baseUtils.default.updateSummaryValuePrecision(result, summaryColumn, 'value');
   if (_constants.SUPPORT_DATA_SORT_CHART_TYPES.includes(type) && sort_type) {
     _baseUtils.default.sortChartData(result, sort_type);
@@ -854,7 +852,7 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = async (chart, sqlRows, char
     result = assembled;
   }
   _baseUtils.default.sortCharts(result, groupbyColumn, 'name');
-  _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
+  await _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
   _baseUtils.default.updateSummaryValuePrecision(result, summaryColumn, 'value');
   return result;
 };
@@ -891,6 +889,7 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
   const comparedEndDate = new Date(x_axis_compared_date_range_end);
   for (const item of sqlRows) {
     let name = item[sqlGroupbyColumnKey];
+    if (!name) continue;
     const label = await _SQLStatisticsUtils.getGroupLabelFromDB(name, groupbyColumn, chart.config);
     if (x_axis_date_granularity === 'quarter') {
       name = (0, _dateTranslate.convertQuarterToDate)(name);
@@ -906,30 +905,50 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
       const currentValue = dateRangeResult.get(label);
       if (!currentValue) {
         if (isAdvanced) {
-          dateRangeResult.set(label, [value]);
+          dateRangeResult.set(label, {
+            value: [value],
+            date: name,
+            rows: [item]
+          });
         } else {
-          dateRangeResult.set(label, value);
+          dateRangeResult.set(label, {
+            value,
+            date: name,
+            rows: [item]
+          });
         }
       } else {
         if (isAdvanced) {
-          currentValue.push(value);
+          currentValue.value.push(value);
+          currentValue.rows.push(item);
         } else {
-          dateRangeResult.set(label, value + currentValue);
+          currentValue.value = value + currentValue.value;
+          currentValue.rows.push(item);
         }
       }
     } else if (name >= comparedStartDate && name <= comparedEndDate) {
       const currentValue = dateComparedResult.get(label);
       if (!currentValue) {
         if (isAdvanced) {
-          dateComparedResult.set(label, [value]);
+          dateComparedResult.set(label, {
+            value: [value],
+            date: name,
+            rows: [item]
+          });
         } else {
-          dateComparedResult.set(label, value);
+          dateComparedResult.set(label, {
+            value,
+            date: name,
+            rows: [item]
+          });
         }
       } else {
         if (isAdvanced) {
-          dateComparedResult.push(value);
+          currentValue.value.push(value);
+          currentValue.rows.push(item);
         } else {
-          dateComparedResult.set(label, value + currentValue);
+          currentValue.value = value + currentValue.value;
+          currentValue.rows.push(item);
         }
       }
     }
@@ -937,11 +956,23 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
   let comparedResult = [];
   let rangeResult = [];
   const data = (summaryColumn === null || summaryColumn === void 0 ? void 0 : summaryColumn.data) || {};
-  for (let item of dateRangeResult) {
-    let value = item[1];
+
+  // convert Map to array and sort by date
+  const sortedDateRangeEntries = Array.from(dateRangeResult.entries()).sort((a, b) => {
+    return a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0;
+  });
+  const sortedDateComparedEntries = Array.from(dateComparedResult.entries()).sort((a, b) => {
+    return a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0;
+  });
+  for (let item of sortedDateRangeEntries) {
+    const {
+      value: rawValue,
+      rows
+    } = item[1] || {};
+    let value = rawValue;
     let formatted_value = value;
     if (isAdvanced) {
-      value = (0, _columnUtils.getSummaryResult)(item[1], y_axis_summary_method, data.precision);
+      value = (0, _columnUtils.getSummaryResult)(rawValue, y_axis_summary_method, data.precision);
       formatted_value = (0, _columnUtils.getFormattedValue)(value, summaryColumn, y_axis_summary_method);
     }
     rangeResult.push({
@@ -949,19 +980,21 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
       group_name: groupName1,
       raw_name: item[0],
       value,
+      rows: rows || [],
       formatted_value
     });
   }
   let index = 0;
-  for (let item of dateComparedResult) {
+  for (let item of sortedDateComparedEntries) {
     let dateRangeItem = rangeResult[index];
     if (!dateRangeItem) {
       break;
     }
-    let value = item[1];
+    let value = item[1].value;
+    const rows = item[1].rows;
     let formatted_value = value;
     if (isAdvanced) {
-      value = (0, _columnUtils.getSummaryResult)(item[1], y_axis_summary_method, data.precision);
+      value = (0, _columnUtils.getSummaryResult)(item[1].value, y_axis_summary_method, data.precision);
       formatted_value = (0, _columnUtils.getFormattedValue)(value, summaryColumn, y_axis_summary_method);
     }
     const newItem = {
@@ -969,6 +1002,7 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
       group_name: groupName2,
       raw_name: item[0],
       value,
+      rows,
       formatted_value
     };
     if (display_increase) {
@@ -987,6 +1021,8 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
   }
   _baseUtils.default.updateSummaryValuePrecision(comparedResult, summaryColumn, 'value');
   _baseUtils.default.updateSummaryValuePrecision(rangeResult, summaryColumn, 'value');
+  _baseUtils.default.sortCharts(rangeResult, groupbyColumn, 'name');
+  _baseUtils.default.sortCharts(comparedResult, groupbyColumn, 'name');
   return [...comparedResult, ...rangeResult];
 };
 SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -1190,7 +1226,7 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
       }
     }
   }
-  _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
+  await _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
   _baseUtils.default.sortCharts(result, groupbyColumn, 'name');
   _baseUtils.default.updateSummaryValuePrecision(result, summaryColumnLeft, 'value_left');
   _baseUtils.default.updateSummaryValuePrecision(result, summaryColumnRight, 'value_right');
@@ -1296,9 +1332,72 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = async (chart,
       }
     }
   }
+
+  // fill empty group name with value 0
+  const allGroupNames = new Set();
+  const nameGroupMap = new Map();
+  result.forEach(item => {
+    const {
+      name,
+      group_name: groupName
+    } = item;
+    allGroupNames.add(groupName);
+    if (!nameGroupMap.has(name)) {
+      nameGroupMap.set(name, new Set());
+    }
+    nameGroupMap.get(name).add(groupName);
+  });
+  const isEmptyGroupName = groupName => groupName === undefined || groupName === null || groupName === '';
+  const groupNameList = Array.from(allGroupNames).sort((a, b) => {
+    const aEmpty = isEmptyGroupName(a);
+    const bEmpty = isEmptyGroupName(b);
+    if (aEmpty && !bEmpty) return 1;
+    if (!aEmpty && bEmpty) return -1;
+    return "".concat(a !== null && a !== void 0 ? a : '').localeCompare("".concat(b !== null && b !== void 0 ? b : ''));
+  });
+  nameGroupMap.forEach((groupSet, name) => {
+    groupNameList.forEach(groupName => {
+      if (!groupSet.has(groupName)) {
+        result.push({
+          name,
+          rows: [],
+          group_name: groupName,
+          value: 0
+        });
+      }
+    });
+  });
+
+  // ensure each name keeps original order while its group_name entries follow the normalized group order
+  const groupOrder = new Map(groupNameList.map((groupName, index) => [groupName, index]));
+  const nameOrder = [];
+  const seenNames = new Set();
+  const nameBuckets = new Map();
+  result.forEach(item => {
+    if (!seenNames.has(item.name)) {
+      seenNames.add(item.name);
+      nameOrder.push(item.name);
+    }
+    if (!nameBuckets.has(item.name)) {
+      nameBuckets.set(item.name, []);
+    }
+    nameBuckets.get(item.name).push(item);
+  });
+  const orderedResult = [];
+  nameOrder.forEach(name => {
+    const items = nameBuckets.get(name).sort((a, b) => {
+      var _a$group_name, _b$group_name;
+      const aOrder = groupOrder.has(a.group_name) ? groupOrder.get(a.group_name) : Number.MAX_SAFE_INTEGER;
+      const bOrder = groupOrder.has(b.group_name) ? groupOrder.get(b.group_name) : Number.MAX_SAFE_INTEGER;
+      if (aOrder !== bOrder) return aOrder - bOrder;
+      return "".concat((_a$group_name = a.group_name) !== null && _a$group_name !== void 0 ? _a$group_name : '').localeCompare("".concat((_b$group_name = b.group_name) !== null && _b$group_name !== void 0 ? _b$group_name : ''));
+    });
+    orderedResult.push(...items);
+  });
+  result.splice(0, result.length, ...orderedResult);
   _baseUtils.default.sortCharts(result, groupbyColumn, 'name');
-  _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
-  _baseUtils.default.updateTableViewList(result, columnGroupbyColumn, 'group_name', 'group_color', false, false);
+  await _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
+  await _baseUtils.default.updateTableViewList(result, columnGroupbyColumn, 'group_name', 'group_color', false, false);
   _baseUtils.default.updateSummaryValuePrecision(result, summaryColumn, 'value');
   return result;
 };
@@ -1356,7 +1455,7 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = async (chart, sqlRows, ch
       }
     }
     _baseUtils.default.sortCharts(result, groupbyColumn, 'name');
-    _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
+    await _baseUtils.default.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
     const allSummaryColumns = [summaryColumn].concat(summaryColumnsWithMethod.map(item => item.column));
 
     // format precision of enabled precision columns
@@ -1518,7 +1617,7 @@ SQLStatisticsUtils.trendMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
     const {
       compareDate,
       comparedDate
-    } = (0, _trendUtils.getCompareDate)(date_granularity);
+    } = (0, _trendUtils.getCompareDate)(date_granularity, 'app');
     for (const item of sqlRows) {
       if (!item[sqlGroupbyColumnKey]) continue;
       const currentDate = item[sqlGroupbyColumnKey] + '';
@@ -1626,7 +1725,7 @@ SQLStatisticsUtils.sqlResult2JavaScript = async (chart, sqlRows, chartSQLMap, co
     case _constants.CHART_TYPE.COMPLETENESS:
     case _constants.CHART_TYPE.COMPLETENESS_GROUP:
       {
-        const result = _SQLStatisticsUtils.completenessSQlResult(chart, sqlRows, chartSQLMap, tables);
+        const result = await _SQLStatisticsUtils.completenessSQlResult(chart, sqlRows, chartSQLMap, tables);
         return {
           result
         };
@@ -1657,7 +1756,7 @@ SQLStatisticsUtils.sqlResult2JavaScript = async (chart, sqlRows, chartSQLMap, co
     case _constants.CHART_TYPE.SCATTER:
       {
         return {
-          result: _SQLStatisticsUtils.scatterSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: await _SQLStatisticsUtils.scatterSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case _constants.CHART_TYPE.BAR_CUSTOM:
@@ -1711,16 +1810,10 @@ SQLStatisticsUtils._get_completeness_name = (row, column) => {
   }
   return value;
 };
-SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables) => {
-  const {
-    config: {
-      type
-    }
-  } = chart;
-  const isGroup = type === _constants.CHART_TYPE.COMPLETENESS_GROUP;
+SQLStatisticsUtils.completenessSQlResult = async (chart, sqlRows, chartSQLMap, tables) => {
   const {
     sqlColumns,
-    sqlColumnGroupByColumnKey
+    sqlColumnGroupbyColumnKey
   } = chartSQLMap;
   const {
     name_column,
@@ -1728,134 +1821,23 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables)
     target_column,
     column_groupby_column
   } = sqlColumns;
-  const res = [];
-  let summedSqlRows;
   const nameColumnDataAsAnArray = (0, _baseUtils.findIfColumnDataIsArray)(name_column);
-  if (!isGroup) {
-    if (nameColumnDataAsAnArray) {
-      const sumSqlRows = sqlRows.reduce((acc, row) => {
-        const names = row[name_column.key];
-        if (!names) {
-          row[name_column.key] = _intl.default.get('Empty');
-          acc[_intl.default.get('Empty')] = row;
-          return acc;
-        }
-        names.forEach(name => {
-          if (!acc[name]) {
-            row[name_column.key] = name;
-            acc[name] = row;
-          } else {
-            const accRow = acc[name];
-            Object.keys(row).forEach(key => {
-              if (key === completed_column.key || key === target_column.key) {
-                // in case of null
-                if (!row[key]) {
-                  row[key] = 0;
-                }
-                if (!accRow[key]) {
-                  accRow[key] = 0;
-                }
-                accRow[key] = accRow[key] + row[key];
-              }
-            });
-          }
-        });
-        return acc;
-      }, {});
-      summedSqlRows = Object.values(sumSqlRows);
-    } else {
-      const sumSqlRows = sqlRows.reduce((acc, row) => {
-        const nameValue = row[name_column.key];
-        if (!nameValue) {
-          row[name_column.key] = _intl.default.get('Empty');
-          acc[_intl.default.get('Empty')] = row;
-          return acc;
-        }
-        if (!acc[nameValue]) {
-          acc[nameValue] = row;
-        } else {
-          const accRow = acc[nameValue];
-          Object.keys(row).forEach(key => {
-            if (key === completed_column.key || key === target_column.key) {
-              accRow[key] = accRow[key] + row[key];
-            }
-          });
-        }
-        return acc;
-      }, {});
-      summedSqlRows = Object.values(sumSqlRows);
-    }
-  } else {
-    if (nameColumnDataAsAnArray) {
-      const sumSqlRows = sqlRows.reduce((acc, row) => {
-        const groupby = row[sqlColumnGroupByColumnKey];
-        const names = row[name_column.key];
-        if (!names) {
-          const key = "empty_".concat(groupby);
-          row[name_column.key] = _intl.default.get('Empty');
-          acc[key] = row;
-          return acc;
-        }
-        names.forEach(name => {
-          const key = "".concat(name, "_").concat(groupby);
-          if (!acc[key]) {
-            row[name_column.key] = name;
-            acc[key] = row;
-          } else {
-            const accRow = acc[key];
-            Object.keys(row).forEach(k => {
-              if (key === completed_column.key || key === target_column.key) {
-                accRow[key] = accRow[key] + row[key];
-              }
-            });
-          }
-        });
-        return acc;
-      }, {});
-      summedSqlRows = Object.values(sumSqlRows);
-    } else {
-      const sumSqlRows = sqlRows.reduce((acc, row) => {
-        const nameValue = row[name_column.key];
-        const groupby = row[sqlColumnGroupByColumnKey];
-        if (!nameValue) {
-          const key = "empty_".concat(groupby);
-          row[name_column.key] = _intl.default.get('Empty');
-          acc[key] = row;
-          return acc;
-        }
-        const key = "".concat(nameValue, "_").concat(groupby);
-        if (!acc[key]) {
-          acc[key] = row;
-        } else {
-          const accRow = acc[key];
-          Object.keys(row).forEach(key => {
-            if (key === completed_column.key || key === target_column.key) {
-              accRow[key] = accRow[key] + row[key];
-            }
-          });
-        }
-        return acc;
-      }, {});
-      summedSqlRows = Object.values(sumSqlRows);
-    }
+  // group by name_column, so it can only have one value
+  let originalSqlRows = (0, _lodashEs.cloneDeep)(sqlRows);
+  if (nameColumnDataAsAnArray) {
+    sqlRows.forEach(row => {
+      var _row$name_column$key;
+      row[name_column.key] = (_row$name_column$key = row[name_column.key]) === null || _row$name_column$key === void 0 ? void 0 : _row$name_column$key[0];
+    });
   }
-
-  // format the fetched value
-  _baseUtils.default.updateTableViewList(sqlRows, name_column, name_column.key, 'color', false, true);
-  if (sqlColumnGroupByColumnKey) _baseUtils.default.updateTableViewList(sqlRows, column_groupby_column, sqlColumnGroupByColumnKey, 'color', false, false);
-  summedSqlRows.forEach(row => {
+  await _baseUtils.default.updateTableViewList(sqlRows, name_column, name_column.key, 'color', false, true);
+  if (sqlColumnGroupbyColumnKey) await _baseUtils.default.updateTableViewList(sqlRows, column_groupby_column, sqlColumnGroupbyColumnKey, 'color', false, false);
+  const res = [];
+  sqlRows.forEach((row, index) => {
     const nameValue = row[name_column.key];
-    let targetValue;
-    let completedValue;
-    let groupby;
-    if (sqlColumnGroupByColumnKey) {
-      targetValue = row["SUM(".concat(target_column.name, ")")];
-      completedValue = row["SUM(".concat(completed_column.name, ")")];
-      groupby = row[sqlColumnGroupByColumnKey] || _intl.default.get('Empty');
-    } else {
-      completedValue = _SQLStatisticsUtils._get_completeness_name(row, completed_column);
-      targetValue = _SQLStatisticsUtils._get_completeness_name(row, target_column);
-    }
+    const targetValue = row["SUM(".concat(target_column.name, ")")];
+    const completedValue = row["SUM(".concat(completed_column.name, ")")];
+    const groupby = row[sqlColumnGroupbyColumnKey] || _intl.default.get('Empty');
     let completedRate;
     if (!targetValue && completedValue) {
       completedRate = 100;
@@ -1873,7 +1855,8 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables)
       group_name: 'completed',
       groupby,
       color: row.color || _constants.CHART_STYLE_COLORS[0],
-      value: completedValue
+      value: completedValue,
+      rows: [originalSqlRows[index]]
     });
     res.push({
       name: nameValue,
@@ -1882,7 +1865,8 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables)
       value: Math.max(targetValue - completedValue, 0),
       groupby,
       color: '#bdbdbd',
-      completedRate
+      completedRate,
+      rows: [originalSqlRows[index]]
     });
   });
 
@@ -1894,9 +1878,29 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables)
       return 1;
     }
   });
-  return res;
+
+  // deduplicate by (name, group_name)
+  const deduplicatedRes = [];
+  const keyMap = {};
+  res.forEach(item => {
+    const key = "".concat(item.name, "_").concat(item.group_name);
+    if (!keyMap[key]) {
+      keyMap[key] = item;
+      deduplicatedRes.push(item);
+    } else {
+      const existingItem = keyMap[key];
+      existingItem.value = (existingItem.value || 0) + (item.value || 0);
+      if (item.rows) {
+        existingItem.rows = (existingItem.rows || []).concat(item.rows);
+      }
+      if (item.group_name === 'rest' && item.completedRate !== undefined) {
+        existingItem.completedRate = item.completedRate;
+      }
+    }
+  });
+  return deduplicatedRes;
 };
-SQLStatisticsUtils.scatterSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
+SQLStatisticsUtils.scatterSQLResult2JavaScript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {
   const {
     sqlXColumnKey,
     sqlYColumnKey,
@@ -1910,13 +1914,13 @@ SQLStatisticsUtils.scatterSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, c
   // format sql rows
   const originalSqlRows = (0, _lodashEs.cloneDeep)(sqlRows);
   const isScatter = true;
-  _baseUtils.default.updateTableViewList(sqlRows, groupbyColumn, groupbyColumn.key, 'color', isScatter, true);
-  _baseUtils.default.updateTableViewList(sqlRows, summaryColumn, summaryColumn.key, 'color', isScatter, true);
-  if (sqlColumnGroupbyColumnKey) _baseUtils.default.updateTableViewList(sqlRows, columnGroupbyColumn, sqlColumnGroupbyColumnKey, 'color', isScatter, false);
+  await _baseUtils.default.updateTableViewList(sqlRows, groupbyColumn, groupbyColumn.key, 'color', isScatter, true);
+  await _baseUtils.default.updateTableViewList(sqlRows, summaryColumn, summaryColumn.key, 'color', isScatter, true);
+  if (sqlColumnGroupbyColumnKey) await _baseUtils.default.updateTableViewList(sqlRows, columnGroupbyColumn, sqlColumnGroupbyColumnKey, 'color', isScatter, false);
   const res = [];
   sqlRows.forEach((row, index) => {
-    const xValue = row[sqlXColumnKey] ? '' + row[sqlXColumnKey] : _intl.default.get('Empty');
-    const yValue = row[sqlYColumnKey] ? '' + row[sqlYColumnKey] : _intl.default.get('Empty');
+    const xValue = row[sqlXColumnKey];
+    const yValue = row[sqlYColumnKey];
     const groupby = row[sqlColumnGroupbyColumnKey] ? '' + row[sqlColumnGroupbyColumnKey] : null;
     const originalSqlRow = originalSqlRows[index];
     const originalXValue = originalSqlRow[sqlXColumnKey];
@@ -1924,16 +1928,17 @@ SQLStatisticsUtils.scatterSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, c
     const originalGroupby = originalSqlRow[sqlColumnGroupbyColumnKey];
     res.push({
       name: xValue,
-      value: yValue,
+      value: yValue !== null ? Number(yValue) : yValue,
       groupby,
+      rows: [originalSqlRow],
       original_value: {
-        rows: [originalSqlRow],
         name: originalXValue,
         value: originalYValue,
         groupby: originalGroupby
       }
     });
   });
+  _baseUtils.default.sortCharts(res, groupbyColumn, 'name');
   return res;
 };
 SQLStatisticsUtils.mapSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {

package/dist/utils/column-utils.js

@@ -8,7 +8,8 @@ exports.getColumnByKey = exports.getColorFromSingleSelectColumn = exports.format
 exports.getColumnOptions = getColumnOptions;
 exports.getFormattedValue = exports.getDateColumnFormat = void 0;
 exports.getSelectColumnOptions = getSelectColumnOptions;
-exports.sortDataByGroupSum = exports.islinkDateFormula = exports.isWorldMapColumn = exports.isStatisticWorldMapColumn = exports.isStatisticMirrorColumn = exports.isStatisticMapColumn = exports.isMapColumn = exports.isCheckboxColumn = exports.getSummaryResult = exports.getSqlGroup = void 0;
+exports.sortDataByGroupSum = exports.isWorldMapColumn = exports.isStatisticWorldMapColumn = exports.isStatisticMirrorColumn = exports.isStatisticMapColumn = exports.isMapColumn = exports.isDateFormulaColumn = exports.isDateColumn = exports.isCheckboxColumn = exports.getSummaryResult = exports.getSqlGroup = void 0;
+var _DTableColumnIcon2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableColumnIcon"));
 var _dtableUtils = require("dtable-utils");
 var _react = _interopRequireDefault(require("react"));
 var _constants = require("../constants");
@@ -189,30 +190,42 @@ const isStatisticMirrorColumn = column => {
   return _constants.MIRROR_COLUMN_LIST.includes(column.type);
 };
 exports.isStatisticMirrorColumn = isStatisticMirrorColumn;
-const islinkDateFormula = column => {
+const isDateFormulaColumn = column => {
   if (column) {
     const {
       type,
       data
     } = column;
     const {
-      array_type
+      array_type,
+      result_type
     } = data || {};
-    if (type === 'link-formula' && array_type === 'date') return true;
+    // formula or link formula
+    if (type === 'link-formula' && array_type === 'date' || type === 'formula' && result_type === _dtableUtils.FORMULA_RESULT_TYPE.DATE) return true;
+  }
+  return false;
+};
+exports.isDateFormulaColumn = isDateFormulaColumn;
+const isDateColumn = column => {
+  if (column) {
+    const {
+      type
+    } = column;
+    return type === _dtableUtils.CellType.CTIME || type === _dtableUtils.CellType.MTIME || type === _dtableUtils.CellType.DATE;
   }
   return false;
 };
 
 // get
-exports.islinkDateFormula = islinkDateFormula;
+exports.isDateColumn = isDateColumn;
 function getColumnOptions(columns) {
   return columns.map(column => {
     return {
       value: column,
       label: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
         className: "sea-chart-column-icon"
-      }, /*#__PURE__*/_react.default.createElement("i", {
-        className: _dtableUtils.COLUMNS_ICON_CONFIG[column.type]
+      }, /*#__PURE__*/_react.default.createElement(_DTableColumnIcon2.default, {
+        column: column
       })), /*#__PURE__*/_react.default.createElement("span", {
         className: 'select-module select-module-name ml-0'
       }, column.name))

package/dist/utils/contexts.js

@@ -4,8 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.settingsContext = exports.GlobalThemeContext = exports.DepartmentsContext = void 0;
+exports.settingsContext = exports.GlobalThemeContext = exports.FirstDayOfWeekContext = exports.DepartmentsContext = void 0;
 var _react = _interopRequireDefault(require("react"));
 const settingsContext = exports.settingsContext = /*#__PURE__*/_react.default.createContext('');
 const DepartmentsContext = exports.DepartmentsContext = /*#__PURE__*/_react.default.createContext([]);
-const GlobalThemeContext = exports.GlobalThemeContext = /*#__PURE__*/_react.default.createContext({});
+const GlobalThemeContext = exports.GlobalThemeContext = /*#__PURE__*/_react.default.createContext({});
+const FirstDayOfWeekContext = exports.FirstDayOfWeekContext = /*#__PURE__*/_react.default.createContext({
+  firstDayOfWeek: 'Sunday'
+});