sea-chart 0.0.82-alpha.2 → 0.0.82

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

@@ -308,14 +308,6 @@ 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

@@ -5,8 +5,6 @@ import { isArrayCellValue } from '../../cell-value-utils';
 import { getFormattedLabel, isValidRow } from '../../row-utils';
 import BaseUtils from '../base-utils';
 import { summaryMethodColumn2SqlColumn } from '../../sql/column-2-sql-column';
-
-// one
 async function calculateOneDimensionTable(chart, value, _ref) {
   let {
     getViewRows,
@@ -58,7 +56,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
       }
     }
   });
-  const summary_columns_option_keys = Array.isArray(summary_columns) ? summary_columns.map(option => option.column_key) : [];
+  const summary_columns_option_keys = Array.isArray(summary_columns) ? summary_columns.map(option => option.key) : [];
   const statisticColumnKeys = [summary_column_key, ...summary_columns_option_keys];
   const validStatisticColumnKeys = statisticColumnKeys;
   let statisticColumns = validStatisticColumnKeys.map(key => {
@@ -72,7 +70,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.summary_method;
+      statisticColumns[index + 1].method = option.method;
     }
   });
   const {
@@ -207,8 +205,6 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
     pivot_columns_total
   };
 }
-
-// two
 async function calculateTwoDimensionTable(chart, value, _ref2) {
   let {
     getViewRows,
@@ -243,7 +239,34 @@ 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 {
@@ -306,10 +329,9 @@ 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,
-    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'
+    dimensions: TABLE_DIMENSIONS.TWO
   };
 }
 function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow, isIncludeEmpty, dateGranularity, geolocationGranularity, isRowGroupbyColumnDataAsAnArray) {
@@ -412,7 +434,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.toUpperCase(),
+                summaryMethod: current.summary_method,
                 summaryColumn: current.column
               }, currentValue, nextValue);
               const columnName = current.column.name;
@@ -506,6 +528,21 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
     total
   });
 }
+function isSameName(prevName, currName) {
+  if (isNumber(prevName) && isNumber(currName)) {
+    return prevName === currName;
+  }
+  if (!prevName && !currName) {
+    return prevName === null && currName === null || prevName === undefined && currName === undefined || isNaN(prevName) && isNaN(currName);
+  }
+  return prevName === currName;
+}
+function isSameGroup(isColumnDataAsAnArray, source, target) {
+  if (isColumnDataAsAnArray) {
+    return (!source || source.length === 0) && !target || source && source.includes(target);
+  }
+  return source === null && target === null || source === undefined && target === undefined || source === target;
+}
 function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formula_rows) {
   let pivot_rows = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
   let pivot_columns = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : [];
@@ -582,23 +619,6 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
     pivot_table_total
   };
 }
-
-// utils
-function isSameName(prevName, currName) {
-  if (isNumber(prevName) && isNumber(currName)) {
-    return prevName === currName;
-  }
-  if (!prevName && !currName) {
-    return prevName === null && currName === null || prevName === undefined && currName === undefined || isNaN(prevName) && isNaN(currName);
-  }
-  return prevName === currName;
-}
-function isSameGroup(isColumnDataAsAnArray, source, target) {
-  if (isColumnDataAsAnArray) {
-    return (!source || source.length === 0) && !target || source && source.includes(target);
-  }
-  return source === null && target === null || source === undefined && target === undefined || source === target;
-}
 function getTotal(summary_column, summary_type, summary_method) {
   let rows = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   let formula_rows = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
@@ -634,7 +654,6 @@ function getTotal(summary_column, summary_type, summary_method) {
           total++;
         }
       });
-      total = getTotalByType(oldTotal, total);
       return total;
     }
     if (summary_column && isDateColumn(summary_column)) {
@@ -692,10 +711,22 @@ function getTotal(summary_column, summary_type, summary_method) {
               }
             });
             if (summary_method === 'Sum') {
-              total = getTotalByType(oldTotal, Number.parseFloat(sum.toFixed(8)));
+              if (Array.isArray(oldTotal)) {
+                const newTotal = JSON.parse(JSON.stringify(oldTotal));
+                newTotal[0][1] = Number.parseFloat(sum.toFixed(8));
+                total = newTotal;
+              } else {
+                total = Number.parseFloat(sum.toFixed(8));
+              }
             } else if (summary_method === 'Mean') {
-              const val = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
-              total = getTotalByType(oldTotal, val);
+              if (Array.isArray(oldTotal)) {
+                const newTotal = JSON.parse(JSON.stringify(oldTotal));
+                const val = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
+                newTotal[0][1] = val;
+                total = newTotal;
+              } else {
+                total = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
+              }
             }
             break;
           }
@@ -728,15 +759,15 @@ function getTotal(summary_column, summary_type, summary_method) {
                 let formulaRow = formula_rows[result._id];
                 if (formulaRow) {
                   if (formulaRow[summary_column_key] && typeof formulaRow[summary_column_key] === 'object') {
-                    total = getTotalByType(oldTotal, formulaRow[summary_column_key][0]);
+                    total = formulaRow[summary_column_key][0];
                   } else {
-                    getTotalByType(oldTotal, formulaRow[summary_column_key]);
+                    total = formulaRow[summary_column_key];
                   }
                 } else {
-                  total = getTotalByType(oldTotal, null);
+                  total = null;
                 }
               } else {
-                total = getTotalByType(oldTotal, result[summary_column_key]);
+                total = result[summary_column_key];
               }
             }
             break;
@@ -750,7 +781,7 @@ function getTotal(summary_column, summary_type, summary_method) {
   }
   // formula_rows result can be '#VALUE!'
   if (total === '#VALUE!') {
-    total = getTotalByType(oldTotal, 0);
+    total = 0;
   }
   return total || 0;
 }
@@ -800,18 +831,6 @@ function getDateMaxOrMinTotal(dateArr, type) {
   dateIndex = list.indexOf(dateValue);
   return dateArr[dateIndex];
 }
-function getTotalByType(oldTotal, value) {
-  let newTotal = '';
-  if (Array.isArray(oldTotal)) {
-    newTotal = JSON.parse(JSON.stringify(oldTotal));
-    newTotal[0][1] = value;
-  } else {
-    newTotal = value;
-  }
-  return newTotal;
-}
-
-// index
 function calculator(chart, value, _ref3) {
   let {
     getViewRows,

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(item => {
+        return summaryColumns.map(() => {
           return /*#__PURE__*/React.createElement("div", {
-            key: "table-cell-".concat(item.key),
+            key: "table-cell-".concat(cellIdx),
             className: classnames('pivot-cell', {
               'pivot-empty-cell': true
             })

package/package.json

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