sea-chart 0.0.30 → 0.0.31-beta

package/dist/context.js

@@ -1,7 +1,7 @@
 import { getTableById } from 'dtable-utils';
 import CollaboratorManager from './utils/collaborator-manager';
 import { ChartDataSQL } from './utils';
-import { CHART_TYPE_IMAGE } from './constants';
+import { CHART_TYPE, CHART_TYPE_IMAGE } from './constants';
 class Context {
   constructor() {
     this.queryChartResult = async _ref => {
@@ -32,28 +32,55 @@ class Context {
         onFail && onFail(error);
         return;
       }
-
-      // Custom bar
-      if (Array.isArray(sql) && sql.length !== 0) {
-        for (let i = 0; i < sql.length; i++) {
-          await this.api.sqlQuery(sql[i].sqlString).then(res => {
-            sql[i].res = res;
-          }).catch(error => {
-            onFail && onFail(error);
+      const type = chart.config.type;
+      if (type === CHART_TYPE.BAR_CUSTOM) {
+        let allPromises = [];
+        Array.isArray(sql) && sql.forEach(item => {
+          if (item) {
+            const res = this.api.sqlQuery(item);
+            allPromises.push(res);
+          } else {
+            allPromises.push(new Promise((resolve, reject) => {
+              return resolve({
+                data: {
+                  success: true,
+                  results: []
+                }
+              });
+            }));
+          }
+        });
+        let newRes = {
+          data: {
+            success: true,
+            results: []
+          }
+        };
+        return Promise.all(allPromises).then(allRes => {
+          if (!allRes.every(item => item.data.success)) {
+            onFail && onFail('Network_error');
+            return;
+          }
+          allRes.forEach(res => {
+            const {
+              results
+            } = res.data;
+            newRes.data.results.push(results);
           });
-        }
-        onSuccess && onSuccess(sql);
-        return;
+          onSuccess && onSuccess(newRes);
+        }).catch(error => {
+          onFail && onFail(error);
+        });
       }
       return this.api.sqlQuery(sql).then(res => {
         onSuccess && onSuccess(res);
       }).catch(error => {
         var _error$response, _error$response$data;
         // if geolocation format is wrong, still display the chart
-        if (chart.config.type.includes('map') && (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.error_message.includes('invalid geolocation format'))) {
+        if (type.includes('map') && (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.error_message.includes('invalid geolocation format'))) {
           var _error$response2, _error$response2$data;
           console.error(error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.message);
-          onSuccess({
+          onSuccess && onSuccess({
             data: {
               results: [],
               success: true

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

@@ -1,4 +1,4 @@
-var _class;
+var _BaseUtils;
 import shallowEqual from 'shallowequal';
 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 } from 'dtable-utils';
@@ -31,7 +31,7 @@ class BaseUtils {
     };
   }
 }
-_class = BaseUtils;
+_BaseUtils = BaseUtils;
 // valid chart
 BaseUtils.isValidCombinationChart = (config, table) => {
   const summaryLeftColumnKey = config.y_axis_left_summary_column;
@@ -101,7 +101,7 @@ BaseUtils.isValidExistChart = (tables, chart) => {
   if (!groupByColumnKey) return false;
   if (!getTableColumnByKey(table, groupByColumnKey)) return false;
   if (type === CHART_TYPE.COMBINATION) {
-    const isExist = _class.isValidCombinationChart(config, table);
+    const isExist = _BaseUtils.isValidCombinationChart(config, table);
     if (!isExist) return false;
   } else {
     const summaryColumnKey = config.summary_column_key || config.y_axis_summary_column_key || config.horizontal_axis_column_key;
@@ -193,7 +193,7 @@ BaseUtils.getGroupName = (tables, chart) => {
     config
   } = chart;
   const table = getTableById(tables, config.table_id);
-  const column = _class.getGroupColumn(table, chart);
+  const column = _BaseUtils.getGroupColumn(table, chart);
   return column.name;
 };
 BaseUtils.getChartGroups = charts => {
@@ -228,7 +228,7 @@ BaseUtils.getSummaryValueDisplayString = function (summaryColumn, summaryValue)
   const {
     data
   } = summaryColumn;
-  if (_class.isDateSummaryColumn(summaryColumn)) {
+  if (_BaseUtils.isDateSummaryColumn(summaryColumn)) {
     if (typeof summaryValue !== 'string') return summaryValue;
 
     // Compatible with previous data
@@ -263,7 +263,7 @@ BaseUtils.getSummaryValue = (_ref, currentValue, nextValue) => {
     summaryMethod,
     summaryColumn
   } = _ref;
-  if (_class.isDateSummaryColumn(summaryColumn)) {
+  if (_BaseUtils.isDateSummaryColumn(summaryColumn)) {
     if (summaryMethod === 'MAX') {
       if (currentValue && nextValue) {
         return dayjs(currentValue).isBefore(nextValue) ? nextValue : currentValue;
@@ -340,7 +340,7 @@ BaseUtils.isChartStyleChanged = (prevElement, currElement) => {
   return !shallowEqual(prevBorder, currBorder) || !shallowEqual(prevTitle, currTitle);
 };
 BaseUtils.shouldChartComponentUpdate = (prevProps, currentProps) => {
-  return !_class.isChartEqual(prevProps.chart, currentProps.chart) ||
+  return !_BaseUtils.isChartEqual(prevProps.chart, currentProps.chart) ||
   // chart attributes changed
   !shallowEqual(prevProps.canvasStyle, currentProps.canvasStyle) ||
   // canvasStyle
@@ -350,7 +350,7 @@ BaseUtils.shouldChartComponentUpdate = (prevProps, currentProps) => {
   // columnGroupbyColumn's data、type changed or not exist
   !shallowEqual(prevProps.summaryColumn, currentProps.summaryColumn) ||
   // summaryColumn's data、type changed or not exist
-  _class._isChartDataChange(prevProps, currentProps) || _class.isChartStyleChanged(prevProps.chart, currentProps.chart);
+  _BaseUtils._isChartDataChange(prevProps, currentProps) || _BaseUtils.isChartStyleChanged(prevProps.chart, currentProps.chart);
 };
 BaseUtils._isCombinationDataChange = (prevResult, currentResult) => {
   if (prevResult.value_left !== currentResult.value_left) return true;
@@ -366,7 +366,7 @@ BaseUtils._isChartDataChange = (prevProps, currentProps) => {
     result: oldData
   } = currentProps;
   if (chart.config.type === CHART_TYPE.COMBINATION) {
-    return _class._isCombinationDataChange(newData, oldData);
+    return _BaseUtils._isCombinationDataChange(newData, oldData);
   }
   if (!newData && !oldData) return false;
   if (!newData && oldData || newData && !oldData) return true;
@@ -421,7 +421,7 @@ BaseUtils.getPieColorSet = (tables, chart, result) => {
     table_id,
     groupby_column_key: column_id
   } = chart.config;
-  const column = _class.getColumn(tables, table_id, column_id);
+  const column = _BaseUtils.getColumn(tables, table_id, column_id);
   const {
     type: columnType
   } = column || {};
@@ -488,7 +488,7 @@ BaseUtils.formatPieChartData = (data, chart, tables) => {
     const value = item.value;
     if (value >= threshold) {
       item.percent = String(Number.parseFloat(value / sum * 100).toFixed(1)) + '%';
-      const color = _class.getPieColor(column, index, item);
+      const color = _BaseUtils.getPieColor(column, index, item);
       item.color = color;
       colorSet.push(color);
       filteredData.push(item);
@@ -603,7 +603,7 @@ BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorK
 };
 BaseUtils.updateTableViewList = (result, column, nameKey, colorKey) => {
   result.forEach(result => {
-    _class.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey);
+    _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey);
   });
 };
 // sort chart
@@ -739,10 +739,10 @@ BaseUtils.formatGroupsLabel = (results, chart, tables) => {
       group_name
     } = item;
     if (groupbyColumn) {
-      _class.convertResultName(item, groupbyColumn, name, 'name', 'color');
+      _BaseUtils.convertResultName(item, groupbyColumn, name, 'name', 'color');
     }
     if (columnGroupbyColumn) {
-      _class.convertResultName(item, columnGroupbyColumn, group_name, 'group_name', 'group_color');
+      _BaseUtils.convertResultName(item, columnGroupbyColumn, group_name, 'group_name', 'group_color');
     }
   });
 };
@@ -1166,19 +1166,19 @@ BaseUtils.getSummaryResult = function (results, summaryMethod) {
   switch (summaryMethod) {
     case CHART_SUMMARY_TYPE.MAX:
       {
-        return _class.getMax(numericResults);
+        return _BaseUtils.getMax(numericResults);
       }
     case CHART_SUMMARY_TYPE.MIN:
       {
-        return _class.getMin(numericResults);
+        return _BaseUtils.getMin(numericResults);
       }
     case CHART_SUMMARY_TYPE.SUM:
       {
-        return _class.getSum(numericResults, precision);
+        return _BaseUtils.getSum(numericResults, precision);
       }
     case CHART_SUMMARY_TYPE.MEAN:
       {
-        return _class.getMean(numericResults, precision);
+        return _BaseUtils.getMean(numericResults, precision);
       }
     case CHART_SUMMARY_TYPE.Distinct_values:
       {
@@ -1225,7 +1225,7 @@ BaseUtils.getSum = function (list) {
 BaseUtils.getMean = function (list) {
   let precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 8;
   if (list.length === 0) return 0;
-  const sum = _class.getSum(list);
+  const sum = _BaseUtils.getSum(list);
   return Number.parseFloat((sum / list.length).toFixed(precision));
 };
 BaseUtils.summaryDurationResult = (result, duration, summaryType, summaryMethod, useDataDb, dbDateKey, valueKey) => {
@@ -1271,11 +1271,11 @@ BaseUtils.summaryDurationResult = (result, duration, summaryType, summaryMethod,
   // }
 
   if (summaryType === CHART_SUMMARY_TYPE.ADVANCED) {
-    comparedValue = _class.getSummaryResult(comparedValue, summaryMethod);
-    compareValue = _class.getSummaryResult(compareValue, summaryMethod);
+    comparedValue = _BaseUtils.getSummaryResult(comparedValue, summaryMethod);
+    compareValue = _BaseUtils.getSummaryResult(compareValue, summaryMethod);
   } else {
-    compareValue = _class.getSummaryResult(compareValue, 'Sum');
-    comparedValue = _class.getSummaryResult(comparedValue, 'Sum');
+    compareValue = _BaseUtils.getSummaryResult(compareValue, 'Sum');
+    comparedValue = _BaseUtils.getSummaryResult(comparedValue, 'Sum');
   }
   return {
     compareValue,

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

@@ -12,16 +12,8 @@ ChartUtils.calculateChart = (chart, value, callback) => {
     chart,
     tables: value.tables,
     onSuccess: function (res) {
+      var _res$data;
       let dataSources = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SQLStatisticsUtils.dataSources;
-      // Custom Bar
-      if (Array.isArray(res)) {
-        if (dataSources === OriginalDataUtils.dataSources) {
-          OriginalDataUtils.calculateChart(chart, value, callback);
-          return;
-        }
-        SQLStatisticsUtils.calculateChart(chart, value, callback, res);
-        return;
-      }
       const {
         success,
         error_message
@@ -34,7 +26,7 @@ ChartUtils.calculateChart = (chart, value, callback) => {
         OriginalDataUtils.calculateChart(chart, value, callback);
         return;
       }
-      SQLStatisticsUtils.calculateChart(chart, value, callback, res);
+      SQLStatisticsUtils.calculateChart(chart, value, callback, (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.results) || []);
     },
     onFail: err => {
       let errorMessage = String(err) || 'Network_error';

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

@@ -1,4 +1,4 @@
-var _class;
+var _OriginalDataUtils;
 import { getTableById, getViewById } from 'dtable-utils';
 import PivotTableCalculator from './pivot-table-calculator';
 import BasicChartCalculator from './basic-chart-calculator';
@@ -34,7 +34,7 @@ const calculatorMap = {
   [CHART_TYPE.DASHBOARD]: DashboardCalculator
 };
 class OriginalDataUtils {}
-_class = OriginalDataUtils;
+_OriginalDataUtils = OriginalDataUtils;
 OriginalDataUtils.dataSources = 'original_data';
 OriginalDataUtils.isValidExistChart = (tables, chart) => {
   const isValid = BaseUtils.isValidExistChart(tables || [], chart);
@@ -49,7 +49,7 @@ OriginalDataUtils.isValidExistChart = (tables, chart) => {
   return true;
 };
 OriginalDataUtils.calculateChart = async (chart, value, callback) => {
-  if (!_class.isValidExistChart((value === null || value === void 0 ? void 0 : value.tables) || [], chart)) {
+  if (!_OriginalDataUtils.isValidExistChart((value === null || value === void 0 ? void 0 : value.tables) || [], chart)) {
     const tip_message = 'Please_complete_the_chart_configuration_first';
     return callback && callback('', tip_message, null);
   }
@@ -76,7 +76,7 @@ OriginalDataUtils.calculateChart = async (chart, value, callback) => {
     const chartTableColumns = table.columns;
     return callback && callback('', '', {
       result,
-      data_sources: _class.dataSources,
+      data_sources: _OriginalDataUtils.dataSources,
       groupbyColumn,
       columnGroupbyColumn,
       summaryColumn,