sea-chart 0.0.81-alpha.0 → 0.0.81-alpha2

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

@@ -1379,4 +1379,15 @@ BaseUtils.getDateGranularityByType = chart => {
   }
   return null;
 };
+BaseUtils.recalculateAvg = sqlRows => {
+  sqlRows.forEach(item => {
+    const avgItemKey = Object.keys(item).find(jtem => jtem.startsWith('AVG'));
+    const sumItemKey = Object.keys(item).find(jtem => jtem.startsWith('SUM'));
+    const countItemKey = Object.keys(item).find(jtem => jtem.startsWith('COUNT'));
+    if (avgItemKey && sumItemKey && countItemKey) {
+      item[avgItemKey] = item[sumItemKey] / item[countItemKey];
+    }
+  });
+  return sqlRows;
+};
 export default BaseUtils;

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

@@ -1439,10 +1439,10 @@ SQLStatisticsUtils.sqlResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMa
   switch (type) {
     case CHART_TYPE.TABLE:
       {
+        sqlRows = BaseUtils.recalculateAvg(sqlRows);
         const {
           column_groupby_column_key
         } = chart.config;
-        // TODO
         if (!column_groupby_column_key) {
           return {
             result: _SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)

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

@@ -37,6 +37,9 @@ class ChartDataSQL {
         const sql_column_name = method ? "".concat(method, "(`").concat(column_name, "`)") : "`".concat(column_name, "`");
         const not_include_empty_sql = "".concat(sql_column_name, " IS NOT NULL");
         if (this.filter_sql) {
+          if (this.filter_sql.startsWith('WHERE')) {
+            this.filter_sql = this.filter_sql.slice(5);
+          }
           this.filter_sql = "WHERE ".concat(not_include_empty_sql, " AND ").concat(this.filter_sql);
         } else {
           this.filter_sql = "WHERE ".concat(not_include_empty_sql);
@@ -451,7 +454,7 @@ class ChartDataSQL {
       }
       return "SELECT ".concat(groupby_column_name, ", ").concat(left_summary_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(groupby_column_name, " LIMIT 0, 5000");
     };
-    this._summary_columns_2_sql = (summary_columns, summary_column_key, groupbyColumnIsCollaborator, summary_method) => {
+    this._summary_columns_2_sql = (summary_columns, summary_column_key, groupby_column, summary_method) => {
       const summary_column = this._get_column_by_key(summary_column_key);
       summary_method = summary_method.toUpperCase();
       let summary_column_names = [];
@@ -473,7 +476,7 @@ class ChartDataSQL {
       });
 
       // groupby_column is COLLABORATOR , replace AVG with SUM, and add 'COUNT(*)'
-      if (groupbyColumnIsCollaborator) {
+      if (groupby_column.type === CellType.COLLABORATOR) {
         summary_column_names.forEach((item, index) => {
           if (item.startsWith('AVG')) {
             summary_column_names[index] = 'SUM' + item.slice(3);
@@ -481,10 +484,13 @@ class ChartDataSQL {
         });
         summary_column_names.push('COUNT(*)');
       }
+      summary_column_names.forEach((item, index) => {
+        if (item.startsWith('AVG')) {
+          const group_column_name = this._summary_column_2_sql('ROW_COUNT', groupby_column);
+          summary_column_names[index] = item + ',SUM' + item.slice(3) + ",".concat(group_column_name);
+        }
+      });
       let summary_column_names_str = summary_column_names.join(', ');
-      // if (summary_column_names_str) {
-      //   summary_column_names_str = `, ${summary_column_names_str}`;
-      // }
       return summary_column_names_str;
     };
     this._one_dimension_statistic_table_2_sql = () => {
@@ -516,7 +522,7 @@ class ChartDataSQL {
         return "SELECT ".concat(groupby_column_name, ", ").concat(summary_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(groupby_column_name, " LIMIT 0, 5000");
       }
       if (summary_columns) {
-        const summary_column_names_str = this._summary_columns_2_sql(summary_columns, summary_column_key, groupby_column.type === CellType.COLLABORATOR, summary_method);
+        const summary_column_names_str = this._summary_columns_2_sql(summary_columns, summary_column_key, groupby_column, summary_method);
         return "SELECT ".concat(groupby_column_name, ", ").concat(summary_column_names_str, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(groupby_column_name, " LIMIT 0, 5000");
       }
       summary_method = summary_method.toUpperCase();
@@ -578,7 +584,7 @@ class ChartDataSQL {
             return '';
           }
           summary_method = summary_method.toUpperCase();
-          summary_column_names_str = this._summary_columns_2_sql(summary_columns, summary_column_key, groupby_column.type === CellType.COLLABORATOR, summary_method);
+          summary_column_names_str = this._summary_columns_2_sql(summary_columns, summary_column_key, groupby_column, summary_method);
         }
       }
       return "SELECT ".concat(groupby_column_name, ", ").concat(column_groupby_column_name, ", ").concat(summary_column_names_str, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(groupby_column_name, ", ").concat(column_groupby_column_name, " LIMIT 0, 5000");

package/dist/view/wrapper/area.js

@@ -128,17 +128,18 @@ class Area extends ChartComponent {
 
       // point
       let point;
-      point = this.chart.point().animate({
-        appear: {
-          animation: 'fadeIn',
-          duration: 1000,
-          easing: 'easeLinear'
-        }
-      }).position('name*value').color(chartBarColor, colorCallBack).shape('circle').size(4).style({
-        stroke: 0,
-        fillOpacity: 1,
-        opacity: y_axis_show_value ? 1 : 0
-      });
+      if (y_axis_show_value) {
+        point = this.chart.point().animate({
+          appear: {
+            animation: 'fadeIn',
+            duration: 1000,
+            easing: 'easeLinear'
+          }
+        }).position('name*value').color(chartBarColor, colorCallBack).shape('circle').size(4).style({
+          stroke: 0,
+          fillOpacity: 1
+        });
+      }
       const area = this.chart.area().position('name*value').animate({
         appear: {
           animation: 'fadeIn',
@@ -165,8 +166,7 @@ class Area extends ChartComponent {
         });
         if (point) point.style({
           fillOpacity: 0.3,
-          stroke: 0,
-          opacity: 1
+          stroke: 0
         });
         this.chart.render();
       });
@@ -181,8 +181,7 @@ class Area extends ChartComponent {
         });
         if (point) point.style({
           fillOpacity: 1,
-          stroke: 0,
-          opacity: 0
+          stroke: 0
         });
         this.chart.render();
       });

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_THEME_COLOR, EMPTY_NAME } 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) {
@@ -19,9 +19,6 @@ class LineGroup extends ChartComponent {
       this.initChart(this.container, {
         appendPadding
       });
-      this.chart.on('point:click', e => {
-        this.props.toggleRecords(e.data.data);
-      });
     };
     this.clearChart = () => {
       this.chart.annotation().clear(true);
@@ -96,19 +93,23 @@ class LineGroup extends ChartComponent {
         };
       });
       let point;
-      point = this.chart.point().position('name*value').color(chartBarColor, group_name => {
-        return this.colorMap[group_name];
-      }).animate({
-        appear: {
-          animation: 'fadeIn',
-          duration: 1000,
-          easing: 'easeLinear'
-        }
-      }).shape('circle').size(3).style({
-        stroke: 0,
-        fillOpacity: 1,
-        opacity: y_axis_show_value ? 1 : 0
-      });
+      if (y_axis_show_value) {
+        point = this.chart.point().position('name*value').color(chartBarColor, group_name => {
+          return this.colorMap[group_name];
+        }).animate({
+          appear: {
+            animation: 'fadeIn',
+            duration: 1000,
+            easing: 'easeLinear'
+          }
+        }).shape('circle').size(3).style({
+          stroke: 0,
+          fillOpacity: 1
+        });
+        this.chart.on('point:click', e => {
+          this.props.toggleRecords(e.data.data);
+        });
+      }
 
       // this.chart.on('tooltip:show', () => {
       //   if (line.styleOption.cfg.opacity === 0.3) return;

package/dist/view/wrapper/line.js

@@ -19,9 +19,6 @@ class Line extends ChartComponent {
       this.initChart(this.container, {
         appendPadding
       });
-      this.chart.on('point:click', e => {
-        this.props.toggleRecords(e.data.data);
-      });
     };
     this.clearChart = () => {
       this.chart.annotation().clear(true);
@@ -100,17 +97,21 @@ class Line extends ChartComponent {
         };
       });
       let point;
-      point = this.chart.point().position('name*value').color(chartBarColor).animate({
-        appear: {
-          animation: 'fadeIn',
-          duration: 1000,
-          easing: 'easeLinear'
-        }
-      }).shape('circle').size(3).style({
-        stroke: 0,
-        fillOpacity: 1,
-        opacity: y_axis_show_value ? 1 : 0
-      });
+      if (y_axis_show_value) {
+        point = this.chart.point().position('name*value').color(chartBarColor).animate({
+          appear: {
+            animation: 'fadeIn',
+            duration: 1000,
+            easing: 'easeLinear'
+          }
+        }).shape('circle').size(3).style({
+          stroke: 0,
+          fillOpacity: 1
+        });
+        this.chart.on('point:click', e => {
+          this.props.toggleRecords(e.data.data);
+        });
+      }
 
       // this.chart.on('tooltip:show', () => {
       //   if (line.styleOption.cfg.opacity === 0.3) return;

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

@@ -117,8 +117,16 @@ class PivotTableDisplayName extends React.Component {
           }
         case CellType.MULTIPLE_SELECT:
           {
+            const {
+              rowData
+            } = this.props;
+            const {
+              original_name,
+              name
+            } = rowData;
+            const newValue = original_name || name;
             const options = getColumnOptions(column);
-            const validValue = Array.isArray(value) && value.length !== 0 ? value : [];
+            const validValue = Array.isArray(newValue) && newValue.length !== 0 ? newValue : [newValue];
             displayName = /*#__PURE__*/React.createElement("div", {
               className: "pivot-table-display-name-row"
             }, validValue.map(item => {

package/package.json

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