sea-chart 0.0.81-alpha.1 → 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

@@ -454,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 = [];
@@ -476,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);
@@ -484,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 = () => {
@@ -519,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();
@@ -581,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/package.json

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