sea-chart 1.1.95 → 1.1.96-alpha.2

package/dist/settings/index.js

@@ -107,7 +107,7 @@ const Settings = _ref => {
     }
   }, /*#__PURE__*/React.createElement(DepartmentsContext.Provider, {
     value: {
-      departments: departments || []
+      departments
     }
   }, /*#__PURE__*/React.createElement(DataSettings, {
     dataSources: dataSources,

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

@@ -4,12 +4,12 @@ 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, isArchiveView, getViewById, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP } 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, HORIZONTAL_BAR_CHART_TYPES, COMPLTETELESS_CHART_TYPES, CHART_STYLE_CONFIG_SETTING_KEYS, MAP_CHART_TYPES } from '../../constants';
 import { getClientFormulaDisplayString } from '../cell-format-utils';
-import { getKnownCollaboratorByEmail, generateDefaultUser, getUsers } from '../collaborator-utils';
+import { getKnownCollaboratorByEmail, generateDefaultUser } from '../collaborator-utils';
 import { getDateColumnFormat, getColumnByKey } from '../column-utils';
 import intl from '../../intl';
 import context from '../../context';
 import { isValidCollaboratorEmail } from '../collaborator';
-import { formatRowTotal } from '../index';
+import { formatRowTotal, getFirstDayOfWeekForGroupby } from '../index';
 export function findIfColumnDataIsArray(column) {
   // link-formula may also be an array type column
   let isGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[column.type];
@@ -1180,11 +1180,11 @@ BaseUtils.getGroupLabel = (cellValue, formulaRow, column, dateGranularity, geoGr
         if (!dateGranularity) {
           return getDateDisplayString(cellValue);
         }
+        const firstDayOfWeek = getFirstDayOfWeekForGroupby('base');
         if (dateGranularity.toUpperCase() === 'QUARTER') {
-          // TODO: fix the unknown word 'QUARTAR'
-          return DateUtils.getDateByGranularity(cellValue, 'QUARTAR');
+          return DateUtils.getDateByGranularity(cellValue, 'QUARTAR', firstDayOfWeek);
         }
-        return DateUtils.getDateByGranularity(cellValue, dateGranularity);
+        return DateUtils.getDateByGranularity(cellValue, dateGranularity, firstDayOfWeek);
       }
     case CellType.MULTIPLE_SELECT:
       {
@@ -1218,8 +1218,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 getDateDisplayString(dateCellValue);
-            if (dateGranularity.toUpperCase() === 'QUARTER') return DateUtils.getDateByGranularity(dateCellValue, 'QUARTAR');
-            return DateUtils.getDateByGranularity(dateCellValue, dateGranularity);
+            const firstDayOfWeek = getFirstDayOfWeekForGroupby('base');
+            if (dateGranularity.toUpperCase() === 'QUARTER') return DateUtils.getDateByGranularity(dateCellValue, 'QUARTAR', firstDayOfWeek);
+            return DateUtils.getDateByGranularity(dateCellValue, dateGranularity, firstDayOfWeek);
           }
           return getFormulaDisplayString(formulaCellValue, data, {
             tables: value.tables

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

@@ -182,7 +182,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 = getTableColumnByKey(table, groupColumnKey);
   if (!columnGroupbyColumn) {
     return [];
@@ -199,7 +199,7 @@ function getGroupChartStatResult(table, value, groupbyColumn, groupColumnKey, st
       let name = BaseUtils.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, value);
       let groupName = columnGroupbyColumn.name;
       if (!columnGroupbyMultipleNumericColumn) {
-        groupName = BaseUtils.getGroupLabel(row[columnGroupbyColumn.key], formulaRow, columnGroupbyColumn, columnGroupbyGateGranularity, columnGroupbyGeolocationGranularity, value);
+        groupName = BaseUtils.getGroupLabel(row[columnGroupbyColumn.key], formulaRow, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, value);
       }
       if (isGroupbyColumnDataAsAnArray) {
         if (name.length === 0 && includeEmpty) {

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

@@ -30,7 +30,6 @@ SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivo
     case CellType.CTIME:
     case CellType.MTIME:
       {
-        // handled in sql query result
         return cellValue;
       }
     case CellType.NUMBER:

package/dist/utils/index.js

@@ -230,4 +230,24 @@ export const getEventClassName = e => {
   if (!e || !e.target) return '';
   return e.target.getAttribute('class') || '';
 };
+export const getFirstDayOfWeekForGroupby = source => {
+  let firstDayOfWeek = 'Monday';
+  if (source === 'base') {
+    const {
+      settings
+    } = window.app.state.value;
+    const {
+      date_settings
+    } = settings || {};
+    firstDayOfWeek = date_settings === null || date_settings === void 0 ? void 0 : date_settings.first_day_of_week;
+  } else if (source === 'app') {
+    var _window$app, _window$app$dtableUti;
+    const dtableSettings = (_window$app = window.app) === null || _window$app === void 0 ? void 0 : (_window$app$dtableUti = _window$app.dtableUtils) === null || _window$app$dtableUti === void 0 ? void 0 : _window$app$dtableUti.settings;
+    const {
+      date_settings
+    } = dtableSettings || {};
+    firstDayOfWeek = date_settings === null || date_settings === void 0 ? void 0 : date_settings.first_day_of_week;
+  }
+  return firstDayOfWeek;
+};
 export { ObjectUtils, chartColumn2SqlColumn, summaryMethodColumn2SqlColumn, ChartUtils, ChartDataSQL, BaseUtils };

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

@@ -4,6 +4,7 @@ import BaseUtils from '../chart-utils/base-utils';
 import { fixGeoGranularity } from '../map';
 import { getSqlGroup } from '../column-utils';
 import intl from '../../intl';
+import { getFirstDayOfWeekForGroupby } from '../index';
 export const column2SqlColumn = function (column) {
   let {
     dateGranularity,
@@ -15,6 +16,7 @@ export const column2SqlColumn = function (column) {
     key
   } = column;
   const validColumnName = `\`${name}\``;
+  const startOfWeek = getFirstDayOfWeekForGroupby('app').toLowerCase();
   switch (type) {
     case CellType.DATE:
     case CellType.MTIME:
@@ -29,7 +31,7 @@ export const column2SqlColumn = function (column) {
           };
         }
         if (validDateGranularity === 'WEEK') {
-          const sqlColumnName = `ISODATE(STARTOFWEEK(${validColumnName}, "monday"))`;
+          const sqlColumnName = `ISODATE(STARTOFWEEK(${validColumnName}, "${startOfWeek}"))`;
           return {
             name: sqlColumnName,
             key: sqlColumnName

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "1.1.95",
+  "version": "1.1.96-alpha.2",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -24,7 +24,7 @@
   "peerDependencies": {
     "@antv/scale": "0.3.14",
     "dtable-ui-component": "^6.0.46",
-    "dtable-utils": "~5.0.*",
+    "dtable-utils": "^5.0.22-alpha.2",
     "prop-types": "15.8.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
@@ -143,9 +143,9 @@
     "resolve": "1.12.0",
     "resolve-url-loader": "5.0.0",
     "rimraf": "^5.0.7",
-    "svgo-loader": "^3.0.0",
     "sass-loader": "13.3.2",
     "style-loader": "^1.0.1",
+    "svgo-loader": "^3.0.0",
     "terser-webpack-plugin": "4.2.3",
     "ts-pnp": "1.1.4",
     "url-loader": "4.1.1",