sea-chart 0.0.82-alpha.0 → 0.0.82-alpha.2

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

@@ -308,6 +308,14 @@ BaseUtils.getSummaryValue = (_ref, currentValue, nextValue) => {
     if (currentValue === null && nextValue === null) return null;
     if (currentValue === null) return nextValue;
     if (nextValue === null) return currentValue;
+    if (currentValue && nextValue) {
+      if (summaryMethod === 'MAX') {
+        return Math.max(currentValue, nextValue);
+      }
+      if (summaryMethod === 'MIN') {
+        return Math.min(currentValue, nextValue);
+      }
+    }
   }
   return (currentValue - 0 || 0) + (nextValue - 0 || 0);
 };

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

@@ -58,7 +58,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
       }
     }
   });
-  const summary_columns_option_keys = Array.isArray(summary_columns) ? summary_columns.map(option => option.key) : [];
+  const summary_columns_option_keys = Array.isArray(summary_columns) ? summary_columns.map(option => option.column_key) : [];
   const statisticColumnKeys = [summary_column_key, ...summary_columns_option_keys];
   const validStatisticColumnKeys = statisticColumnKeys;
   let statisticColumns = validStatisticColumnKeys.map(key => {
@@ -72,7 +72,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
   }
   Array.isArray(summary_columns) && summary_columns.forEach((option, index) => {
     if (statisticColumns[index + 1]) {
-      statisticColumns[index + 1].method = option.method;
+      statisticColumns[index + 1].method = option.summary_method;
     }
   });
   const {
@@ -243,34 +243,7 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
   const summaryColumn = getTableColumnByKey(table, summary_column_key);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
-  const pivot_summary_multiple_columns = [];
-  Array.isArray(summary_columns) && summary_columns.forEach(item => {
-    const column = getTableColumnByKey(table, item.column_key);
-    if (column && isNumericColumn(column)) {
-      pivot_summary_multiple_columns.push({
-        key: item.column_key,
-        type: column.type,
-        data: column.data,
-        method: item.summary_method,
-        column_name: column.name
-      });
-    }
-  });
-
-  // [{key: null}, {key: cell_value}, {key: cell_value}, ...]
   let pivot_columns = [];
-
-  //  [
-  //    {
-  //      name: '',
-  //      cells: {
-  //        [key1]: {rows: [], total: ''},
-  //        [key2]: {rows: [], total: ''},
-  //        [key3]: {rows: [], total: ''},
-  //      }
-  //    },
-  //    ...
-  //  ]
   let pivot_rows = [];
   statRows.forEach(row => {
     const {
@@ -333,9 +306,10 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
     pivot_columns,
     pivot_columns_total: new_pivot_columns_total,
     pivot_table_total,
-    pivot_summary_multiple_columns,
     formulaRows,
-    dimensions: TABLE_DIMENSIONS.TWO
+    dimensions: TABLE_DIMENSIONS.TWO,
+    summary_columns: [summaryColumn, ...(summary_columns === null || summary_columns === void 0 ? void 0 : summary_columns.map(item => getTableColumnByKey(table, item.column_key)))],
+    isSingleNumericColumn: !summary_columns.length ? 'true' : 'false'
   };
 }
 function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow, isIncludeEmpty, dateGranularity, geolocationGranularity, isRowGroupbyColumnDataAsAnArray) {
@@ -438,7 +412,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
               const nextValue = row[current === null || current === void 0 ? void 0 : current.column.key];
               const currentValue = Object.values(cells[key].total).find(item => item[2] === columnKey)[1];
               const computedValue = BaseUtils.getSummaryValue({
-                summaryMethod: current.summary_method,
+                summaryMethod: current.summary_method.toUpperCase(),
                 summaryColumn: current.column
               }, currentValue, nextValue);
               const columnName = current.column.name;

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

@@ -132,9 +132,9 @@ class TwoDimensionTable extends PureComponent {
     };
     this.renderEmpty = (summaryColumns, cellIdx) => {
       if (summaryColumns && (summaryColumns === null || summaryColumns === void 0 ? void 0 : summaryColumns.length) !== 0) {
-        return summaryColumns.map(() => {
+        return summaryColumns.map(item => {
           return /*#__PURE__*/React.createElement("div", {
-            key: "table-cell-".concat(cellIdx),
+            key: "table-cell-".concat(item.key),
             className: classnames('pivot-cell', {
               'pivot-empty-cell': true
             })

package/package.json

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