dtable-statistic 4.0.7 → 4.0.9

package/es/stat-view/horizontal-bar-chart.js

@@ -6,19 +6,16 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import DataSet from '@antv/data-set';
 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, sortDataByGroupSum } from '../utils/common-utils';
-import { getChartDisplayLabels, getChartGroups } from '../utils/basic-chart-utils';
+import { getCurrentTheme, sortDataByGroupSum } from '../utils/common-utils';
+import { getChartGroups } from '../utils/basic-chart-utils';
 import { getConvertedColorRules, getLabelColor } from '../utils/color-utils';
-import { DEFAULT_NUMBER_FORMAT_OBJECT, EMPTY_NAME, LABEL_CONFIG_CHANGED, NO_STATISTIC_RESULTS, STATISTICS_COUNT_SHOW, STAT_ITEM_THEME_COLORS, STAT_TYPE, SUMMARY_TYPE, TITLE_AMOUNT, TYPE_COLOR_USING, USEABLE_COLOR_TYPES } from '../constants';
+import { DATA_SORT_TYPE, DEFAULT_NUMBER_FORMAT_OBJECT, EMPTY_NAME, LABEL_CONFIG_CHANGED, STATISTICS_COUNT_SHOW, STAT_TYPE, SUMMARY_TYPE, TITLE_AMOUNT, TYPE_COLOR_USING, USEABLE_COLOR_TYPES } 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,
@@ -36,63 +33,45 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
     _this.drawChart = function (originalData) {
       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);
-      var type = statItem.type,
+      var table_id = statItem.table_id,
+        horizontal_axis_column_key = statItem.horizontal_axis_column_key,
+        horizontal_axis_summary_type = statItem.horizontal_axis_summary_type,
+        column_groupby_column_key = statItem.column_groupby_column_key,
+        column_groupby_multiple_numeric_column = statItem.column_groupby_multiple_numeric_column,
+        type = statItem.type,
         sort_type = statItem.sort_type;
+      _this.initChartHandler();
       var data = originalData;
       if (type == STAT_TYPE.STACKED_HORIZONTAL_BAR && sort_type) {
-        data = sortDataByGroupSum(originalData, sort_type);
-      }
-      if (isPreview) {
-        _this.chart = new Chart({
-          container: _this.container,
-          autoFit: true,
-          appendPadding: [0, 30, 0, 0]
-        });
-      } else {
-        _this.chart = new Chart({
-          container: _this.container,
-          autoFit: true,
-          height: 400,
-          width: 700,
-          appendPadding: [0, 30, 0, 0]
-        });
+        var convertedSortType = sort_type;
+        if (sort_type === DATA_SORT_TYPE.ASCENDING) {
+          convertedSortType = DATA_SORT_TYPE.DESCENDING;
+        } else if (sort_type === DATA_SORT_TYPE.DESCENDING) {
+          convertedSortType = DATA_SORT_TYPE.ASCENDING;
+        }
+        data = sortDataByGroupSum(originalData, convertedSortType);
       }
       _this.chart.on('interval:click', function (e) {
         _this.props.toggleStatisticRecordsDialog(e.data.data, statItem);
       });
-      var table_id = statItem.table_id,
-        horizontal_axis_column_key = statItem.horizontal_axis_column_key,
-        horizontal_axis_summary_type = statItem.horizontal_axis_summary_type,
-        horizontal_axis_summary_method = statItem.horizontal_axis_summary_method,
-        column_groupby_column_key = statItem.column_groupby_column_key,
-        display_data = statItem.display_data,
-        column_groupby_multiple_numeric_column = statItem.column_groupby_multiple_numeric_column,
-        h_axis_auto_range = statItem.h_axis_auto_range,
-        h_axis_min = statItem.h_axis_min,
-        h_axis_max = statItem.h_axis_max,
-        color_option = statItem.color_option;
-      var chartBarColor,
-        columnData = DEFAULT_NUMBER_FORMAT_OBJECT;
+      var currentTheme = getCurrentTheme(colorThemeName);
+      var isGroup = column_groupby_column_key || column_groupby_multiple_numeric_column;
+      var chartBarColor = '#2a67d1';
+      var summaryColumnData = DEFAULT_NUMBER_FORMAT_OBJECT;
       if (horizontal_axis_summary_type === SUMMARY_TYPE.ADVANCED) {
         var table = getTableById(table_id);
         var summaryColumn = TableUtils.getTableColumnByKey(table, horizontal_axis_column_key) || {};
-        columnData = summaryColumn.data || DEFAULT_NUMBER_FORMAT_OBJECT;
+        summaryColumnData = summaryColumn.data || DEFAULT_NUMBER_FORMAT_OBJECT;
       }
-      if (column_groupby_column_key || column_groupby_multiple_numeric_column) {
+      if (isGroup) {
         chartBarColor = 'group_name';
         _this.chart.scale('group_name', {
           type: 'cat'
         });
       } else if (currentTheme && currentTheme.colors) {
         chartBarColor = currentTheme.colors[0];
-      } else {
-        chartBarColor = '#2a67d1';
       }
       _this.chart.data(data, {
         'name': {
@@ -100,42 +79,72 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
           nice: false
         }
       });
-      var themeColors = STAT_ITEM_THEME_COLORS.light;
-      if (theme === 'dark' && !isEnlarge && isPreview) {
-        themeColors = STAT_ITEM_THEME_COLORS.dark;
-      }
+      var themeColors = _this.getThemeColors();
       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 chartData = isGroup ? getChartGroups(data) : data;
+      var ticks = _this.getTicks(chartData, width);
+      if (ticks.length > 0) {
         _this.chart.scale('name', {
-          ticks: displayLabels
+          ticks: ticks
         });
       }
 
       // set Coord type
       _this.chart.coordinate('rect');
-
+      _this.handleAutoRange(data, summaryColumnData);
+      if (isGroup) {
+        _this.drawBarGroup({
+          data: data,
+          themeColors: themeColors,
+          currentTheme: currentTheme,
+          summaryColumnData: summaryColumnData
+        });
+      } else {
+        _this.drawBar({
+          themeColors: themeColors,
+          chartBarColor: chartBarColor
+        });
+      }
+      _this.setTooltip();
+      _this.setAxis(themeColors);
+      _this.setLegend(themeColors);
+      _this.chart.interaction('active-region');
+      _this.chart.coordinate().transpose();
+      _this.chart.render();
+      _this.renderAxisLabel();
+    };
+    _this.initChartHandler = function () {
+      var isPreview = _this.props.isPreview;
+      var config = {
+        container: _this.container,
+        autoFit: true,
+        appendPadding: [0, 30, 0, 0]
+      };
+      if (!isPreview) {
+        config.height = 400;
+        config.width = 700;
+      }
+      _this.chart = new Chart(config);
+    };
+    _this.handleAutoRange = function (data, summaryColumnData) {
       // set scale options for 'value'
+      var _this$props$statItem = _this.props.statItem,
+        horizontal_axis_summary_method = _this$props$statItem.horizontal_axis_summary_method,
+        h_axis_auto_range = _this$props$statItem.h_axis_auto_range,
+        h_axis_min = _this$props$statItem.h_axis_min,
+        h_axis_max = _this$props$statItem.h_axis_max;
       var valueScaleOptions = {
         formatter: function formatter(value) {
-          return getNumberDisplayString(value, columnData);
+          return _this.getNumberDisplayString(value, summaryColumnData, horizontal_axis_summary_method);
         }
       };
       if (h_axis_auto_range == undefined || h_axis_auto_range) {
-        valueScaleOptions = Object.assign({}, valueScaleOptions, {
+        valueScaleOptions = Object.assign(valueScaleOptions, {
           // Automatically adjust the maximum and minimum values
           nice: true
         });
       } else {
-        valueScaleOptions = Object.assign({}, valueScaleOptions, {
+        valueScaleOptions = Object.assign(valueScaleOptions, {
           min: h_axis_min,
           max: h_axis_max
         });
@@ -153,157 +162,150 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
         },
         value: valueScaleOptions
       });
-      if (column_groupby_column_key || column_groupby_multiple_numeric_column) {
-        _this.chart.scale({
-          group_name: {
-            type: 'cat'
-          }
-        });
-        var labelCfg = {
-          offset: 5,
-          position: function position() {
-            return 'right';
-          },
+    };
+    _this.drawBar = function (_ref) {
+      var themeColors = _ref.themeColors,
+        chartBarColor = _ref.chartBarColor;
+      var statItem = _this.props.statItem;
+      var horizontal_axis_summary_type = statItem.horizontal_axis_summary_type,
+        horizontal_axis_summary_method = statItem.horizontal_axis_summary_method,
+        display_data = statItem.display_data,
+        color_option = statItem.color_option,
+        horizontal_axis_label_color_rules = statItem.horizontal_axis_label_color_rules;
+      var colorRules = color_option === TYPE_COLOR_USING.USE_RULES && horizontal_axis_label_color_rules && getConvertedColorRules(horizontal_axis_label_color_rules);
+      _this.chart.interval().label(display_data ? 'formatted_value' : false, {
+        offset: 5,
+        position: function position() {
+          return 'right';
+        },
+        style: {
+          fontSize: _this.getLabelFontSize(),
+          fill: themeColors.textColor
+        }
+      }).position('name*value').tooltip('name*formatted_value', function (name, value) {
+        return {
+          value: value,
+          title: horizontal_axis_summary_type === 'count' ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[horizontal_axis_summary_method]),
+          name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name
+        };
+      }).state({
+        active: {
           style: {
-            fontSize: _this.getLabelFontSize(),
-            fill: themeColors.textColor
+            stroke: null
           }
-        };
-        if (statItem.type == STAT_TYPE.STACKED_HORIZONTAL_BAR) {
-          // get the total value of each stack
-          var dv = new DataSet.DataView().source(data);
-          dv.transform({
-            type: 'aggregate',
-            fields: ['value'],
-            operations: ['sum'],
-            as: ['value_sum'],
-            groupBy: ['name']
-          });
-          var groupNames = [];
-          data.forEach(function (item) {
-            if (groupNames.indexOf(item.group_name) == -1) {
-              groupNames.push(item.group_name);
-            }
-          });
-          labelCfg.content = function (dataItem, mappingData, index) {
-            var name = dataItem.name,
-              group_name = dataItem.group_name;
-            var targetData = dv.rows.filter(function (item) {
-              return item.name == name;
-            });
-            // make the value displayed in the same precision with the column
-            var valueSum = getNumberDisplayString(targetData[0].value_sum, columnData);
-            var groupedItems = data.filter(function (item) {
-              return item.name == name;
-            });
-            if (groupedItems.length == 1) {
-              return valueSum;
-            }
-            var filteredGroupNameIndexes = groupedItems.map(function (item) {
-              return groupNames.indexOf(item.group_name);
-            }).filter(function (item) {
-              return item > -1;
-            });
-            if (filteredGroupNameIndexes.length == 0) {
-              return valueSum;
-            }
-            filteredGroupNameIndexes.sort(function (a, b) {
-              return a - b;
-            });
-            if (group_name == groupNames[filteredGroupNameIndexes[0]]) {
-              return valueSum;
-            }
-            return null;
-          };
         }
-        var groupColorCallback = currentTheme && currentTheme.colors;
-        // when the 'Group by' column is a 'single-select' column,
-        // and the user chooses to use the colors from the column.
-        if (color_option === USEABLE_COLOR_TYPES[1]) {
-          var groupColorMapping = {};
-          data.forEach(function (item) {
-            if (!groupColorMapping[item.group_name]) {
-              groupColorMapping[item.group_name] = item.color;
-            }
-          });
-          groupColorCallback = function groupColorCallback(group_name) {
-            return groupColorMapping[group_name];
-          };
-        }
-        _this.chart.interval().label(display_data ? 'value' : false, labelCfg).position('name*value').color('group_name', groupColorCallback).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
-          };
-        }).adjust([{
-          reverseOrder: true,
-          // for 'stack'. It only work for 'stack'.
-          type: statItem.type == STAT_TYPE.STACKED_HORIZONTAL_BAR ? 'stack' : 'dodge'
-        }]).state({
-          active: {
-            style: {
-              stroke: null
-            }
-          }
+      }).style('value', function (value) {
+        var color = getLabelColor({
+          chart: statItem,
+          colorRules: colorRules,
+          value: value
         });
-      } else {
-        var colorRules = statItem.color_option === TYPE_COLOR_USING.USE_RULES && statItem.horizontal_axis_label_color_rules && getConvertedColorRules(statItem.horizontal_axis_label_color_rules);
-        _this.chart.interval().label(display_data ? 'value' : false, {
-          offset: 5,
-          position: function position() {
-            return 'right';
-          },
-          style: {
-            fontSize: _this.getLabelFontSize(),
-            fill: themeColors.textColor
-          }
-        }).position('name*value').tooltip('name*value', function (name, value) {
+        if (color) {
           return {
-            title: horizontal_axis_summary_type === 'count' ? intl.get(TITLE_AMOUNT) : intl.get(STATISTICS_COUNT_SHOW[horizontal_axis_summary_method]),
-            value: getNumberDisplayString(value, columnData),
-            name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name
+            fill: color
           };
-        }).state({
-          active: {
-            style: {
-              stroke: null
-            }
-          }
-        }).style('value', function (value) {
-          var color = getLabelColor({
-            chart: statItem,
-            colorRules: colorRules,
-            value: value
+        }
+        return {
+          fill: chartBarColor
+        };
+      });
+    };
+    _this.drawBarGroup = function (_ref2) {
+      var data = _ref2.data,
+        themeColors = _ref2.themeColors,
+        currentTheme = _ref2.currentTheme,
+        summaryColumnData = _ref2.summaryColumnData;
+      var statItem = _this.props.statItem;
+      var horizontal_axis_summary_method = statItem.horizontal_axis_summary_method,
+        display_data = statItem.display_data,
+        color_option = statItem.color_option;
+      _this.chart.scale({
+        group_name: {
+          type: 'cat'
+        }
+      });
+      var labelCfg = {
+        style: {
+          fontSize: _this.getLabelFontSize(),
+          fill: themeColors.textColor
+        }
+      };
+      var displayData = display_data;
+      if (statItem.type == STAT_TYPE.STACKED_HORIZONTAL_BAR) {
+        var display_each_block_data = statItem.display_each_block_data;
+        displayData = display_each_block_data;
+        if (displayData) {
+          labelCfg.position = 'middle';
+        }
+
+        // get the total value of each stack
+        var dv = new DataSet.DataView().source(data);
+        dv.transform({
+          type: 'aggregate',
+          fields: ['value'],
+          operations: ['sum'],
+          as: ['value_sum'],
+          groupBy: ['name']
+        });
+        if (display_data) {
+          dv.rows.forEach(function (item) {
+            _this.chart.annotation().text({
+              content: _this.getNumberDisplayString(item.value_sum, summaryColumnData, horizontal_axis_summary_method),
+              position: {
+                name: item.name,
+                value: item.value_sum
+              },
+              offsetY: 0,
+              offsetX: 5
+            });
           });
-          if (color) {
-            return {
-              fill: color
-            };
+        }
+      }
+      var groupColorCallback = currentTheme && currentTheme.colors;
+      // when the 'Group by' column is a 'single-select' column,
+      // and the user chooses to use the colors from the column.
+      if (color_option === USEABLE_COLOR_TYPES[1]) {
+        var groupColorMapping = {};
+        data.forEach(function (item) {
+          if (!groupColorMapping[item.group_name]) {
+            groupColorMapping[item.group_name] = item.color;
           }
-          return {
-            fill: chartBarColor
-          };
         });
+        groupColorCallback = function groupColorCallback(group_name) {
+          return groupColorMapping[group_name];
+        };
       }
+      _this.chart.interval().label(displayData ? 'formatted_value' : false, labelCfg).position('name*value').color('group_name', groupColorCallback).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
+        };
+      }).adjust([{
+        reverseOrder: true,
+        // for 'stack'. It only work for 'stack'.
+        type: statItem.type == STAT_TYPE.STACKED_HORIZONTAL_BAR ? 'stack' : 'dodge'
+      }]).state({
+        active: {
+          style: {
+            stroke: null
+          }
+        }
+      });
+    };
+    _this.setTooltip = function () {
       _this.chart.tooltip({
         showTitle: true,
         showMarkers: false,
         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')
         }
       });
-
-      // set axis label and tooltip
+    };
+    _this.setAxis = function (themeColors) {
       _this.chart.axis('name', {
         label: {
           style: {
@@ -313,16 +315,7 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
             style: themeColors.gridColor
           },
           autoRotate: true,
-          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', {
@@ -339,6 +332,8 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
           }
         }
       });
+    };
+    _this.setLegend = function (themeColors) {
       var legendPosition = 'bottom';
       _this.chart.legend('group_name', {
         position: legendPosition,
@@ -351,18 +346,11 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
           }
         }
       });
-      _this.chart.interaction('active-region');
-      _this.chart.coordinate().transpose();
-      _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;
       }
@@ -383,10 +371,7 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
         title_name = _statItem$title_name === void 0 ? '' : _statItem$title_name;
       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 chartContainer = _this.chart.getCanvas().get('container');
       var horizontalAxisID = "chart-horizontal-axis-label_".concat(statItem._id);
       var horizontalLabel = chartContainer.querySelector("#".concat(horizontalAxisID));
@@ -442,11 +427,6 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
       _this.chart.destroy();
       _this.chart = null;
     };
-    _this.getLabelFontSize = function () {
-      var statItem = _this.props.statItem;
-      var label_font_size = statItem.label_font_size;
-      return getLabelFontSize(label_font_size);
-    };
     _this.state = {
       isCalculatingData: true,
       showResultDescription: true
@@ -548,13 +528,9 @@ var HorizontalBarChart = /*#__PURE__*/function (_BaseChart) {
         showResultDescription = _this$state.showResultDescription;
       var show_horizontal_axis_label = statItem.show_horizontal_axis_label,
         show_vertical_axis_label = statItem.show_vertical_axis_label;
-      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(_ref3) {
+          return _this4.container = _ref3;
         },
         style: {
           padding: show_vertical_axis_label || show_horizontal_axis_label ? 30 : 20

package/es/stat-view/index.js

@@ -48,7 +48,7 @@ var StatView = /*#__PURE__*/function (_React$Component) {
         isPreview = _this$props.isPreview,
         isEnlarge = _this$props.isEnlarge,
         isEdit = _this$props.isEdit,
-        refresh = _this$props.refresh,
+        dtableChangedTime = _this$props.dtableChangedTime,
         theme = _this$props.theme,
         colorThemeName = _this$props.colorThemeName,
         statItem = _this$props.statItem,
@@ -60,7 +60,7 @@ var StatView = /*#__PURE__*/function (_React$Component) {
         isPreview: isPreview,
         isEnlarge: isEnlarge,
         isEdit: isEdit,
-        refresh: refresh,
+        dtableChangedTime: dtableChangedTime,
         theme: theme,
         colorThemeName: colorThemeName,
         statItem: statItem,