sea-chart 1.1.67 → 1.1.69

package/dist/model/funnel.js

@@ -1,5 +1,5 @@
 import { CellType } from 'dtable-utils';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep } from 'lodash';
 import { CHART_SUMMARY_TYPE, CHART_TYPE, FUNNEL_LABEL_FORMAT, FUNNEL_LABEL_POSITIONS } from '../constants';
 import BaseModel from './base-model';
 class Funnel extends BaseModel {

package/dist/settings/funnel-settings/components/funnel-layer-setting.js

@@ -2,7 +2,7 @@ import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
 import { COLUMNS_ICON_CONFIG } from 'dtable-utils';
 import React, { useCallback, useMemo } from 'react';
 import { FormGroup, Label } from 'reactstrap';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep } from 'lodash';
 import intl from '../../../intl';
 import DndList from './dnd-list';
 export default function FunnelLayerSetting(_ref) {

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

@@ -1,4 +1,4 @@
-import { uniqueId } from 'lodash-es';
+import { uniqueId } from 'lodash';
 import context from '../../context';
 import { getErrorMessage } from '..';
 import intl from '../../intl';

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

@@ -1,8 +1,7 @@
 var _SQLStatisticsUtils;
 import dayjs from 'dayjs';
 import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, DateUtils } from 'dtable-utils';
-import { isObject } from 'lodash';
-import { cloneDeep } from 'lodash-es';
+import { isObject, cloneDeep } from 'lodash';
 import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, TABLE_DIMENSIONS, Y_AXIS_TYPE_PREFIX, STYLE_COLORS, TREND_TYPES, CHART_STYLE_COLORS, MAP_CHART_TYPES } from '../../constants';
 import { chartColumn2SqlColumn, summaryMethodColumn2SqlColumn } from '../sql';
 import { getClientLinkDisplayString } from '../cell-format-utils';
@@ -883,6 +882,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 = convertQuarterToDate(name);
@@ -898,42 +898,65 @@ 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);
         }
       }
     }
   }
   let comparedResult = [];
   let rangeResult = [];
+  let sortedDateRange = Array.from(dateRangeResult.entries()).sort((a, b) => a[1].date - b[1].date);
+  let sortedDateCompared = Array.from(dateComparedResult.entries()).sort((a, b) => a[1].date - b[1].date);
   const data = (summaryColumn === null || summaryColumn === void 0 ? void 0 : summaryColumn.data) || {};
-  for (let item of dateRangeResult) {
-    let value = item[1];
+  for (let item of sortedDateRange) {
+    let value = item[1].value;
+    const rows = item[1].rows;
     let formatted_value = value;
     if (isAdvanced) {
-      value = getSummaryResult(item[1], y_axis_summary_method, data.precision);
+      value = getSummaryResult(item[1].value, y_axis_summary_method, data.precision);
       formatted_value = getFormattedValue(value, summaryColumn, y_axis_summary_method);
     }
     rangeResult.push({
@@ -941,19 +964,21 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
       group_name: groupName1,
       raw_name: item[0],
       value,
+      rows,
       formatted_value
     });
   }
   let index = 0;
-  for (let item of dateComparedResult) {
+  for (let item of sortedDateCompared) {
     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 = getSummaryResult(item[1], y_axis_summary_method, data.precision);
+      value = getSummaryResult(item[1].value, y_axis_summary_method, data.precision);
       formatted_value = getFormattedValue(value, summaryColumn, y_axis_summary_method);
     }
     const newItem = {
@@ -961,6 +986,7 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
       group_name: groupName2,
       raw_name: item[0],
       value,
+      rows,
       formatted_value
     };
     if (display_increase) {
@@ -979,6 +1005,8 @@ SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQL
   }
   BaseUtils.updateSummaryValuePrecision(comparedResult, summaryColumn, 'value');
   BaseUtils.updateSummaryValuePrecision(rangeResult, summaryColumn, 'value');
+  BaseUtils.sortCharts(rangeResult, groupbyColumn, 'name');
+  BaseUtils.sortCharts(comparedResult, groupbyColumn, 'name');
   return [...comparedResult, ...rangeResult];
 };
 SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {

package/dist/utils/index.js

@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep } from 'lodash';
 import { GENERIC_KEY_2_SIMILAR_KEYS, GEOLOCATION_GRANULARITY, MAP_LEVEL, MUNICIPALITIES, regions } from '../constants';
 import intl from '../intl';
 import { SERVER_ERROR_DISPLAY_KEY, SERVER_ERROR_MSG } from '../constants/error';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "1.1.67",
+  "version": "1.1.69",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",