sea-chart 0.0.76 → 0.0.77

package/dist/components/statistic-record-dialog/index.js

@@ -255,7 +255,7 @@ class StatisticRecordDialog extends React.Component {
         window.app.cacheFormulaResults(table.rows, {
           targetViewId: view._id,
           table,
-          dtableStoreValue
+          value: dtableStoreValue
         });
       }
       return {

package/dist/constants/index.js

@@ -160,6 +160,7 @@ export const THEME_NAME_MAP = {
 };
 export const CHART_THEME_COLOR = {
   dark: {
+    pivotTextColor: '#ffffff',
     textColor: '#ffffff',
     fontSize: 13,
     gridColor: '#4E4E56',
@@ -168,6 +169,7 @@ export const CHART_THEME_COLOR = {
     cardColor: '#ffffff'
   },
   light: {
+    pivotTextColor: '#212529',
     textColor: '#666666',
     fontSize: 13,
     gridColor: '#F3F3F3',

package/dist/locale/lang/de.js

@@ -83,7 +83,7 @@ const de = {
   "Calculate_the_number_of_records_in_two_time_periods": "Anzahl der Einträge in zwei Zeitperioden vergleichen",
   "Use_a_field_to_calculate_the_sum_maximum_or_minimum_value_of_records_in_two_time_periods": "Ein Feld verwenden, um die Summe, das Maximum, das Minimum oder den Durchschnitt von Datensätzen in zwei Zeiträumen zu berechnen",
   "No_options": "Keine Optionen",
-  "Alignment": "Alignment",
+  "Alignment": "Ausrichtung",
   "Text_horizontal_alignment": "Horizontale Ausrichtung des Textes",
   "Please_input_date": "Datum eingeben",
   "Filter": "Filtern",
@@ -140,8 +140,10 @@ const de = {
   "Hour": "Stunde",
   "Minute": "Minute",
   "Done": "Erledigt",
+  "Error": "Fehler",
   "Internal_server_error": "Interner Serverfehler",
   "Network_error": "Netzwerkfehler",
+  "Permission_denied": "Zugriff verweigert",
   "There_are_some_problems_with_the_filters": "Die Filterbedingungen sind abnormal. Bitte setzen sie die Filterbedingungen in den Ansichtseinstellungen zurück.",
   "Please_complete_the_chart_configuration_first": "Schließen Sie die Konfiguration des Diagramms ab.",
   "Not_used": "Nicht verwendet",
@@ -179,7 +181,7 @@ const de = {
   "Statistic_field": "Statisches Feld",
   "target": "Ziel",
   "completed": "vollständig",
-  "Completed_field": "Completed Field",
+  "Completed_field": "Abgeschlossenes Feld",
   "Target_field": "Zielfeld",
   "Show_percentage": "Prozent anzeigen",
   "Name_field": "Name",
@@ -239,7 +241,7 @@ const de = {
   "Previous_30_days": "Vorherige 30 Tage",
   "The_day_before_yesterday": "Vorgestern",
   "Can_not_compare_with_{var}": "Ein Vergleich mit {var} ist nicht möglich.",
-  "Number": "Number",
+  "Number": "Zahl",
   "polylines": "Polygonzug",
   "curves": "Kurven",
   "Line_type": "Linientyp",

package/dist/locale/lang/en.js

@@ -140,8 +140,10 @@ const en = {
   "Hour": "Hour",
   "Minute": "Minute",
   "Done": "Done",
+  "Error": "Error",
   "Internal_server_error": "Internal server error",
   "Network_error": "Network error",
+  "Permission_denied": "Permission denied",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Please complete the chart configuration first",
   "Not_used": "Not used",

package/dist/locale/lang/es.js

@@ -140,8 +140,10 @@ const es = {
   "Hour": "Hour",
   "Minute": "Minute",
   "Done": "Done",
+  "Error": "Error",
   "Internal_server_error": "Internal server error",
   "Network_error": "Network error",
+  "Permission_denied": "Permission denied",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Please complete the chart configuration first",
   "Not_used": "Not used",

package/dist/locale/lang/fr.js

@@ -83,7 +83,7 @@ const fr = {
   "Calculate_the_number_of_records_in_two_time_periods": "Calculer le nombre d'enregistrements pour deux périodes de temps",
   "Use_a_field_to_calculate_the_sum_maximum_or_minimum_value_of_records_in_two_time_periods": "Utiliser une colonne pour calculer la somme, le maximum, le minimum ou la moyenne des enregistrements pour deux périodes de temps",
   "No_options": "Il n'y a pas d'options.",
-  "Alignment": "Alignment",
+  "Alignment": "Alignement",
   "Text_horizontal_alignment": "Alignement de texte horizontal",
   "Please_input_date": "Veuillez entrer la date",
   "Filter": "Filtrer",
@@ -140,8 +140,10 @@ const fr = {
   "Hour": "Heure",
   "Minute": "Minute",
   "Done": "Fait",
+  "Error": "Erreur",
   "Internal_server_error": "Erreur interne du serveur",
   "Network_error": "Erreur réseau",
+  "Permission_denied": "Permission refusée",
   "There_are_some_problems_with_the_filters": "Les conditions de filtrage sont anormales. Veuillez réinitialiser les conditions de filtrage dans les paramètres de vue.",
   "Please_complete_the_chart_configuration_first": "Compléter la configuration du diagramme",
   "Not_used": "Ne pas utilisé",
@@ -179,7 +181,7 @@ const fr = {
   "Statistic_field": "Champ statistique",
   "target": "cible",
   "completed": "complété",
-  "Completed_field": "Completed Field",
+  "Completed_field": "Champ complété",
   "Target_field": "Champ cible",
   "Show_percentage": "Afficher le pourcentage",
   "Name_field": "Nom",
@@ -199,7 +201,7 @@ const fr = {
   "Y_axis_column_not_found": "La colonne pour l'axe des y n'a pas été trouvée.",
   "Numeric_column_not_found": "La colonne numérique n'a pas été trouvée.",
   "Target_column_not_found": "La colonne cible n'a pas été trouvée",
-  "Completed_column_not_found": "Completed column not found",
+  "Completed_column_not_found": "Colonne complétée introuvable",
   "Target_summary_method_is_not_valid": "La méthode de résumé cible n'est pas valide.",
   "Grid_size": "Taille de la grille\n",
   "Grid_distance": "Ecart entre les grilles",
@@ -239,7 +241,7 @@ const fr = {
   "Previous_30_days": "30 jours précédents",
   "The_day_before_yesterday": "Avant-hier",
   "Can_not_compare_with_{var}": "Il est impossible de comparer avec {var}.",
-  "Number": "Number",
+  "Number": "Nombre",
   "polylines": "Ligne polygonale",
   "curves": "Courbes",
   "Line_type": "Type de ligne",

package/dist/locale/lang/pt.js

@@ -140,8 +140,10 @@ const pt = {
   "Hour": "Hour",
   "Minute": "Minute",
   "Done": "Done",
+  "Error": "Error",
   "Internal_server_error": "Internal server error",
   "Network_error": "Network error",
+  "Permission_denied": "Permission denied",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Please complete the chart configuration first",
   "Not_used": "Not used",

package/dist/locale/lang/ru.js

@@ -140,8 +140,10 @@ const ru = {
   "Hour": "Hour",
   "Minute": "Minute",
   "Done": "Done",
+  "Error": "Error",
   "Internal_server_error": "Internal server error",
   "Network_error": "Network error",
+  "Permission_denied": "Permission denied",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Please complete the chart configuration first",
   "Not_used": "Not used",

package/dist/locale/lang/zh_CN.js

@@ -83,7 +83,7 @@ const zh_CN = {
   "Calculate_the_number_of_records_in_two_time_periods": "计算两个时间段的记录数",
   "Use_a_field_to_calculate_the_sum_maximum_or_minimum_value_of_records_in_two_time_periods": "使用字段计算两个时间段内记录的最大值或最小值之和",
   "No_options": "没有选项",
-  "Alignment": "Alignment",
+  "Alignment": "对齐方式",
   "Text_horizontal_alignment": "文本水平对齐",
   "Please_input_date": "请输入日期",
   "Filter": "过滤",
@@ -140,8 +140,10 @@ const zh_CN = {
   "Hour": "时",
   "Minute": "分",
   "Done": "完成",
+  "Error": "错误",
   "Internal_server_error": "服务端错误",
   "Network_error": "网络错误",
+  "Permission_denied": "权限错误",
   "There_are_some_problems_with_the_filters": "过滤器有一些问题。",
   "Please_complete_the_chart_configuration_first": "请先完成图表配置",
   "Not_used": "不使用",
@@ -239,7 +241,7 @@ const zh_CN = {
   "Previous_30_days": "之前 30 天",
   "The_day_before_yesterday": "前天",
   "Can_not_compare_with_{var}": "无法和 {var} 比较",
-  "Number": "Number",
+  "Number": "数字",
   "polylines": "折线",
   "curves": "曲线",
   "Line_type": "线型",

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

@@ -5,6 +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 { CHART_SUMMARY_TYPE, GEOLOCATION_FORMAT_CITY, GEOLOCATION_FORMAT_MAP } from '../../constants';
 import intl from '../../intl';
 const DataSettings = _ref => {
@@ -36,7 +37,7 @@ const DataSettings = _ref => {
       update['x_axis_date_granularity'] = null;
       update['x_axis_geolocation_granularity'] = null;
     } else {
-      if (DATE_COLUMN_OPTIONS.includes(type)) {
+      if (DATE_COLUMN_OPTIONS.includes(type) || islinkDateFormula(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,6 +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 { 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 {
@@ -37,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)) {
+      if (DATE_COLUMN_OPTIONS.includes(type) || islinkDateFormula(column)) {
         update['x_axis_date_granularity'] = CHART_SUMMARY_TYPE.MONTH;
         update['x_axis_geolocation_granularity'] = null;
       } else if (type === CellType.GEOLOCATION) {

package/dist/settings/index.js

@@ -2,7 +2,7 @@ import React, { useCallback, useMemo, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import intl from '../intl';
-import { settingsContext } from '../utils/contexts';
+import { settingsContext, DepartmentsContext } from '../utils/contexts';
 import { eventStopPropagation } from '../utils';
 import { BaseUtils } from '../utils';
 import { CHART_SETTINGS_TYPE, CHART_SETTINGS } from '../constants';
@@ -18,7 +18,8 @@ const Settings = _ref => {
     hideTitleStyleSetting,
     tables,
     onChange,
-    children
+    children,
+    departments
   } = _ref;
   const [type, setType] = useState(CHART_SETTINGS_TYPE.DATA);
   const [labelColorConfigs, setLabelColorConfigs] = useState([]);
@@ -83,12 +84,16 @@ const Settings = _ref => {
   }, /*#__PURE__*/React.createElement("div", {
     id: "sea-chart-settings-content",
     className: "chart-settings-content"
-  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(DataSettings, {
+  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(DepartmentsContext.Provider, {
+    value: {
+      departments
+    }
+  }, /*#__PURE__*/React.createElement(DataSettings, {
     dataSources: dataSources,
     chart: chart,
     tables: tables,
     onChange: modifyStatistic
-  }), type === CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
+  })), type === CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
     chart: chart,
     labelColorConfigs: labelColorConfigs,
     onChange: modifyStyle

package/dist/settings/widgets/data-filter/index.js

@@ -1,10 +1,11 @@
 import _DTableFiltersPopover from "dtable-ui-component/lib/DTableFiltersPopover";
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useContext, useMemo, useState } from 'react';
 import { Label, FormGroup } from 'reactstrap';
 import { getTableById } from 'dtable-utils';
 import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
 import context from '../../../context';
+import { DepartmentsContext } from '../../../utils/contexts';
 import './index.css';
 const DataFilter = _ref => {
   let {
@@ -13,6 +14,9 @@ const DataFilter = _ref => {
     onChange
   } = _ref;
   const [isFilterSetterShow, setIsFilterSetterShow] = useState(false);
+  const {
+    departments
+  } = useContext(DepartmentsContext);
   const toggleFilterPopover = useCallback(event => {
     eventStopPropagation(event);
     setIsFilterSetterShow(!isFilterSetterShow);
@@ -78,6 +82,7 @@ const DataFilter = _ref => {
     filterConjunction: filterConjunction,
     columns: table.columns,
     collaborators: collaborators,
+    departments: departments,
     hidePopover: toggleFilterPopover,
     update: updateFilters
   }))) : /*#__PURE__*/React.createElement("div", {

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

@@ -4,6 +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 { 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 {
@@ -176,7 +177,7 @@ class GroupBy extends Component {
       const {
         type: groupbyColumnType
       } = groupbyColumn;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, DATE_COLUMN_OPTIONS.includes(groupbyColumnType) && this.renderGroupbyDateGranulates(), groupbyColumnType === CellType.GEOLOCATION && this.geolocationGranulatesOptions.length > 0 && this.renderGroupbyGeolocationGranulates());
+      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());
     };
     this.dateGranulatesOptions = this.generatorGranulatesOptions(DATE_GRANULATES);
     this.initOptions(_props);

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

@@ -1052,9 +1052,16 @@ BaseUtils.getGroupLabel = (cellValue, formulaRow, column, dateGranularity, geoGr
         if (!formulaRow) return '';
         let formulaCellValue = formulaRow[key];
         let {
-          result_type
+          result_type,
+          array_type
         } = data || {};
         if (result_type === FORMULA_RESULT_TYPE.ARRAY) {
+          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);
+          }
           return getFormulaDisplayString(formulaCellValue, data, {
             tables: value.tables
           }) || null;
@@ -1378,4 +1385,22 @@ BaseUtils.mergePivotTableSameCollaborator = pivot_rows => {
   });
   return new_pivot_rows;
 };
+BaseUtils.getDateGranularityByType = chart => {
+  const {
+    type
+  } = chart;
+  if ([CHART_TYPE.AREA_GROUP, CHART_TYPE.AREA, CHART_TYPE.BAR, CHART_TYPE.BAR_CUSTOM, CHART_TYPE.BAR_GROUP, CHART_TYPE.BAR_STACK, CHART_TYPE.COMPARE_BAR, CHART_TYPE.COMBINATION, CHART_TYPE.LINE_GROUP, CHART_TYPE.LINE].includes(type)) {
+    return chart['x_axis_date_granularity'];
+  }
+  if ([CHART_TYPE.COMPLETENESS_GROUP, CHART_TYPE.SCATTER, CHART_TYPE.TREND].includes(type)) {
+    return chart['date_granularity'];
+  }
+  if ([CHART_TYPE.HORIZONTAL_BAR, CHART_TYPE.HORIZONTAL_GROUP_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR].includes(type)) {
+    return chart['vertical_axis_date_granularity'];
+  }
+  if ([CHART_TYPE.PIE, CHART_TYPE.RING, CHART_TYPE.TABLE, CHART_TYPE.TREE_MAP].includes(type)) {
+    return chart['groupby_date_granularity'];
+  }
+  return null;
+};
 export default BaseUtils;

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_SUMMARY_TYPE, CHART_TYPE, Y_AXIS_TYPE_PREFIX } from '../../../constants';
-import { getColorFromSingleSelectColumn } from '../../column-utils';
+import { getColorFromSingleSelectColumn, islinkDateFormula } 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) && !groupby_date_granularity) {
+  if ((DATE_COLUMN_OPTIONS.includes(groupby_column_type) || islinkDateFormula(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;
@@ -161,7 +161,7 @@ async function calculateGroupingChart(chart, value, _ref2) {
   const {
     type: groupby_column_type
   } = groupbyColumn;
-  if (DATE_COLUMN_OPTIONS.includes(groupby_column_type) && !groupby_date_granularity) {
+  if ((DATE_COLUMN_OPTIONS.includes(groupby_column_type) || islinkDateFormula(groupbyColumn)) && !groupby_date_granularity) {
     groupby_date_granularity = CHART_SUMMARY_TYPE.MONTH;
   }
   if (groupby_column_type === CellType.GEOLOCATION && !groupby_geolocation_granularity) {
@@ -461,7 +461,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) && !groupbyDateGranularity) {
+  if ((DATE_COLUMN_OPTIONS.includes(groupbyColumnType) || islinkDateFormula(groupbyColumn)) && !groupbyDateGranularity) {
     groupbyDateGranularity = CHART_SUMMARY_TYPE.MONTH;
   }
   if (groupbyColumnType === CellType.GEOLOCATION && !groupbyGeolocationGranularity) {

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

@@ -3,6 +3,7 @@ import { getTableById, getViewById } from 'dtable-utils';
 import { CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES } from '../../../constants';
 import BaseUtils from '../base-utils';
 import context from '../../../context';
+import { getErrorMessage } from '../..';
 import PivotTableCalculator from './pivot-table-calculator';
 import BasicChartCalculator from './basic-chart-calculator';
 import CompareBarCalculator from './compare-bar-chart-calculator';
@@ -83,7 +84,7 @@ OriginalDataUtils.calculateChart = async (chart, value, callback) => {
       chartTableColumns
     });
   } catch (error) {
-    const error_message = 'There_are_some_problems';
+    const error_message = getErrorMessage(error);
     return callback && callback(error_message, '', null);
   }
 };

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

@@ -14,7 +14,8 @@ import BaseUtils from './base-utils';
 class SQLStatisticsUtils {}
 _SQLStatisticsUtils = SQLStatisticsUtils;
 SQLStatisticsUtils.dataSources = 'sql_statistics';
-SQLStatisticsUtils.getGroupLabelFromDB = (cellValue, column, tables, dateGranularity) => {
+SQLStatisticsUtils.getGroupLabelFromDB = (cellValue, column, chart) => {
+  const dateGranularity = BaseUtils.getDateGranularityByType(chart);
   const collaborators = context.getCollaboratorsFromCache();
   const {
     type,
@@ -73,9 +74,15 @@ SQLStatisticsUtils.getGroupLabelFromDB = (cellValue, column, tables, dateGranula
     case CellType.FORMULA:
     case CellType.LINK_FORMULA:
       {
-        const validValue = getFormulaDisplayString(cellValue, data, {
-          tables
-        });
+        const validValue = getFormulaDisplayString(cellValue, data);
+        const {
+          array_type
+        } = 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);
+        }
         if (!validValue && validValue !== 0) return null;
         return validValue;
       }
@@ -228,112 +235,6 @@ SQLStatisticsUtils.getGroupData = (result, groupColumn) => {
   }
   return groupList;
 };
-SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
-  const {
-    groupbyColumn
-  } = columnMap;
-  const {
-    summary_type
-  } = chart.config;
-  const {
-    sqlGroupbyColumnKey,
-    sqlSummaryColumnKey
-  } = chartSQLMap;
-  let pivot_columns = [];
-  let pivot_rows = [];
-  const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
-  let newSqlRows = sqlRows;
-  if (groupbyColumn.type === CellType.COLLABORATOR) {
-    newSqlRows = _SQLStatisticsUtils.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
-  }
-  if (isCount) {
-    let allTotal = 0;
-    newSqlRows.forEach(row => {
-      const total = row[sqlSummaryColumnKey] || 0;
-      allTotal += total;
-      pivot_rows.push({
-        name: _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
-        rows: [],
-        total: {
-          total
-        }
-      });
-    });
-    return {
-      pivot_columns,
-      pivot_rows: pivot_rows,
-      pivot_columns_total: {
-        total: allTotal
-      }
-    };
-  }
-  const {
-    summarySQLColumnName2ColumnKey,
-    summaryTableColumnKey2Column,
-    summaryTableColumnKey2Method
-  } = chartSQLMap;
-  const summaryColumnKeys = Object.values(summarySQLColumnName2ColumnKey);
-  const sqlSummaryColumnKeys = Object.keys(summarySQLColumnName2ColumnKey);
-  let totalTemplate = {};
-  Object.values(summaryColumnKeys).forEach(key => {
-    const summaryMethod = summaryTableColumnKey2Method[key];
-    totalTemplate[key] = BaseUtils.initTotal(summaryMethod);
-    pivot_columns.push({
-      key
-    });
-  });
-  let allTotal = {
-    ...totalTemplate
-  };
-  newSqlRows.forEach(row => {
-    let rowTotal = {
-      ...totalTemplate
-    };
-    sqlSummaryColumnKeys.forEach(key => {
-      let columnKey = summarySQLColumnName2ColumnKey[key];
-      let summaryColumn = summaryTableColumnKey2Column[columnKey];
-      const summaryMethod = summaryTableColumnKey2Method[columnKey];
-      let value = row[key] || BaseUtils.initTotal(summaryMethod);
-      allTotal[columnKey] = BaseUtils.getSummaryValue({
-        summaryColumn,
-        summaryMethod
-      }, allTotal[columnKey], value);
-      if (BaseUtils.isDateSummaryColumn(summaryColumn)) {
-        rowTotal[columnKey] = value;
-      } else if (BaseUtils.isNumericSummaryColumn(summaryColumn)) {
-        rowTotal[columnKey] = rowTotal[columnKey] + value;
-      }
-    });
-    pivot_rows.push({
-      name: _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, tables),
-      rows: [row],
-      total: rowTotal
-    });
-  });
-  if (pivot_columns.length < 2) {
-    const pivot_column = pivot_columns[0];
-    const {
-      key
-    } = pivot_column;
-    pivot_rows.forEach(row => {
-      row.total = {
-        ...row.total,
-        total: row.total[key]
-      };
-    });
-    allTotal = {
-      ...allTotal,
-      total: allTotal[key]
-    };
-  }
-  BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name');
-  return {
-    pivot_columns,
-    pivot_rows,
-    pivot_columns_total: allTotal,
-    dimensions: TABLE_DIMENSIONS.ONE
-  };
-};
 SQLStatisticsUtils.updateTwoDimensionColumns = (pivot_columns, key, _ref) => {
   let {
     isIncludeEmpty,
@@ -549,6 +450,112 @@ pivot_table_total, chart) => {
   });
   return [pivot_columns_total, pivot_table_total];
 };
+SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
+  const {
+    groupbyColumn
+  } = columnMap;
+  const {
+    summary_type
+  } = chart.config;
+  const {
+    sqlGroupbyColumnKey,
+    sqlSummaryColumnKey
+  } = chartSQLMap;
+  let pivot_columns = [];
+  let pivot_rows = [];
+  const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
+  let newSqlRows = sqlRows;
+  if (groupbyColumn.type === CellType.COLLABORATOR) {
+    newSqlRows = _SQLStatisticsUtils.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+  }
+  if (isCount) {
+    let allTotal = 0;
+    newSqlRows.forEach(row => {
+      const total = row[sqlSummaryColumnKey] || 0;
+      allTotal += total;
+      pivot_rows.push({
+        name: _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, chart.config),
+        rows: [],
+        total: {
+          total
+        }
+      });
+    });
+    return {
+      pivot_columns,
+      pivot_rows: pivot_rows,
+      pivot_columns_total: {
+        total: allTotal
+      }
+    };
+  }
+  const {
+    summarySQLColumnName2ColumnKey,
+    summaryTableColumnKey2Column,
+    summaryTableColumnKey2Method
+  } = chartSQLMap;
+  const summaryColumnKeys = Object.values(summarySQLColumnName2ColumnKey);
+  const sqlSummaryColumnKeys = Object.keys(summarySQLColumnName2ColumnKey);
+  let totalTemplate = {};
+  Object.values(summaryColumnKeys).forEach(key => {
+    const summaryMethod = summaryTableColumnKey2Method[key];
+    totalTemplate[key] = BaseUtils.initTotal(summaryMethod);
+    pivot_columns.push({
+      key
+    });
+  });
+  let allTotal = {
+    ...totalTemplate
+  };
+  newSqlRows.forEach(row => {
+    let rowTotal = {
+      ...totalTemplate
+    };
+    sqlSummaryColumnKeys.forEach(key => {
+      let columnKey = summarySQLColumnName2ColumnKey[key];
+      let summaryColumn = summaryTableColumnKey2Column[columnKey];
+      const summaryMethod = summaryTableColumnKey2Method[columnKey];
+      let value = row[key] || BaseUtils.initTotal(summaryMethod);
+      allTotal[columnKey] = BaseUtils.getSummaryValue({
+        summaryColumn,
+        summaryMethod
+      }, allTotal[columnKey], value);
+      if (BaseUtils.isDateSummaryColumn(summaryColumn)) {
+        rowTotal[columnKey] = value;
+      } else if (BaseUtils.isNumericSummaryColumn(summaryColumn)) {
+        rowTotal[columnKey] = rowTotal[columnKey] + value;
+      }
+    });
+    pivot_rows.push({
+      name: _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, chart.config),
+      rows: [row],
+      total: rowTotal
+    });
+  });
+  if (pivot_columns.length < 2) {
+    const pivot_column = pivot_columns[0];
+    const {
+      key
+    } = pivot_column;
+    pivot_rows.forEach(row => {
+      row.total = {
+        ...row.total,
+        total: row.total[key]
+      };
+    });
+    allTotal = {
+      ...allTotal,
+      total: allTotal[key]
+    };
+  }
+  BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name');
+  return {
+    pivot_columns,
+    pivot_rows,
+    pivot_columns_total: allTotal,
+    dimensions: TABLE_DIMENSIONS.ONE
+  };
+};
 SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
   const {
     groupbyColumn,
@@ -589,14 +596,14 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
     if (BaseUtils.isCollaborator(groupbyColumn)) {
       groupbyColumnCellValueKey = groupbyColumnCellValue || [];
     } else {
-      groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
+      groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, chart.config);
     }
     const columnGroupbyColumnCellValue = row[sqlColumnGroupbyColumnKey];
     let columnGroupbyColumnCellValueKey;
     if (BaseUtils.isCollaborator(columnGroupbyColumn)) {
       columnGroupbyColumnCellValueKey = columnGroupbyColumnCellValue || [];
     } else {
-      columnGroupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
+      columnGroupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, chart.config);
     }
     if (BaseUtils.isValidCellValue(columnGroupbyColumnCellValue, groupby_include_empty_cells)) {
       _SQLStatisticsUtils.updateTwoDimensionColumns(pivot_columns, columnGroupbyColumnCellValueKey, {
@@ -660,7 +667,7 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
     isSingleNumericColumn
   };
 };
-SQLStatisticsUtils.basicChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
+SQLStatisticsUtils.basicChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap) => {
   const {
     config
   } = chart;
@@ -688,7 +695,7 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap
       formatted_value = getFormattedValue(cellValue, y_axis_summary_column_key, y_axis_summary_method);
     }
     if (BaseUtils.isValidCellValue(cellValue)) {
-      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, chart.config);
       if (isGroupbyColumnDataAsAnArray) {
         if (!Array.isArray(key) || key.length === 0) {
           let itemIdx = result.findIndex(v => v.name === null);
@@ -802,7 +809,7 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMa
   let result = [];
   sqlRows.forEach(row => {
     const cellValue = row[sqlGroupbyColumnKey];
-    const label = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+    const label = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, chart.config);
     const isEmpty = !label;
     const groupItems = [];
     summaryMethods.forEach((summaryMethod, index) => {
@@ -843,8 +850,7 @@ SQLStatisticsUtils.compareSQLResult2Javascript = (chart, sqlRows, chartSQLMap, c
     x_axis_compared_date_range_end,
     y_axis_summary_type,
     y_axis_summary_method,
-    display_increase,
-    x_axis_date_granularity
+    display_increase
   } = config;
   const groupName1 = "".concat(x_axis_date_range_start, " - ").concat(x_axis_date_range_end);
   const groupName2 = "".concat(x_axis_compared_date_range_start, " - ").concat(x_axis_compared_date_range_end);
@@ -853,7 +859,7 @@ SQLStatisticsUtils.compareSQLResult2Javascript = (chart, sqlRows, chartSQLMap, c
   const isAdvanced = y_axis_summary_type === CHART_SUMMARY_TYPE.ADVANCED;
   sqlRows.forEach(item => {
     const name = item[sqlGroupbyColumnKey];
-    const label = _SQLStatisticsUtils.getGroupLabelFromDB(name, groupbyColumn, tables, x_axis_date_granularity);
+    const label = _SQLStatisticsUtils.getGroupLabelFromDB(name, groupbyColumn, chart.config);
     const value = item[sqlSummaryColumnKey];
     if (name >= x_axis_date_range_start && name <= x_axis_date_range_end) {
       const currentValue = dateRangeResult.get(label);
@@ -977,7 +983,7 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = (chart, sqlRows, chartSQLMa
     sqlRows.forEach(row => {
       const cellValue = row[sqlGroupbyColumnKey];
       const summaryValue = row[sqlSummaryColumnKey];
-      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, chart.config);
       let valueLeft = row[sqlLeftSummaryColumnKey] || 0;
       let valueRight = row[sqlRightSummaryColumnKey] || 0;
       if (y_axis_left_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
@@ -1080,7 +1086,7 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = (chart, sqlRows, chartSQLMa
     });
     sqlRows.forEach((item, index) => {
       const cellValue = item[sqlGroupbyColumnKey];
-      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, tables);
+      const key = _SQLStatisticsUtils.getGroupLabelFromDB(cellValue, groupbyColumn, chart.config);
       let valueRight = item[sqlRightSummaryColumnKey] || 0;
       if (y_axis_right_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
         valueRight = BaseUtils.getPrecisionNumber(valueRight, rightSummaryColumn.data);
@@ -1185,10 +1191,10 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = (chart, sqlRo
   const isColumnGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[columnGroupbyColumn.type];
   sqlRows.forEach(row => {
     const groupbyColumnCellValue = row[sqlGroupbyColumnKey];
-    const groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
+    const groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, chart.config);
     if (BaseUtils.isValidCellValue(groupbyColumnCellValueKey, includeEmpty)) {
       const columnGroupbyColumnCellValue = row[sqlColumnGroupbyColumnKey];
-      const columnGroupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, tables);
+      const columnGroupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, chart.config);
       const count = row[sqlSummaryColumnKey];
       if (isGroupbyColumnDataAsAnArray) {
         if (!Array.isArray(groupbyColumnCellValueKey) || groupbyColumnCellValueKey.length === 0) {
@@ -1237,7 +1243,7 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
     const isGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[groupbyColumn.type];
     sqlRows.forEach(row => {
       const groupbyColumnCellValue = row[sqlGroupbyColumnKey];
-      const groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, tables);
+      const groupbyColumnCellValueKey = _SQLStatisticsUtils.getGroupLabelFromDB(groupbyColumnCellValue, groupbyColumn, chart.config);
       if (BaseUtils.isValidCellValue(groupbyColumnCellValueKey, includeEmpty)) {
         Object.keys(summaryColumns).forEach(sqlSummaryColumnName => {
           const {
@@ -1343,7 +1349,7 @@ SQLStatisticsUtils.mirrorMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQ
     const groupData0 = groupData[0] || {};
     const groupData1 = groupData[1] || {};
     sqlRows.forEach(item => {
-      const label = _SQLStatisticsUtils.getGroupLabelFromDB(item[column_key], groupbyColumn, tables);
+      const label = _SQLStatisticsUtils.getGroupLabelFromDB(item[column_key], groupbyColumn, chart.config);
       const groupValue = item[group_column_key];
       const equal2GroupData0 = groupData0.id === groupValue;
       const equal2GroupData1 = groupData1.id === groupValue;

package/dist/utils/column-utils.js

@@ -5,21 +5,7 @@ import { MIRROR_COLUMN_LIST, CHART_SUMMARY_TYPE } from '../constants';
 import { getClientFormulaDisplayString } from './cell-format-utils';
 import { BaseUtils } from './chart-utils';
 
-// get dtable column options
-export function getColumnOptions(columns) {
-  return columns.map(column => {
-    return {
-      value: column,
-      label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
-        className: "sea-chart-column-icon"
-      }, /*#__PURE__*/React.createElement("i", {
-        className: COLUMNS_ICON_CONFIG[column.type]
-      })), /*#__PURE__*/React.createElement("span", {
-        className: 'select-module select-module-name ml-0'
-      }, column.name))
-    };
-  });
-}
+// is
 export const isMapColumn = column => {
   if (!column) return false;
   const {
@@ -90,11 +76,6 @@ export const isWorldMapColumn = column => {
   }
   return false;
 };
-export const getDateColumnFormat = column => {
-  const format = column && column.data && column.data.format ? column.data.format : DEFAULT_DATE_FORMAT;
-  // Old Europe format is D/M/YYYY new format is DD/MM/YYYY
-  return format;
-};
 export const isCheckboxColumn = column => {
   let {
     type,
@@ -112,116 +93,6 @@ export const isCheckboxColumn = column => {
   }
   return type === CellType.CHECKBOX;
 };
-export const getColumnByKey = (columnKey, columns) => {
-  if (!columnKey || !Array.isArray(columns)) {
-    return null;
-  }
-  return columns.find(column => column.key === columnKey);
-};
-export const getColumnByName = (columnName, columns) => {
-  if (!columnName || !Array.isArray(columns)) {
-    return null;
-  }
-  return columns.find(column => column.name === columnName);
-};
-export const getColumnByType = (columnType, columns) => {
-  if (!columnType || !Array.isArray(columns)) {
-    return null;
-  }
-  return columns.find(column => column.type === columnType);
-};
-export const getColumnByIndex = (index, columns) => {
-  if (Array.isArray(columns)) {
-    return columns[index];
-  }
-  if (typeof Immutable !== 'undefined') {
-    return columns.get(index);
-  }
-  return null;
-};
-export const isNameColumn = column => {
-  return column.key === '0000';
-};
-export const isUrlColumn = column => {
-  let {
-    type,
-    data
-  } = column;
-  if (FORMULA_COLUMN_TYPES_MAP[type]) {
-    const {
-      result_type,
-      array_type
-    } = data || {};
-    if (result_type === FORMULA_RESULT_TYPE.ARRAY) {
-      return array_type === CellType.URL;
-    }
-    return false;
-  }
-  return type === CellType.URL;
-};
-export const getLinkColumns = columns => {
-  if (!columns) {
-    return [];
-  }
-  return columns.filter(column => column.type === CellType.LINK && column.data);
-};
-export const calculateFormulaRows = (rows, columns) => {
-  const COMPUTED_COLUMN_TYPES = [CellType.FORMULA, CellType.LINK_FORMULA, CellType.LINK];
-  const formulaColumns = columns.filter(column => COMPUTED_COLUMN_TYPES.includes(column.type));
-  let formula_rows = {};
-  if (formulaColumns.length > 0) {
-    rows.forEach(row => {
-      let formulaRow = {};
-      formulaColumns.forEach(column => formulaRow[column.key] = row[column.key]);
-      formula_rows[row._id] = formulaRow;
-    });
-  }
-  return formula_rows;
-};
-export const handleCascadeColumn = function (optionValue, columnKey, columns, row) {
-  let updated = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
-  let processedColumns = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : new Set();
-  // This column has already been processed, avoid circular dependency.
-  if (!Array.isArray(columns) || processedColumns.has(columnKey)) {
-    return updated;
-  }
-  processedColumns.add(columnKey);
-  const singleSelectColumns = columns.filter(column => column.type === CellType.SINGLE_SELECT);
-  for (let i = 0; i < singleSelectColumns.length; i++) {
-    const singleSelectColumn = singleSelectColumns[i];
-    const {
-      data: {
-        cascade_column_key,
-        cascade_settings
-      }
-    } = singleSelectColumn;
-    if (cascade_column_key === columnKey) {
-      const {
-        key: childColumnKey
-      } = singleSelectColumn;
-      const childColumnOptions = cascade_settings[optionValue];
-      const childColumnCellValue = row[childColumnKey];
-      const cellValueInOptions = childColumnOptions && childColumnOptions.includes(childColumnCellValue);
-      if (!cellValueInOptions) {
-        updated[childColumnKey] = '';
-        handleCascadeColumn('', childColumnKey, columns, row, updated, processedColumns);
-      }
-    }
-  }
-  return updated;
-};
-export const isFrozen = column => {
-  if (!column) return false;
-  return column.frozen === true;
-};
-export const findLastFrozenColumnIndex = columns => {
-  for (let i = 0; i < columns.length; i++) {
-    if (isFrozen(columns[i])) {
-      return i;
-    }
-  }
-  return -1;
-};
 export const isStatisticMapColumn = column => {
   if (!column) return false;
   const {
@@ -296,6 +167,46 @@ export const isStatisticMirrorColumn = column => {
   if (!column) return false;
   return MIRROR_COLUMN_LIST.includes(column.type);
 };
+export const islinkDateFormula = column => {
+  if (column) {
+    const {
+      type,
+      data
+    } = column;
+    const {
+      array_type
+    } = data || {};
+    if (type === 'link-formula' && array_type === 'date') return true;
+  }
+  return false;
+};
+
+// get
+export function getColumnOptions(columns) {
+  return columns.map(column => {
+    return {
+      value: column,
+      label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+        className: "sea-chart-column-icon"
+      }, /*#__PURE__*/React.createElement("i", {
+        className: COLUMNS_ICON_CONFIG[column.type]
+      })), /*#__PURE__*/React.createElement("span", {
+        className: 'select-module select-module-name ml-0'
+      }, column.name))
+    };
+  });
+}
+export const getDateColumnFormat = column => {
+  const format = column && column.data && column.data.format ? column.data.format : DEFAULT_DATE_FORMAT;
+  // Old Europe format is D/M/YYYY new format is DD/MM/YYYY
+  return format;
+};
+export const getColumnByKey = (columnKey, columns) => {
+  if (!columnKey || !Array.isArray(columns)) {
+    return null;
+  }
+  return columns.find(column => column.key === columnKey);
+};
 export const getColorFromSingleSelectColumn = (column, target) => {
   let {
     type: columnType,
@@ -444,6 +355,12 @@ export const getSqlGroup = (column, groupBy) => {
   }
   return validColumnName;
 };
+export function getSelectColumnOptions(column) {
+  if (!column || !column.data || !Array.isArray(column.data.options)) {
+    return [];
+  }
+  return column.data.options;
+}
 
 // for stacked bar, stacked horizontal bar
 export const sortDataByGroupSum = (data, sortType) => {
@@ -472,10 +389,4 @@ export const formatNumericValue = function (value) {
   } = data;
   value = value || 0;
   return parseFloat(value.toFixed(precision));
-};
-export function getSelectColumnOptions(column) {
-  if (!column || !column.data || !Array.isArray(column.data.options)) {
-    return [];
-  }
-  return column.data.options;
-}
+};

package/dist/utils/contexts.js

@@ -1,2 +1,3 @@
 import React from 'react';
-export const settingsContext = React.createContext('');
+export const settingsContext = React.createContext('');
+export const DepartmentsContext = React.createContext([]);

package/dist/utils/index.js

@@ -1,4 +1,5 @@
 import { GENERIC_KEY_2_SIMILAR_KEYS, GEOLOCATION_GRANULARITY, MAP_LEVEL, MUNICIPALITIES, regions } from '../constants';
+import intl from '../intl';
 import ObjectUtils from './object-utils';
 import { BaseUtils, ChartUtils } from './chart-utils';
 import { ChartDataSQL, chartColumn2SqlColumn, summaryMethodColumn2SqlColumn } from './sql';
@@ -7,10 +8,28 @@ export { getColumnOptions } from 'dtable-utils';
 export { getClientFormulaDisplayString, getClientLinkDisplayString } from './cell-format-utils';
 export { generateChartConfig } from './chart';
 export { getKnownCollaboratorByEmail, getKnownCollaboratorsByEmails, generateDefaultUser } from './collaborator-utils';
-export { getDateColumnFormat, isCheckboxColumn, getColumnByKey, getColumnByName, getColumnByType, getColumnByIndex, isNameColumn, isUrlColumn, getLinkColumns, calculateFormulaRows, handleCascadeColumn, isFrozen, findLastFrozenColumnIndex, isStatisticMapColumn, isStatisticWorldMapColumn, isStatisticMirrorColumn, getColorFromSingleSelectColumn } from './column-utils';
+export { getDateColumnFormat, isCheckboxColumn, getColumnByKey, isStatisticMapColumn, isStatisticWorldMapColumn, isStatisticMirrorColumn, getColorFromSingleSelectColumn } from './column-utils';
 export { generatorKey } from './key-generator';
 export { translateCalendar } from './date-translate';
 export { isFunction } from './common-utils';
+export const getErrorMessage = err => {
+  if (!err.response) {
+    return intl.get('Network_error');
+  }
+  const {
+    status,
+    error_msg
+  } = err.response;
+  if (status === 403) {
+    return intl.get('Permission_denied');
+  }
+  if (status === 500 || status === 502) {
+    return intl.get('Internal_server_error');
+  }
+  // log error to locate problems
+  console.error(err);
+  return intl.get('Error');
+};
 export const getGeoGranularityByLevel = mapLevel => {
   switch (mapLevel) {
     case MAP_LEVEL.PROVINCE:

package/dist/utils/row-record-utils.js

@@ -406,11 +406,13 @@ export const getFormattedCell = function (column, row) {
           displayValue = getLookupImagesDOMs(newValue, column.data.array_type);
           break;
         }
+        const collaborators = context.getCollaboratorsFromCache();
         let formatterProps = {
           value: newValue,
           column,
           isCellSelected: false,
           readOnly: true,
+          collaborators,
           containerClassName: 'sea-chart-statistic-record-formula-container'
         };
         displayValue = createColumnFormatter(type, formatterProps);

package/dist/view/wrapper/table/index.css

@@ -16,10 +16,6 @@
   text-align: center;
 }
 
-.sea-chart-pivot-table th {
-  color: #212529;
-}
-
 .sea-chart-pivot-table th,
 .sea-chart-pivot-table td {
   padding: 10px;

package/dist/view/wrapper/table/one-dimension-table-no-numeric-columns.js

@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { BaseUtils, ObjectUtils } from '../../../utils';
 import intl from '../../../intl';
+import { CHART_THEME_COLOR } from '../../../constants';
 import PivotTableDisplayName from './pivot-table-display-name';
 class OneDimensionTableNoNumericColumns extends PureComponent {
   constructor() {
@@ -61,7 +62,8 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
         groupbyColumn,
         selectedCell,
         summaryColumn,
-        chart
+        chart,
+        globalTheme
       } = this.props;
       const {
         display_total = true,
@@ -104,7 +106,8 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: name,
           column: groupbyColumn,
-          rowData: rowItem
+          rowData: rowItem,
+          globalTheme: globalTheme
         })), display_total && /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
             'pivot-empty-cell': !isValidTotalDisplayValue,
@@ -149,11 +152,15 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
   }
   render() {
     const {
-      groupbyColumn
+      groupbyColumn,
+      globalTheme
     } = this.props;
     if (!groupbyColumn) return '';
     return /*#__PURE__*/React.createElement("table", {
-      className: "sea-chart-pivot-table"
+      className: "sea-chart-pivot-table",
+      style: {
+        color: CHART_THEME_COLOR[globalTheme].pivotTextColor
+      }
     }, this.renderHeader(), this.renderRows());
   }
 }

package/dist/view/wrapper/table/one-dimension-table-with-numeric-columns.js

@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { BaseUtils } from '../../../utils';
 import intl from '../../../intl';
+import { CHART_THEME_COLOR } from '../../../constants';
 import PivotTableDisplayName from './pivot-table-display-name';
 class OneDimensionTableWithNumericColumns extends PureComponent {
   constructor(_props) {
@@ -88,7 +89,8 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
         groupbyColumn,
         selectedCell,
         chartTableColumns,
-        chart
+        chart,
+        globalTheme
       } = this.props;
       const {
         display_total = true,
@@ -125,7 +127,8 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: name,
           column: groupbyColumn,
-          rowData: rowItem
+          rowData: rowItem,
+          globalTheme: globalTheme
         })), Array.isArray(pivot_columns) && pivot_columns.map((columnMap, cellIdx) => {
           const isSelectedCell = selectRowIdx === rowIdx && selectedCellIdx === cellIdx;
           const isSelectedCellTop = selectRowIdx - 1 === rowIdx && selectedCellIdx === cellIdx;
@@ -204,11 +207,15 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
   }
   render() {
     const {
-      groupbyColumn
+      groupbyColumn,
+      globalTheme
     } = this.props;
     if (!groupbyColumn) return '';
     return /*#__PURE__*/React.createElement("table", {
-      className: "sea-chart-pivot-table"
+      className: "sea-chart-pivot-table",
+      style: {
+        color: CHART_THEME_COLOR[globalTheme].pivotTextColor
+      }
     }, this.renderHeader(), this.renderRows());
   }
 }

package/dist/view/wrapper/table/pivot-table-display-name.js

@@ -6,6 +6,7 @@ import { getClientFormulaDisplayString, getKnownCollaboratorByEmail, getColumnOp
 import { Collaborator } from '../../../components';
 import intl from '../../../intl';
 import context from '../../../context';
+import { CHART_THEME_COLOR } from '../../../constants';
 class PivotTableDisplayName extends React.Component {
   constructor(props) {
     super(props);
@@ -290,10 +291,17 @@ class PivotTableDisplayName extends React.Component {
   render() {
     let {
       value,
-      column
+      column,
+      globalTheme
     } = this.props;
+    const AlwaysDisplayLightThemeTypes = [CellType.CREATOR, CellType.LAST_MODIFIER, CellType.SINGLE_SELECT, CellType.MULTIPLE_SELECT, CellType.COLLABORATOR];
+    const isAlwaysLightTheme = AlwaysDisplayLightThemeTypes.includes(column.type);
     let displayName = value ? this.getDisplayName(value, column) : /*#__PURE__*/React.createElement("div", null, "(".concat(intl.get('Empty'), ")"));
-    return /*#__PURE__*/React.createElement(Fragment, null, displayName);
+    return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: isAlwaysLightTheme ? CHART_THEME_COLOR['light'].pivotTextColor : CHART_THEME_COLOR[globalTheme].pivotTextColor
+      }
+    }, displayName));
   }
 }
 export default PivotTableDisplayName;

package/dist/view/wrapper/table/two-dimension-table.js

@@ -1,9 +1,10 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { CellType } from 'dtable-utils';
+import classNames from 'classnames';
 import { BaseUtils } from '../../../utils';
 import intl from '../../../intl';
-import { CHART_SUMMARY_TYPE } from '../../../constants';
+import { CHART_SUMMARY_TYPE, CHART_THEME_COLOR } from '../../../constants';
 import PivotTableDisplayName from './pivot-table-display-name';
 class TwoDimensionTable extends PureComponent {
   constructor() {
@@ -33,7 +34,8 @@ class TwoDimensionTable extends PureComponent {
         groupbyColumn,
         columnGroupbyColumn,
         selectedCell,
-        chart
+        chart,
+        globalTheme
       } = this.props;
       const {
         display_total = true
@@ -78,7 +80,8 @@ class TwoDimensionTable extends PureComponent {
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: original_key,
           column: columnGroupbyColumn || {},
-          rowData: item
+          rowData: item,
+          globalTheme: globalTheme
         }));
       }), display_total && /*#__PURE__*/React.createElement("th", {
         className: classnames('pivot-table-header', {
@@ -97,7 +100,8 @@ class TwoDimensionTable extends PureComponent {
             key: "pivot-column-".concat(idx)
           }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
             value: column.name,
-            column: column || {}
+            column: column || {},
+            globalTheme: globalTheme
           }));
         })));
       }), /*#__PURE__*/React.createElement("th", {
@@ -151,7 +155,8 @@ class TwoDimensionTable extends PureComponent {
         selectedCell,
         summaryColumn,
         summaryMethod,
-        chart
+        chart,
+        globalTheme
       } = this.props;
       const {
         display_total = true,
@@ -205,7 +210,8 @@ class TwoDimensionTable extends PureComponent {
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: name,
           column: groupbyColumn,
-          rowData: rowItem
+          rowData: rowItem,
+          globalTheme: globalTheme
         })), Array.isArray(cells) && cells.map((c, cellIdx) => {
           const isSelectedCell = selectRowIdx === rowIdx && selectedCellIdx === cellIdx;
           const isSelectedCellTop = selectRowIdx - 1 === rowIdx && selectedCellIdx === cellIdx;
@@ -341,11 +347,15 @@ class TwoDimensionTable extends PureComponent {
   render() {
     const {
       groupbyColumn,
-      columnGroupbyColumn
+      columnGroupbyColumn,
+      globalTheme
     } = this.props;
     if (!groupbyColumn) return '';
     return /*#__PURE__*/React.createElement("table", {
-      className: "sea-chart-pivot-table"
+      className: "sea-chart-pivot-table",
+      style: {
+        color: CHART_THEME_COLOR[globalTheme].pivotTextColor
+      }
     }, /*#__PURE__*/React.createElement("caption", {
       className: "column-title"
     }, columnGroupbyColumn.name), /*#__PURE__*/React.createElement("caption", {

package/package.json

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