sea-chart 0.0.71-alpha.1 → 0.0.72

package/dist/utils/chart-utils/original-data-utils/pivot-table-calculator.js

@@ -379,13 +379,10 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
   } = chart;
   const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
   let summarySQLColumnName2ColumnKey = {};
-  let numericColumns = [];
-  if (summary_column_key) {
-    numericColumns = [{
-      column_key: summary_column_key,
-      summary_method: summary_method
-    }, ...summary_columns];
-  }
+  const numericColumns = [{
+    column_key: summary_column_key,
+    summary_method: summary_method
+  }, ...summary_columns];
   numericColumns.forEach(item => {
     const {
       column_key,
@@ -403,6 +400,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
       summarySQLColumnName2ColumnKey[sqlNumericColumnKey] = summaryColumnKey;
     }
   });
+  const summarySQLnames = Object.keys(summarySQLColumnName2ColumnKey);
   const summarySQLColumnKeys = Object.values(summarySQLColumnName2ColumnKey);
   const summaryColumn = getTableColumnByKey(table, summary_column_key) || {};
   const singleNumeriColumnWithMethod = {
@@ -438,7 +436,6 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
                 summaryColumn: current.column
               }, currentValue, nextValue);
               const columnName = current.column.name;
-              console.log('computedValue', computedValue);
               return [columnName, computedValue, columnKey];
             });
           }
@@ -580,19 +577,11 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
             // cells[key].total = subTotal.date;
           }
         } else {
-          if (Array.isArray(subTotal)) {
-            cells[key].total = subTotal;
-            total += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
-            let columnTotal = pivot_columns_total[key] ? pivot_columns_total[key] : 0;
-            columnTotal += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
-            pivot_columns_total[key] = columnTotal;
-          } else {
-            cells[key].total = subTotal;
-            total += subTotal ? subTotal - 0 : 0;
-            let columnTotal = pivot_columns_total[key] ? pivot_columns_total[key] : 0;
-            columnTotal += subTotal ? subTotal - 0 : 0;
-            pivot_columns_total[key] = columnTotal;
-          }
+          cells[key].total = subTotal;
+          total += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
+          let columnTotal = pivot_columns_total[key] ? pivot_columns_total[key] : 0;
+          columnTotal += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
+          pivot_columns_total[key] = columnTotal;
         }
       }
     });

package/dist/view/wrapper/area.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import classNames from 'classnames';
-import { CHART_LINE_TYPES, CHART_SUMMARY_SHOW, CHART_SUMMARY_TYPE, CHART_THEME_COLOR } from '../../constants';
+import { CHART_LINE_TYPES, CHART_SUMMARY_SHOW, CHART_SUMMARY_TYPE, CHART_THEME_COLOR, CHART_TYPE } from '../../constants';
 import intl from '../../intl';
 import { BaseUtils, isFunction } from '../../utils';
 import ChartComponent from './chart-component';
@@ -68,10 +68,13 @@ class Area extends ChartComponent {
         y_axis_label_color,
         line_type,
         y_axis_show_value,
-        label_font_size
+        label_font_size,
+        summary_columns
       } = chart.config;
       const newData = this.getChartGroupData(data);
       const isSmooth = line_type === CHART_LINE_TYPES[1];
+      const isMutipleSummary = summary_columns.length;
+      const isAreaGroup = chart.config.type === CHART_TYPE.AREA_GROUP;
       let chartBarColor;
       let colorCallBack = null;
       if (this.isGroupChart) {
@@ -89,6 +92,7 @@ class Area extends ChartComponent {
         }
         this.drawLabels(newData);
       }
+      const title = this.getTitle(this.props.tables, chart.config.table_id, y_axis_summary_type, chart.config.y_axis_column_key || chart.config.y_axis_summary_column_key);
 
       // set Coord type
       this.chart.coordinate('rect');
@@ -144,7 +148,7 @@ class Area extends ChartComponent {
         }
       }).shape(isSmooth ? 'smooth' : 'area').color(chartBarColor, colorCallBack).tooltip('group_name*name*value', (group_name, name, value) => {
         return {
-          title: y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : intl.get(CHART_SUMMARY_SHOW[y_axis_summary_method]),
+          title: isAreaGroup && isMutipleSummary ? !name && typeof name !== 'number' ? intl.get('Empty') : name : title,
           value: BaseUtils.getSummaryValueDisplayString(summaryColumn, value, y_axis_summary_method),
           name: group_name
         };

package/dist/view/wrapper/bar.js

@@ -51,17 +51,21 @@ class Bar extends ChartComponent {
         summaryColumn,
         globalTheme,
         customRender,
-        chartColorTheme
+        chartColorTheme,
+        tables
       } = this.props;
       const theme = CHART_THEME_COLOR[globalTheme];
       const {
         y_axis_summary_type,
+        y_axis_summary_column_key,
+        y_axis_column_key,
         y_axis_summary_method,
         y_axis_label_color,
         y_axis_show_value,
         label_font_size,
         color_option,
-        y_axis_label_color_rules
+        y_axis_label_color_rules,
+        table_id
       } = chart.config;
       // y-axis label width：6 + 10
       const chartWidth = this.chart.width - 6 - 10;
@@ -72,6 +76,7 @@ class Bar extends ChartComponent {
         chartBarColor = BaseUtils.getCurrentTheme(chartColorTheme).colors[0];
       }
       const colorRules = color_option === TYPE_COLOR_USING.USE_RULES && y_axis_label_color_rules && getConvertedColorRules(y_axis_label_color_rules);
+      const title = this.getTitle(tables, table_id, y_axis_summary_type, y_axis_column_key || y_axis_summary_column_key);
       this.drawLabels(data);
       // set Coord type
       this.chart.coordinate('rect');
@@ -92,7 +97,7 @@ class Bar extends ChartComponent {
         return color || chartBarColor;
       }).tooltip('name*value', (name, value) => {
         return {
-          title: y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : intl.get(CHART_SUMMARY_SHOW[y_axis_summary_method]),
+          title,
           value: BaseUtils.getSummaryValueDisplayString(summaryColumn, value, y_axis_summary_method),
           name
         };

package/dist/view/wrapper/chart-component.js

@@ -19,6 +19,14 @@ export default class ChartComponent extends Component {
         this.renderAxisLabel(this.props.chart, this.props.tables);
       }
     }, 300);
+    this.getTitle = (tables, table_id, yAxisType, yAxisKey) => {
+      return yAxisType === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : this.getAxisLabel(tables, table_id, yAxisKey);
+    };
+    this.getAxisLabel = (tables, tableId, columnKey) => {
+      const table = getTableById(tables, tableId);
+      const column = getTableColumnByKey(table, columnKey) || {};
+      return column.name || '';
+    };
     this.initChart = (container, _ref) => {
       let {
         appendPadding,

package/dist/view/wrapper/combination.js

@@ -93,6 +93,8 @@ class Combination extends ChartComponent {
       const rightSummaryColumn = getTableColumnByKey(table, y_axis_right_summary_column) || {};
       // const xAxisColumn = getTableColumnByKey(table, x_axis_column_key);
 
+      const leftTitle = this.getTitle(tables, table_id, y_axis_left_summary_type, y_axis_left_summary_column);
+      const rightTitle = this.getTitle(tables, table_id, y_axis_right_summary_type, y_axis_right_summary_column);
       let leftValueScaleOptions = {
         formatter: value => {
           return BaseUtils.getSummaryValueDisplayString(leftSummaryColumn, value, y_axis_left_summary_method);
@@ -229,7 +231,7 @@ class Combination extends ChartComponent {
         if (isMultiple) {
           title = name;
         } else {
-          title = y_axis_left_summary_type === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : intl.get(CHART_SUMMARY_SHOW[y_axis_left_summary_method]);
+          title = leftTitle;
         }
         return {
           title,
@@ -280,7 +282,7 @@ class Combination extends ChartComponent {
         }
       }).tooltip('name*value_right', (name, value) => {
         return {
-          title: y_axis_right_summary_type === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : intl.get(CHART_SUMMARY_SHOW[y_axis_right_summary_method]),
+          title: rightTitle,
           value: BaseUtils.getSummaryValueDisplayString(rightSummaryColumn, value, y_axis_right_summary_method),
           name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name
         };
@@ -329,7 +331,7 @@ class Combination extends ChartComponent {
           if (isMultiple) {
             title = name;
           } else {
-            title = y_axis_left_summary_type === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : intl.get(CHART_SUMMARY_SHOW[y_axis_left_summary_method]);
+            title = leftTitle;
           }
           return {
             title,
@@ -353,7 +355,7 @@ class Combination extends ChartComponent {
         interval.tooltip(false);
         point.tooltip('name*value_right', (name, value) => {
           return {
-            title: y_axis_right_summary_type === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : intl.get(CHART_SUMMARY_SHOW[y_axis_right_summary_method]),
+            title: rightTitle,
             value: BaseUtils.getSummaryValueDisplayString(rightSummaryColumn, value, y_axis_right_summary_method),
             name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name
           };

package/dist/view/wrapper/horizontal-bar.js

@@ -46,12 +46,17 @@ class HorizontalBar extends HorizontalComponent {
         chart,
         summaryColumn,
         globalTheme,
-        chartColorTheme
+        chartColorTheme,
+        tables
       } = this.props;
       const theme = CHART_THEME_COLOR[globalTheme];
       const {
+        table_id,
         horizontal_axis_summary_type,
         horizontal_axis_summary_method,
+        y_axis_summary_type,
+        y_axis_column_key,
+        y_axis_summary_column_key,
         color_option,
         horizontal_axis_label_color_rules,
         horizontal_axis_label_color,
@@ -68,6 +73,7 @@ class HorizontalBar extends HorizontalComponent {
         chartBarColor = BaseUtils.getCurrentTheme(chartColorTheme).colors[0];
       }
       const colorRules = color_option === TYPE_COLOR_USING.USE_RULES && horizontal_axis_label_color_rules && getConvertedColorRules(horizontal_axis_label_color_rules);
+      const title = this.getTitle(tables, table_id, y_axis_summary_type, y_axis_column_key || y_axis_summary_column_key);
       data.reverse();
       this.drawLabels(data);
 
@@ -90,7 +96,7 @@ class HorizontalBar extends HorizontalComponent {
         return color || chartBarColor;
       }).size(singleBarWidth).tooltip('name*value', (name, value) => {
         return {
-          title: horizontal_axis_summary_type === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : intl.get(CHART_SUMMARY_SHOW[horizontal_axis_summary_method]),
+          title,
           value: BaseUtils.getSummaryValueDisplayString(summaryColumn, value, horizontal_axis_summary_method),
           name
         };

package/dist/view/wrapper/line-group.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { BaseUtils, isFunction } from '../../utils';
 import intl from '../../intl';
-import { CHART_LINE_TYPES, CHART_SUMMARY_SHOW, CHART_SUMMARY_TYPE, CHART_THEME_COLOR } from '../../constants';
+import { CHART_LINE_TYPES, CHART_SUMMARY_SHOW, CHART_SUMMARY_TYPE, CHART_THEME_COLOR, CHART_TYPE, EMPTY_NAME } from '../../constants';
 import ChartComponent from './chart-component';
 class LineGroup extends ChartComponent {
   constructor(props) {
@@ -51,7 +51,6 @@ class LineGroup extends ChartComponent {
         y_axis_show_value,
         label_font_size,
         line_type,
-        y_axis_summary_type,
         y_axis_summary_method
       } = chart.config;
       const chartBarColor = this.groupName;
@@ -88,7 +87,7 @@ class LineGroup extends ChartComponent {
         opacity: 1
       }).tooltip('group_name*name*value', (group_name, name, value) => {
         return {
-          title: y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : intl.get(CHART_SUMMARY_SHOW[y_axis_summary_method]),
+          title: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
           value: BaseUtils.getSummaryValueDisplayString(summaryColumn, value, y_axis_summary_method),
           name: group_name
         };

package/dist/view/wrapper/line.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { BaseUtils, isFunction } from '../../utils';
 import intl from '../../intl';
-import { CHART_LINE_TYPES, CHART_SUMMARY_SHOW, CHART_SUMMARY_TYPE, CHART_THEME_COLOR } from '../../constants';
+import { CHART_LINE_TYPES, CHART_THEME_COLOR } from '../../constants';
 import ChartComponent from './chart-component';
 class Line extends ChartComponent {
   constructor(props) {
@@ -44,10 +44,14 @@ class Line extends ChartComponent {
         chart,
         globalTheme,
         chartColorTheme,
-        summaryColumn
+        summaryColumn,
+        tables
       } = this.props;
       const theme = CHART_THEME_COLOR[globalTheme];
       const {
+        table_id,
+        y_axis_column_key,
+        y_axis_summary_column_key,
         y_axis_label_color,
         y_axis_show_value,
         label_font_size,
@@ -60,11 +64,14 @@ class Line extends ChartComponent {
         chartBarColor = BaseUtils.getCurrentTheme(chartColorTheme).colors[0];
       }
       this.drawLabels(data);
+
+      // y axis label
+      const title = this.getTitle(tables, table_id, y_axis_summary_type, y_axis_column_key || y_axis_summary_column_key);
       const isSmooth = line_type === CHART_LINE_TYPES[1];
 
       // set Coord type
       this.chart.coordinate('rect');
-      const line = this.chart.line().label(y_axis_show_value ? 'value' : false, {
+      this.chart.line().label(y_axis_show_value ? 'value' : false, {
         style: {
           fontSize: BaseUtils.getLabelFontSize(label_font_size),
           fill: theme.labelColor,
@@ -84,7 +91,7 @@ class Line extends ChartComponent {
         opacity: 1
       }).tooltip('name*value', (name, value) => {
         return {
-          title: y_axis_summary_type === CHART_SUMMARY_TYPE.COUNT ? intl.get('Amount') : intl.get(CHART_SUMMARY_SHOW[y_axis_summary_method]),
+          title,
           value: BaseUtils.getSummaryValueDisplayString(summaryColumn, value, y_axis_summary_method),
           name
         };

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

@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
-import { CellType, isNumber } from 'dtable-utils';
+import { CellType } from 'dtable-utils';
 import { BaseUtils } from '../../../utils';
 import intl from '../../../intl';
 import { CHART_SUMMARY_TYPE } from '../../../constants';
@@ -270,7 +270,7 @@ class TwoDimensionTable extends PureComponent {
                 'selected-pivot-cell-border': isSelectedCell
               })
             }));
-          }), !total && !(typeof total === 'number') && this.renderEmpty(summaryColumns, cellIdx)));
+          }), !total && this.renderEmpty(summaryColumns, cellIdx)));
         }), display_total && /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
             'pivot-empty-cell': !isValidSummaryDisplayValue,

package/package.json

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