dtable-statistic 4.0.7 → 4.0.9

package/es/stat-editor/stat-settings/public-setting/type-settings/index.js

@@ -6,7 +6,7 @@ import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Icon from '../../../../components/icon';
 import StatisticTypesDialog from '../../../../components/dialog/statistic-types-dialog';
-import { STATISTIC_TYPE_SHOW } from '../../../../constants';
+import { STATISTIC_TYPE_SHOW, STAT_TYPE } from '../../../../constants';
 import './index.css';
 var TypeSettings = /*#__PURE__*/function (_Component) {
   _inherits(TypeSettings, _Component);
@@ -25,6 +25,27 @@ var TypeSettings = /*#__PURE__*/function (_Component) {
         isShowDialog: false
       });
     };
+    _this.getChartTypeName = function () {
+      var chartType = _this.props.chart.type;
+      switch (chartType) {
+        case STAT_TYPE.MAP:
+          {
+            return '中国地图';
+          }
+        case STAT_TYPE.MAP_BUBBLE:
+          {
+            return '中国地图(气泡图)';
+          }
+        case STAT_TYPE.WORLD_MAP_BUBBLE:
+          {
+            return "".concat(intl.get(STATISTIC_TYPE_SHOW[STAT_TYPE.WORLD_MAP]), "(").concat(intl.get('Bubble'), ")");
+          }
+        default:
+          {
+            return intl.get(STATISTIC_TYPE_SHOW[chartType]);
+          }
+      }
+    };
     _this.state = {
       isShowDialog: false
     };
@@ -40,7 +61,7 @@ var TypeSettings = /*#__PURE__*/function (_Component) {
         className: "statistic-chart-parameter-item"
       }, /*#__PURE__*/React.createElement("label", null, intl.get('Chart_type')), /*#__PURE__*/React.createElement("div", {
         className: "statistic-selected-type-container d-flex align-items-center"
-      }, /*#__PURE__*/React.createElement("span", null, intl.get(STATISTIC_TYPE_SHOW[chartType]) || STATISTIC_TYPE_SHOW[chartType]), /*#__PURE__*/React.createElement("div", {
+      }, /*#__PURE__*/React.createElement("span", null, this.getChartTypeName()), /*#__PURE__*/React.createElement("div", {
         className: "statistic-switch-type-container",
         onClick: this.openTypesDialog
       }, /*#__PURE__*/React.createElement(Icon, {

package/es/stat-list/chart-preview.js

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
@@ -70,7 +69,7 @@ var ChartPreview = /*#__PURE__*/function (_Component) {
     };
     _this.renderChart = function (statItem) {
       var _this$props = _this.props,
-        refresh = _this$props.refresh,
+        dtableChangedTime = _this$props.dtableChangedTime,
         chartCalculator = _this$props.chartCalculator,
         theme = _this$props.theme,
         colorThemeName = _this$props.colorThemeName,
@@ -80,11 +79,11 @@ var ChartPreview = /*#__PURE__*/function (_Component) {
           return _this.chartView = _ref;
         },
         isPreview: true,
-        refresh: refresh,
+        dtableChangedTime: dtableChangedTime,
         isEnlarge: false,
         theme: theme,
         colorThemeName: colorThemeName,
-        statItem: _objectSpread({}, statItem),
+        statItem: statItem,
         chartCalculator: chartCalculator,
         eventBus: eventBus,
         getTableById: _this.props.getTableById,

package/es/stat-list/index.js

@@ -24,6 +24,12 @@ var StatList = /*#__PURE__*/function (_Component) {
     _this = _super.call(this, props);
     _this.getStatItemsLayout = function (statItems) {
       return Array.isArray(statItems) ? statItems.map(function (chart) {
+        // eslint-disable-next-line
+        if (chart.layout.y == null) {
+          return _objectSpread(_objectSpread({}, chart.layout), {}, {
+            y: Infinity
+          });
+        }
         return chart.layout;
       }) : [];
     };
@@ -183,7 +189,7 @@ var StatList = /*#__PURE__*/function (_Component) {
       var _this2 = this;
       var _this$props = this.props,
         isTableReadOnly = _this$props.isTableReadOnly,
-        refresh = _this$props.refresh,
+        dtableChangedTime = _this$props.dtableChangedTime,
         theme = _this$props.theme,
         colorThemeName = _this$props.colorThemeName,
         statItems = _this$props.statItems,
@@ -219,10 +225,10 @@ var StatList = /*#__PURE__*/function (_Component) {
           className: "statistic-chart-preview"
         }, /*#__PURE__*/React.createElement(ChartPreview, {
           isTableReadOnly: isTableReadOnly,
-          refresh: refresh,
+          dtableChangedTime: dtableChangedTime,
           theme: theme,
           colorThemeName: colorThemeName,
-          statItem: _objectSpread({}, statItem),
+          statItem: statItem,
           chartCalculator: chartCalculator,
           eventBus: eventBus,
           getTableById: _this2.props.getTableById,
@@ -245,7 +251,7 @@ var StatList = /*#__PURE__*/function (_Component) {
           toggleStatisticRecordsDialog: _this2.props.toggleStatisticRecordsDialog
         }));
       })), enlargedChart && /*#__PURE__*/React.createElement(EnlargeChartDialog, {
-        refresh: refresh,
+        dtableChangedTime: dtableChangedTime,
         colorThemeName: colorThemeName,
         statItem: enlargedChart,
         eventBus: eventBus,

package/es/stat-view/area-chart.js

@@ -5,18 +5,15 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React from 'react';
 import PropTypes from 'prop-types';
 import intl from 'react-intl-universal';
-import { TableUtils, getNumberDisplayString } from 'dtable-store';
+import { TableUtils } from 'dtable-store';
 import BaseChart from './base-chart';
 import { Chart } from '../custom-g2';
-import { Loading } from '../components';
-import { getCurrentTheme, getLabelFontSize } from '../utils/common-utils';
-import { getChartDisplayLabels, getChartGroups } from '../utils/basic-chart-utils';
-import { DEFAULT_NUMBER_FORMAT_OBJECT, EMPTY_NAME, LABEL_CONFIG_CHANGED, NO_STATISTIC_RESULTS, STATISTICS_COUNT_SHOW, STAT_ITEM_THEME_COLORS, SUMMARY_TYPE, TITLE_AMOUNT, TYPE_COLOR_USING } from '../constants';
+import { getCurrentTheme } from '../utils/common-utils';
+import { getChartGroups } from '../utils/basic-chart-utils';
+import { DEFAULT_NUMBER_FORMAT_OBJECT, EMPTY_NAME, LABEL_CONFIG_CHANGED, STATISTICS_COUNT_SHOW, SUMMARY_TYPE, TITLE_AMOUNT, TYPE_COLOR_USING } from '../constants';
 var propTypes = {
   isPreview: PropTypes.bool,
-  isEnlarge: PropTypes.bool,
   isEdit: PropTypes.bool,
-  theme: PropTypes.string,
   colorThemeName: PropTypes.string,
   statItem: PropTypes.object,
   chartCalculator: PropTypes.object,
@@ -31,34 +28,12 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
     var _this;
     _classCallCheck(this, AreaChart);
     _this = _super.call(this, props);
-    _this.getLabelFontSize = function () {
-      var statItem = _this.props.statItem;
-      var label_font_size = statItem.label_font_size;
-      return getLabelFontSize(label_font_size);
-    };
     _this.drawChart = function (data) {
       var _this$props = _this.props,
         getTableById = _this$props.getTableById,
-        isPreview = _this$props.isPreview,
         statItem = _this$props.statItem,
-        isEnlarge = _this$props.isEnlarge,
-        theme = _this$props.theme,
         colorThemeName = _this$props.colorThemeName;
-      var currentTheme = getCurrentTheme(colorThemeName);
-      if (isPreview) {
-        _this.chart = new Chart({
-          container: _this.container,
-          autoFit: true,
-          appendPadding: [3, 0, 0, 0]
-        });
-      } else {
-        _this.chart = new Chart({
-          container: _this.container,
-          height: 400,
-          width: 700,
-          appendPadding: [3, 0, 0, 0]
-        });
-      }
+      _this.initChartHandler();
       _this.chart.on('element:click', function (e) {
         var areaElement = e.target.get('element');
         var data = areaElement.data;
@@ -66,26 +41,23 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
           _this.props.toggleStatisticRecordsDialog(data, statItem);
         }
       });
+      var currentTheme = getCurrentTheme(colorThemeName);
       var table_id = statItem.table_id,
-        summary_type = statItem.y_axis_summary_type,
+        y_axis_summary_type = statItem.y_axis_summary_type,
         y_axis_column_key = statItem.y_axis_column_key,
-        summary_method = statItem.y_axis_summary_method,
         column_groupby_column_key = statItem.column_groupby_column_key,
-        display_data = statItem.display_data,
-        y_axis_auto_range = statItem.y_axis_auto_range,
-        y_axis_min = statItem.y_axis_min,
-        y_axis_max = statItem.y_axis_max,
         column_groupby_multiple_numeric_column = statItem.column_groupby_multiple_numeric_column,
         color_option = statItem.color_option;
-      var chartBarColor,
-        columnData = DEFAULT_NUMBER_FORMAT_OBJECT;
-      if (summary_type === SUMMARY_TYPE.ADVANCED) {
+      var isGroup = column_groupby_column_key || column_groupby_multiple_numeric_column;
+      var summaryColumnData = DEFAULT_NUMBER_FORMAT_OBJECT;
+      if (y_axis_summary_type === SUMMARY_TYPE.ADVANCED) {
         var table = getTableById(table_id);
         var summaryColumn = TableUtils.getTableColumnByKey(table, y_axis_column_key) || {};
-        columnData = summaryColumn.data || DEFAULT_NUMBER_FORMAT_OBJECT;
+        summaryColumnData = summaryColumn.data || DEFAULT_NUMBER_FORMAT_OBJECT;
       }
       var groupColorMapping = null;
-      if (column_groupby_column_key || column_groupby_multiple_numeric_column) {
+      var chartBarColor = '#2a67d1';
+      if (isGroup) {
         chartBarColor = currentTheme && currentTheme.colors;
         if (color_option === TYPE_COLOR_USING.USE_COLUMN_COLORS) {
           // when the 'Group by' column is a 'single-select' column,
@@ -105,8 +77,6 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
         });
       } else if (currentTheme && currentTheme.colors) {
         chartBarColor = currentTheme.colors[0];
-      } else {
-        chartBarColor = '#2a67d1';
       }
       _this.chart.data(data, {
         'name': {
@@ -114,131 +84,194 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
           nice: false
         }
       });
+      var chartData = isGroup ? getChartGroups(data) : data;
       var width = _this.chart.coordinateBBox.width;
-      var chartData;
-      if (column_groupby_column_key || column_groupby_multiple_numeric_column) {
-        chartData = getChartGroups(data);
-      } else {
-        chartData = data;
-      }
-      var labelCount = chartData.length;
-      if (Math.floor(width / labelCount) <= 20) {
-        var displayLabels = getChartDisplayLabels(width, 20, chartData);
-        labelCount = displayLabels.length;
+      var ticks = _this.getTicks(chartData, width);
+      var labelCount = _this.getLabelCount(ticks, chartData);
+      if (ticks.length > 0) {
         _this.chart.scale('name', {
           type: 'cat',
-          ticks: displayLabels
+          ticks: ticks
         });
       }
-      var themeColors = STAT_ITEM_THEME_COLORS.light;
-      if (theme === 'dark' && !isEnlarge && isPreview) {
-        themeColors = STAT_ITEM_THEME_COLORS.dark;
-      }
+      var themeColors = _this.getThemeColors();
 
       // set Coord type
       _this.chart.coordinate('rect');
+      _this.handleAutoRange(data, summaryColumnData);
+
+      // draw line
+      if (isGroup) {
+        _this.drawLineGroup({
+          chartBarColor: chartBarColor,
+          themeColors: themeColors
+        });
+      } else {
+        _this.drawLine({
+          chartBarColor: chartBarColor,
+          themeColors: themeColors
+        });
+      }
+
+      // draw area
+      if (isGroup) {
+        _this.drawAreaGroup({
+          chartBarColor: chartBarColor
+        });
+      } else {
+        _this.drawArea({
+          chartBarColor: chartBarColor
+        });
+      }
+      _this.setTooltip();
+      _this.setAxis(themeColors, labelCount);
+      _this.setTheme();
+      _this.setLegend(themeColors);
+      _this.chart.render();
+      _this.renderAxisLabel();
+    };
+    _this.initChartHandler = function () {
+      var isPreview = _this.props.isPreview;
+      var config = {
+        container: _this.container,
+        autoFit: true,
+        appendPadding: [3, 0, 0, 0]
+      };
+      if (!isPreview) {
+        config.height = 400;
+        config.width = 700;
+      }
+      _this.chart = new Chart(config);
+    };
+    _this.drawLine = function (_ref) {
+      var chartBarColor = _ref.chartBarColor,
+        themeColors = _ref.themeColors;
+      var _this$props$statItem = _this.props.statItem,
+        y_axis_summary_type = _this$props$statItem.y_axis_summary_type,
+        y_axis_summary_method = _this$props$statItem.y_axis_summary_method,
+        display_data = _this$props$statItem.display_data;
+      _this.chart.line().position('name*value').color(chartBarColor).tooltip('name*formatted_value', function (name, value) {
+        return {
+          value: value,
+          name: y_axis_summary_type === SUMMARY_TYPE.COUNT ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[y_axis_summary_method])
+        };
+      });
+      _this.chart.point().label(display_data ? 'formatted_value' : false, {
+        style: {
+          fontSize: _this.getLabelFontSize(),
+          fill: themeColors.textColor
+        }
+      }).position('name*value').color(chartBarColor).shape('circle').size(3).style({
+        lineWidth: 1,
+        stroke: '#fff'
+      }).tooltip('name*formatted_value', function (name, value) {
+        return {
+          value: value,
+          name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
+          title: y_axis_summary_type === SUMMARY_TYPE.COUNT ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[y_axis_summary_method])
+        };
+      });
+    };
+    _this.drawLineGroup = function (_ref2) {
+      var chartBarColor = _ref2.chartBarColor,
+        themeColors = _ref2.themeColors;
+      var display_data = _this.props.statItem.display_data;
+      _this.chart.scale({
+        group_name: {
+          type: 'cat'
+        }
+      });
+      _this.chart.line().position('name*value').color('group_name', chartBarColor);
+      _this.chart.point().label(display_data ? 'formatted_value' : false, {
+        style: {
+          fontSize: _this.getLabelFontSize(),
+          fill: themeColors.textColor
+        }
+      }).position('name*value').size(3).color('group_name', chartBarColor).tooltip('name*formatted_value*group_name', function (name, value, group_name) {
+        return {
+          value: value,
+          title: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
+          name: !group_name && typeof group_name !== 'number' ? intl.get(EMPTY_NAME) : group_name
+        };
+      }).shape('circle').style({
+        lineWidth: 1,
+        stroke: '#fff'
+      });
+    };
+    _this.drawArea = function (_ref3) {
+      var chartBarColor = _ref3.chartBarColor;
+      var _this$props$statItem2 = _this.props.statItem,
+        y_axis_summary_type = _this$props$statItem2.y_axis_summary_type,
+        y_axis_summary_method = _this$props$statItem2.y_axis_summary_method;
+      _this.chart.area().position('name*value').color(chartBarColor).tooltip('name*formatted_value', function (name, value) {
+        return {
+          value: value,
+          name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
+          title: y_axis_summary_type === SUMMARY_TYPE.COUNT ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[y_axis_summary_method])
+        };
+      });
+    };
+    _this.drawAreaGroup = function (_ref4) {
+      var chartBarColor = _ref4.chartBarColor;
+      var _this$props$statItem3 = _this.props.statItem,
+        y_axis_summary_type = _this$props$statItem3.y_axis_summary_type,
+        y_axis_summary_method = _this$props$statItem3.y_axis_summary_method;
+      _this.chart.area().position('name*value').color('group_name', chartBarColor).tooltip('name*formatted_value', function (name, value) {
+        return {
+          value: value,
+          name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
+          title: y_axis_summary_type === SUMMARY_TYPE.COUNT ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[y_axis_summary_method])
+        };
+      });
+    };
+    _this.handleAutoRange = function (data, summaryColumnData) {
+      var _this$props$statItem4 = _this.props.statItem,
+        y_axis_auto_range = _this$props$statItem4.y_axis_auto_range,
+        y_axis_min = _this$props$statItem4.y_axis_min,
+        y_axis_max = _this$props$statItem4.y_axis_max,
+        y_axis_summary_method = _this$props$statItem4.y_axis_summary_method;
       var valueScaleOptions = {
         formatter: function formatter(value) {
-          return getNumberDisplayString(value, columnData);
+          return _this.getNumberDisplayString(value, summaryColumnData, y_axis_summary_method);
         }
       };
+
+      // eslint-disable-next-line
       if (y_axis_auto_range == undefined || y_axis_auto_range) {
-        valueScaleOptions = Object.assign({}, valueScaleOptions, {
+        valueScaleOptions = Object.assign(valueScaleOptions, {
           nice: true
         });
       } else {
-        valueScaleOptions = Object.assign({}, valueScaleOptions, {
+        valueScaleOptions = Object.assign(valueScaleOptions, {
           min: y_axis_min,
           max: y_axis_max
         });
+
         // set the filter rule
         _this.chart.filter('value', function (value) {
           return value >= y_axis_min;
         });
+
         // filter the data
         _this.chart.filterData(data);
       }
       _this.chart.scale({
         value: valueScaleOptions
       });
-      if (column_groupby_column_key || column_groupby_multiple_numeric_column) {
-        _this.chart.scale({
-          group_name: {
-            type: 'cat'
-          }
-        });
-        _this.chart.line().position('name*value').color('group_name', chartBarColor);
-        _this.chart.point().label(display_data ? 'value' : false, {
-          style: {
-            fontSize: _this.getLabelFontSize(),
-            fill: themeColors.textColor
-          }
-        }).position('name*value').size(3).color('group_name', chartBarColor).tooltip('name*value*group_name', function (name, value, group_name) {
-          return {
-            title: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
-            value: getNumberDisplayString(value, columnData),
-            name: !group_name && typeof group_name !== 'number' ? intl.get(EMPTY_NAME) : group_name
-          };
-        }).shape('circle').style({
-          lineWidth: 1,
-          stroke: '#fff'
-        });
-      } else {
-        _this.chart.line().position('name*value').color(chartBarColor).tooltip('name*value', function (name, value) {
-          return {
-            name: summary_type === SUMMARY_TYPE.COUNT ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[summary_method]),
-            value: getNumberDisplayString(value, columnData)
-          };
-        });
-        _this.chart.point().label(display_data ? 'value' : false, {
-          style: {
-            fontSize: _this.getLabelFontSize(),
-            fill: themeColors.textColor
-          }
-        }).position('name*value').color(chartBarColor).shape('circle').size(3).style({
-          lineWidth: 1,
-          stroke: '#fff'
-        }).tooltip('name*value', function (name, value) {
-          return {
-            name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
-            value: getNumberDisplayString(value, columnData),
-            title: summary_type === SUMMARY_TYPE.COUNT ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[summary_method])
-          };
-        });
-      }
-      if (column_groupby_column_key || column_groupby_multiple_numeric_column) {
-        _this.chart.area().position('name*value').color('group_name', chartBarColor).tooltip('name*value', function (name, value) {
-          return {
-            name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
-            value: getNumberDisplayString(value, columnData),
-            title: summary_type === SUMMARY_TYPE.COUNT ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[summary_method])
-          };
-        });
-      } else {
-        _this.chart.area().position('name*value').color(chartBarColor).tooltip('name*value', function (name, value) {
-          return {
-            name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
-            value: getNumberDisplayString(value, columnData),
-            title: summary_type === SUMMARY_TYPE.COUNT ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[summary_method])
-          };
-        });
-      }
+    };
+    _this.setTooltip = function () {
       _this.chart.tooltip({
         showCrosshairs: true,
         showTitle: true,
         containerTpl: '<div class="g2-tooltip"><div class="g2-tooltip-list"></div></div>',
         itemTpl: '<div class="g2-tooltip-content"><div class="tooltip-name">{title}<div><div class="tooltip-item">{name}: {value}<div></div>',
         domStyles: {
-          'g2-tooltip': {
-            borderRadius: '2px',
-            backgroundColor: '#fff',
-            padding: '10px'
-          },
-          'tooltip-item': {
-            marginTop: '5px'
-          }
+          'g2-tooltip': _this.getDefaultChartStyleByKey('g2-tooltip'),
+          'tooltip-item': _this.getDefaultChartStyleByKey('tooltip-item')
         }
       });
+    };
+    _this.setAxis = function (themeColors, labelCount) {
       _this.chart.axis('name', {
         line: {
           style: themeColors.gridColor
@@ -250,16 +283,7 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
           offset: 20,
           autoRotate: true,
           rotate: labelCount > 11 ? 0.3 : 0,
-          formatter: function formatter(name) {
-            var label = name;
-            if (name.length > 10) {
-              label = "".concat(name.slice(0, 10), "...");
-            }
-            if (name === '' || name === 'undefined') {
-              label = intl.get(EMPTY_NAME);
-            }
-            return label;
-          }
+          formatter: _this.labelFormatter
         }
       });
       _this.chart.axis('value', {
@@ -276,6 +300,8 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
           }
         }
       });
+    };
+    _this.setTheme = function () {
       _this.chart.theme({
         geometries: {
           point: {
@@ -290,6 +316,8 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
           }
         }
       });
+    };
+    _this.setLegend = function (themeColors) {
       _this.chart.legend('group_name', {
         position: 'bottom',
         itemName: {
@@ -315,16 +343,11 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
           }
         }
       });
-      _this.chart.render();
-      _this.renderAxisLabel();
     };
     _this.renderAxisLabel = function (newStatItem) {
       var _this$props2 = _this.props,
         getTableById = _this$props2.getTableById,
-        statItem = _this$props2.statItem,
-        isEnlarge = _this$props2.isEnlarge,
-        isPreview = _this$props2.isPreview,
-        theme = _this$props2.theme;
+        statItem = _this$props2.statItem;
       if (newStatItem && newStatItem._id !== statItem._id) {
         return;
       }
@@ -341,10 +364,7 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
         y_axis_summary_type = _statItem.y_axis_summary_type;
       var table = getTableById(table_id);
       var autoPadding = _this.chart.autoPadding;
-      var textColor = '#999999';
-      if (theme === 'dark' && !isEnlarge && isPreview) {
-        textColor = '#ffffff';
-      }
+      var textColor = _this.getAxisLabelColor();
       var xAxisID = "chart-x-axis-label_".concat(statItem._id);
       var chartContainer = _this.chart.getCanvas().get('container');
       var xLabel = chartContainer.querySelector("#".concat(xAxisID));
@@ -499,18 +519,13 @@ var AreaChart = /*#__PURE__*/function (_BaseChart) {
         showResultDescription = _this$state.showResultDescription;
       var show_y_axis_label = statItem.show_y_axis_label,
         show_x_axis_label = statItem.show_x_axis_label;
-      var style = {
-        padding: show_y_axis_label || show_x_axis_label ? 30 : 20
-      };
-      return /*#__PURE__*/React.createElement(React.Fragment, null, isCalculatingData && /*#__PURE__*/React.createElement("div", {
-        className: 'statistic-chart-loading-container'
-      }, /*#__PURE__*/React.createElement(Loading, null)), showResultDescription && /*#__PURE__*/React.createElement("div", {
-        className: 'statistic-chart-text'
-      }, intl.get(NO_STATISTIC_RESULTS)), /*#__PURE__*/React.createElement("div", {
-        ref: function ref(_ref) {
-          return _this4.container = _ref;
+      return /*#__PURE__*/React.createElement(React.Fragment, null, isCalculatingData && this.renderLoading(), showResultDescription && this.renderEmpty(), /*#__PURE__*/React.createElement("div", {
+        ref: function ref(_ref5) {
+          return _this4.container = _ref5;
+        },
+        style: {
+          padding: show_y_axis_label || show_x_axis_label ? 30 : 20
         },
-        style: style,
         className: "statistic-chart-container"
       }));
     }