sea-chart 1.1.97 → 1.1.99

package/dist/settings/advance-bar-settings/data-settings.js

@@ -5,7 +5,7 @@ import CommonDataSettings from '../widgets/common-data-settings';
 import Divider from '../widgets/divider';
 import GroupBy from '../widgets/group-by';
 import YAxisGroupSettings from '../widgets/y-axis-group-settings';
-import { islinkDateFormula } from '../../utils/column-utils';
+import { isDateFormulaColumn } from '../../utils/column-utils';
 import { CHART_SUMMARY_TYPE, GEOLOCATION_FORMAT_CITY, GEOLOCATION_FORMAT_MAP, SUPPORT_DATA_SORT_CHART_TYPES } from '../../constants';
 import intl from '../../intl';
 import DataSort from '../widgets/data-sort';
@@ -38,7 +38,7 @@ const DataSettings = _ref => {
       update['x_axis_date_granularity'] = null;
       update['x_axis_geolocation_granularity'] = null;
     } else {
-      if (DATE_COLUMN_OPTIONS.includes(type) || islinkDateFormula(column)) {
+      if (DATE_COLUMN_OPTIONS.includes(type) || isDateFormulaColumn(column)) {
         update['x_axis_date_granularity'] = CHART_SUMMARY_TYPE.MONTH;
         update['x_axis_geolocation_granularity'] = null;
       } else if (type === CellType.GEOLOCATION) {

package/dist/settings/bar-settings/data-settings.js

@@ -7,7 +7,7 @@ import Divider from '../widgets/divider';
 import GroupBy from '../widgets/group-by';
 import BasicSummary from '../widgets/basic-summary';
 import DataSort from '../widgets/data-sort';
-import { islinkDateFormula } from '../../utils/column-utils';
+import { isDateFormulaColumn } from '../../utils/column-utils';
 import { CHART_SUMMARY_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, CHART_SUMMARY_TYPES, GEOLOCATION_FORMAT_CITY, GEOLOCATION_FORMAT_MAP, CHART_TYPE } from '../../constants';
 const DataSettings = _ref => {
   let {
@@ -38,7 +38,7 @@ const DataSettings = _ref => {
       update['x_axis_date_granularity'] = null;
       update['x_axis_geolocation_granularity'] = null;
     } else {
-      if (DATE_COLUMN_OPTIONS.includes(type) || islinkDateFormula(column)) {
+      if (DATE_COLUMN_OPTIONS.includes(type) || isDateFormulaColumn(column)) {
         update['x_axis_date_granularity'] = CHART_SUMMARY_TYPE.MONTH;
         update['x_axis_geolocation_granularity'] = null;
       } else if (type === CellType.GEOLOCATION) {

package/dist/settings/widgets/group-by.js

@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import classnames from 'classnames';
 import { Label, FormGroup } from 'reactstrap';
 import { CellType, COLUMNS_ICON_CONFIG, DATE_COLUMN_OPTIONS, getTableById, getTableColumnByKey } from 'dtable-utils';
-import { islinkDateFormula } from '../../utils/column-utils';
+import { isDateFormulaColumn } from '../../utils/column-utils';
 import { CHART_SUPPORT_COLUMNS, DATE_GRANULATES, GEOLOCATION_GRANULATES, CHART_SUMMARY_SHOW, GEOLOCATION_FORMAT_MAP, CHART_TYPE, TIME_COLUMN_LIST, COMPLETENESS_GROUPBY_SUPPORTED_COLUMN_TYPE, NUMBERIC_COLUMN_TYPE, MIRROR_COLUMN_LIST } from '../../constants';
 import intl from '../../intl';
 class GroupBy extends Component {
@@ -185,7 +185,7 @@ class GroupBy extends Component {
       const {
         type: groupbyColumnType
       } = groupbyColumn;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, (DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || islinkDateFormula(groupbyColumn)) && this.renderGroupbyDateGranulates(), groupbyColumnType === CellType.GEOLOCATION && this.geolocationGranulatesOptions.length > 0 && this.renderGroupbyGeolocationGranulates());
+      return /*#__PURE__*/React.createElement(React.Fragment, null, (DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || isDateFormulaColumn(groupbyColumn)) && this.renderGroupbyDateGranulates(), groupbyColumnType === CellType.GEOLOCATION && this.geolocationGranulatesOptions.length > 0 && this.renderGroupbyGeolocationGranulates());
     };
     this.dateGranulatesOptions = this.generatorGranulatesOptions(DATE_GRANULATES);
     this.initOptions(_props);

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

@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 import { CellType, DATE_COLUMN_OPTIONS, FORMULA_COLUMN_TYPES_MAP, getTableById, getViewById, getTableColumnByKey } from 'dtable-utils';
 import { CHART_STYLE_COLORS, CHART_SUMMARY_TYPE, CHART_TYPE, Y_AXIS_TYPE_PREFIX } from '../../../constants';
-import { getColorFromSingleSelectColumn, islinkDateFormula } from '../../column-utils';
+import { getColorFromSingleSelectColumn, isDateFormulaColumn } from '../../column-utils';
 import { isArrayCellValue } from '../../cell-value-utils';
 import { getFormattedLabel, isValidRow } from '../../row-utils';
 import { fixGeoGranularity } from '../../map';
@@ -67,7 +67,7 @@ async function calculateBasicChart(chart, value, _ref) {
   const {
     type: groupby_column_type
   } = groupbyColumn;
-  if ((DATE_COLUMN_OPTIONS.includes(groupby_column_type) || islinkDateFormula(groupbyColumn)) && !groupby_date_granularity) {
+  if ((DATE_COLUMN_OPTIONS.includes(groupby_column_type) || isDateFormulaColumn(groupbyColumn)) && !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;
@@ -162,7 +162,7 @@ async function calculateGroupingChart(chart, value, _ref2) {
   const {
     type: groupby_column_type
   } = groupbyColumn;
-  if ((DATE_COLUMN_OPTIONS.includes(groupby_column_type) || islinkDateFormula(groupbyColumn)) && !groupby_date_granularity) {
+  if ((DATE_COLUMN_OPTIONS.includes(groupby_column_type) || isDateFormulaColumn(groupbyColumn)) && !groupby_date_granularity) {
     groupby_date_granularity = CHART_SUMMARY_TYPE.MONTH;
   }
   if (groupby_column_type === CellType.GEOLOCATION && !groupby_geolocation_granularity) {
@@ -464,7 +464,7 @@ async function calculateCustomBar(statItem, value, _ref4) {
   } = groupbyColumn;
   let groupbyDateGranularity = x_axis_date_granularity;
   let groupbyGeolocationGranularity = x_axis_geolocation_granularity;
-  if ((DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || islinkDateFormula(groupbyColumn)) && !groupbyDateGranularity) {
+  if ((DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || isDateFormulaColumn(groupbyColumn)) && !groupbyDateGranularity) {
     groupbyDateGranularity = CHART_SUMMARY_TYPE.MONTH;
   }
   if (groupbyColumnType === CellType.GEOLOCATION && !groupbyGeolocationGranularity) {

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

@@ -64,23 +64,23 @@ SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivo
         return cellValue || null;
       }
     case CellType.FORMULA:
+      {
+        if (Array.isArray(cellValue)) {
+          const validValue = getFormulaDisplayString(cellValue, data) || [];
+          return validValue;
+        }
+        return cellValue || null;
+      }
     case CellType.LINK_FORMULA:
       {
         const {
-          array_type,
           result_type
         } = data || {};
-        const validValue = 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 DateUtils.getDateByGranularity(validValue, 'QUARTAR');
-          return DateUtils.getDateByGranularity(validValue, dateGranularity);
-        }
-
         // handles mutiple select
         if (result_type === 'array') {
           return cellValue;
         }
+        const validValue = getFormulaDisplayString(cellValue, data) || [];
         if (!validValue && validValue !== 0) {
           return null;
         }

package/dist/utils/column-utils.js

@@ -173,16 +173,27 @@ export const isStatisticMirrorColumn = column => {
   if (!column) return false;
   return MIRROR_COLUMN_LIST.includes(column.type);
 };
-export const islinkDateFormula = column => {
+export 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 === FORMULA_RESULT_TYPE.DATE) return true;
+  }
+  return false;
+};
+export const isDateColumn = column => {
+  if (column) {
+    const {
+      type
+    } = column;
+    return type === CellType.CTIME || type === CellType.MTIME || type === CellType.DATE;
   }
   return false;
 };

package/dist/utils/index.js

@@ -248,6 +248,6 @@ export const getFirstDayOfWeekForGroupby = source => {
     } = dtableSettings || {};
     firstDayOfWeek = date_settings === null || date_settings === void 0 ? void 0 : date_settings.first_day_of_week;
   }
-  return firstDayOfWeek;
+  return firstDayOfWeek || 'Monday';
 };
 export { ObjectUtils, chartColumn2SqlColumn, summaryMethodColumn2SqlColumn, ChartUtils, ChartDataSQL, BaseUtils };

package/dist/utils/sql/column-2-sql-column.js

@@ -2,7 +2,7 @@ import { CellType, getTableColumnByKey } from 'dtable-utils';
 import { CHART_SUMMARY_TYPE, CHART_TYPE, DTABLE_DB_SUMMARY_METHOD, MAP_LEVEL } from '../../constants';
 import BaseUtils from '../chart-utils/base-utils';
 import { fixGeoGranularity } from '../map';
-import { getSqlGroup } from '../column-utils';
+import { getSqlGroup, isDateColumn, isDateFormulaColumn } from '../column-utils';
 import intl from '../../intl';
 import { getFirstDayOfWeekForGroupby } from '../index';
 export const column2SqlColumn = function (column) {
@@ -12,15 +12,13 @@ export const column2SqlColumn = function (column) {
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const {
     name,
-    type,
     key
   } = column;
   const validColumnName = `\`${name}\``;
   const startOfWeek = getFirstDayOfWeekForGroupby('app').toLowerCase();
-  switch (type) {
-    case CellType.DATE:
-    case CellType.MTIME:
-    case CellType.CTIME:
+  switch (true) {
+    case isDateColumn(column):
+    case isDateFormulaColumn(column):
       {
         const validDateGranularity = dateGranularity && dateGranularity.toUpperCase();
         if (['DAY', 'DAYS_7', 'DAYS_30'].includes(validDateGranularity)) {
@@ -71,7 +69,7 @@ export const column2SqlColumn = function (column) {
           key: sqlColumnName
         };
       }
-    case CellType.GEOLOCATION:
+    case column.type === CellType.GEOLOCATION:
       {
         const validGeolocationGranularity = geolocationGranularity && geolocationGranularity.toUpperCase();
         if (validGeolocationGranularity === 'PROVINCE') {

package/package.json

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