dtable-statistic 4.0.12 → 4.0.13

package/es/calculator/workers/pivot-table-calculator-worker.js

@@ -56,9 +56,8 @@ function calculateOneDimensionTable(chart, value, username, userId) {
           });
         }
       } else {
-        pivotRowIndex = pivot_rows.findIndex(function (r) {
-          var resName = r.name;
-          return resName === null && name === null || resName === undefined && name === undefined || resName === 0 && name === 0 || resName === name;
+        pivotRowIndex = pivot_rows.findIndex(function (pivotRow) {
+          return isSameName(pivotRow.name, name);
         });
         updateOneDimensionRows(pivot_rows, pivotRowIndex, name, row);
       }
@@ -99,7 +98,8 @@ function calculateOneDimensionTable(chart, value, username, userId) {
   return {
     pivot_columns_total: pivot_columns_total,
     pivot_rows: pivot_rows,
-    pivot_columns: pivot_columns
+    pivot_columns: pivot_columns,
+    formulaRows: formulaRows
   };
 }
 function updateOneDimensionRows(pivot_rows, index, name, row) {
@@ -286,9 +286,8 @@ function calculateTwoDimensionTable(chart, value, username, userId) {
           });
         }
       } else {
-        pivotRowIndex = pivot_rows.findIndex(function (r) {
-          var resName = r.name;
-          return resName === null && name === null || resName === undefined && name === undefined || resName === 0 && name === 0 || resName === name;
+        pivotRowIndex = pivot_rows.findIndex(function (pivotRow) {
+          return isSameName(pivotRow.name, name);
         });
         updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, name, row, isRowGroupbyColumnDataAsAnArray, cellValueForColumn);
       }
@@ -403,6 +402,15 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
     });
   }
 }
+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);

package/es/stat-view/pie-chart.js

@@ -87,8 +87,6 @@ var PieChart = /*#__PURE__*/function (_BaseChart) {
             var name = obj.name;
             if (!obj.name && typeof obj.name !== 'number') {
               name = intl.get(EMPTY_NAME);
-            } else if (obj.name === 'Others') {
-              name = intl.get('Others');
             }
             return {
               name: name,

package/es/stat-view/pivot-table/index.js

@@ -77,10 +77,10 @@ var PivotTable = /*#__PURE__*/function (_BaseChart) {
       var summaryMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : SUMMARY_TYPE.COUNT;
       if (!summaryColumn || !summaryColumn.type) return summaryValue;
       if (!summaryValue && summaryValue !== 0) return summaryValue;
-      if (summaryMethod.toUpperCase() === 'DISTINCT_VALUES') return summaryValue;
+      if (summaryMethod && summaryMethod.toUpperCase() === 'DISTINCT_VALUES') return summaryValue;
       var data = summaryColumn.data;
       if (TIME_COLUMN_LIST.includes(summaryColumn.type)) {
-        if (typeof summaryValue !== 'string') return summaryValue;
+        if (typeof summaryValue !== 'string') return '';
         // The date returned by db carries T and Z, so that there is a time difference in data formatting
         var _ref = data || {},
           format = _ref.format;

package/es/stat-view/pivot-table/two-dimension-table.js

@@ -6,10 +6,11 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { PureComponent } from 'react';
 import intl from 'react-intl-universal';
-import { FORMULA_COLUMN_TYPES_MAP, isNumber, TableUtils, Views } from 'dtable-store';
+import { isNumber, TableUtils, Views } from 'dtable-store';
 import PivotTableDisplayName from './pivot-table-display-name';
 import { isMobile } from '../../utils';
-import { STATISTICS_COUNT_TYPE, SUMMARY_METHOD_MAP, TITLE_TOTAL } from '../../constants';
+import { getPivotTableSummaryTotal } from '../../utils/pivot-table';
+import { STATISTICS_COUNT_TYPE, TITLE_TOTAL } from '../../constants';
 import styles from './statistic-pivot-table.module.css';
 var TwoDimensionTable = /*#__PURE__*/function (_PureComponent) {
   _inherits(TwoDimensionTable, _PureComponent);
@@ -59,95 +60,6 @@ var TwoDimensionTable = /*#__PURE__*/function (_PureComponent) {
       }
       return 0;
     };
-    _this.getCellValueFromRow = function (row, formulaRow, columnType, columnKey, sqlKey, isSqlQuery) {
-      if (!isSqlQuery) {
-        if (FORMULA_COLUMN_TYPES_MAP[columnType]) {
-          var cellValue = formulaRow[columnKey];
-          return Array.isArray(cellValue) ? cellValue[0] : cellValue;
-        }
-        return row[columnKey];
-      }
-      return row[sqlKey];
-    };
-    _this.getSummaryTotal = function (summaryColumnType, summaryColumnKey, sqlKey, summaryType, summaryMethod, rows, formulaRows, isSqlQuery) {
-      if (summaryType === STATISTICS_COUNT_TYPE.COUNT) {
-        return rows.length;
-      }
-      if (summaryType !== STATISTICS_COUNT_TYPE.ADVANCED) {
-        return 0;
-      }
-      switch (summaryMethod) {
-        case SUMMARY_METHOD_MAP.Distinct_values:
-          {
-            var count = 0;
-            var existMap = {};
-            rows.forEach(function (row) {
-              var formulaRow = formulaRows && formulaRows[row._id];
-              var cellValue = _this.getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
-              if (!cellValue) {
-                if (cellValue === 0) {
-                  cellValue = '0';
-                } else {
-                  cellValue = !!cellValue;
-                }
-              }
-              if (!existMap[cellValue]) {
-                existMap[cellValue] = true;
-                count++;
-              }
-            });
-            return count;
-          }
-        case SUMMARY_METHOD_MAP.Sum:
-        case SUMMARY_METHOD_MAP.Mean:
-          {
-            var sum = 0;
-            var validNumbersCount = 0;
-            rows.forEach(function (row) {
-              var formulaRow = formulaRows && formulaRows[row._id];
-              var cellValue = _this.getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
-              if (isNumber(cellValue)) {
-                validNumbersCount++;
-                sum += cellValue;
-              }
-            });
-            if (summaryMethod === SUMMARY_METHOD_MAP.Sum) {
-              sum = Number.parseFloat(sum.toFixed(8));
-            } else if (summaryMethod === SUMMARY_METHOD_MAP.Mean) {
-              sum = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
-            }
-            return sum;
-          }
-        case SUMMARY_METHOD_MAP.Max:
-        case SUMMARY_METHOD_MAP.Min:
-          {
-            if (rows.length === 0) {
-              return 0;
-            }
-            var result = rows.reduce(function (current, next) {
-              var currentFormulaRow = formulaRows && formulaRows[current._id];
-              var nextFormulaRow = formulaRows && formulaRows[next._id];
-              var currentValue = _this.getCellValueFromRow(current, currentFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
-              var nextValue = _this.getCellValueFromRow(next, nextFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
-              if (!nextValue && nextValue !== 0) {
-                return current;
-              }
-              var isNextGreater = currentValue < nextValue;
-              if (summaryMethod === SUMMARY_METHOD_MAP.Min) {
-                return isNextGreater ? current : next;
-              } else {
-                return isNextGreater ? next : current;
-              }
-            });
-            var formulaRow = formulaRows && formulaRows[result._id];
-            return _this.getCellValueFromRow(result, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
-          }
-        default:
-          {
-            return 0;
-          }
-      }
-    };
     _this.getCells = function (row, summaryColumn) {
       var _this$props2 = _this.props,
         pivotResult = _this$props2.pivotResult,
@@ -172,7 +84,7 @@ var TwoDimensionTable = /*#__PURE__*/function (_PureComponent) {
             sqlKey = column.sqlKey,
             method = column.method;
           if (Array.isArray(rowData)) {
-            var sum = _this.getSummaryTotal(type, key, sqlKey, STATISTICS_COUNT_TYPE.ADVANCED, method, rowData, formulaRows, isSqlQuery);
+            var sum = getPivotTableSummaryTotal(type, key, sqlKey, STATISTICS_COUNT_TYPE.ADVANCED, method, rowData, formulaRows, isSqlQuery);
             summary_multiple_columns.push(sum);
             formatted_summary_multiple_columns.push(getSummaryValueDisplayString(column, sum, method));
             return;
@@ -386,7 +298,7 @@ var TwoDimensionTable = /*#__PURE__*/function (_PureComponent) {
               key = summaryCol.key,
               sqlKey = summaryCol.sqlKey,
               method = summaryCol.method;
-            total += _this.getSummaryTotal(type, key, sqlKey, STATISTICS_COUNT_TYPE.ADVANCED, method, pivotColumnCell, formulaRows, isSqlQuery);
+            total += getPivotTableSummaryTotal(type, key, sqlKey, STATISTICS_COUNT_TYPE.ADVANCED, method, pivotColumnCell, formulaRows, isSqlQuery);
           });
           totalDisplayValue = total;
           allTotalDisplay += total;

package/es/stat-view/ring-chart.js

@@ -161,8 +161,6 @@ var RingChart = /*#__PURE__*/function (_BaseChart) {
         var title = name;
         if (!name || name === 'undefined') {
           title = intl.get(EMPTY_NAME);
-        } else if (name === 'Others') {
-          title = intl.get('Others');
         }
         return show_percent || display_label ? {
           name: title,

package/es/utils/common-utils.js

@@ -1,4 +1,6 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_COLUMN_TYPES_MAP, FORMULA_RESULT_TYPE, generatorBase64Code, isNumber, TableUtils } from 'dtable-store';
+import intl from 'react-intl-universal';
 import { STAT_TYPE, DEFAULT_LABEL_FONT_SIZE, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, CHART_STYLE_COLORS, PIE_COLOR_OPTIONS, SUMMARY_METHOD_MAP } from '../constants';
 import StatUtils from './stat-utils';
 export var generatorUniqueId = function generatorUniqueId(list) {
@@ -8,7 +10,10 @@ export var generatorUniqueId = function generatorUniqueId(list) {
     uniqueId = generatorBase64Code();
 
     // eslint-disable-next-line
-    isUnique = Array.isArray(list) && list.length > 0 ? true : list.every(function (item) {
+    if (!Array.isArray(list) || list.length === 0) {
+      break;
+    }
+    isUnique = list.every(function (item) {
       return item._id !== uniqueId;
     });
     if (isUnique) {
@@ -251,10 +256,28 @@ export function formatPieChartData(data, statItem, table, currentTheme) {
     var filteredSum = filteredItems.reduce(function (total, currentValue) {
       return total += currentValue.value;
     }, 0);
+    var original_name_list = [];
+    var name_list = [];
+    var rows = [];
+    filteredItems.forEach(function (item) {
+      if (item.original_name) {
+        original_name_list.push(item.original_name);
+      }
+      if (item.name) {
+        name_list.push(item.name);
+      }
+      if (item.rows) {
+        rows.push.apply(rows, _toConsumableArray(item.rows));
+      }
+    });
     data.push({
-      name: 'Others',
+      rows: rows,
+      name_list: name_list,
+      original_name_list: original_name_list,
+      name: intl.get('Others'),
       value: filteredSum,
       color: '#dbdbdb',
+      original_name: 'Others',
       percent: String(Number.parseFloat(filteredSum / sum * 100).toFixed(1)) + '%'
     });
     colorSet.push('#dbdbdb');

package/es/utils/export-table-utils.js

@@ -5,7 +5,8 @@ import { getOption, getCollaborator, getNumberDisplayString, isNumber, CellType,
 import { isCellValueChanged } from './cell-value';
 import { getSelectColumnOptions, getDateColumnFormat } from './column';
 import { getKnownCreatorByEmail } from './collaborator';
-import { EMPTY_NAME } from '../constants';
+import { EMPTY_NAME, STATISTICS_COUNT_TYPE } from '../constants';
+import { getPivotTableSummaryTotal } from './pivot-table';
 var isEmptyName = function isEmptyName(title) {
   return title === null || title === '';
 };
@@ -96,276 +97,8 @@ var getValidValueForColumn = function getValidValueForColumn(column, value) {
   if (type === CellType.TEXT) return value ? value : '';
   return '';
 };
-var getUpdatedOneDimensionStatisticTableResultToTable = function getUpdatedOneDimensionStatisticTableResultToTable(_ref3) {
-  var updateTable = _ref3.updateTable,
-    statisticalResult = _ref3.statisticalResult;
-  var pivotResult = statisticalResult.pivotResult,
-    groupbyColumn = statisticalResult.groupbyColumn,
-    statisticTableColumns = statisticalResult.statisticTableColumns;
-  if (!groupbyColumn) return {};
-  var nameColumn = TableUtils.getTableColumnByName(updateTable, groupbyColumn.name);
-  if (!nameColumn) return {};
-  var pivot_rows = pivotResult.pivot_rows,
-    pivot_columns = pivotResult.pivot_columns;
-  var tableRows = updateTable.rows;
-  var columnMap = {};
-  var newRows = [];
-  var updatedRows = {};
-  var oldRows = {};
-  var rowIds = [];
-
-  // one dimension table no summary columns
-  if (pivot_columns.length < 2) {
-    columnMap['total'] = TableUtils.getTableColumnByName(updateTable, intl.get('Total'));
-
-    // updated rows
-    pivot_rows.forEach(function (item) {
-      var name = item.name,
-        original_name = item.original_name,
-        total = item.total;
-      var groupName = isEmptyName(original_name) ? intl.get(EMPTY_NAME) : name;
-      var row = tableRows.find(function (row) {
-        return row[nameColumn.key] === groupName;
-      });
-      var totalColumn = columnMap['total'];
-      if (row) {
-        // update old row
-        var updateRow = {};
-        var oldRow = {};
-        var validTotalCellValue = getValidValueForColumn(totalColumn, total.total);
-        if (totalColumn && isCellValueChanged(row[totalColumn.key], validTotalCellValue, totalColumn.type)) {
-          updateRow[totalColumn.key] = validTotalCellValue;
-          oldRow[totalColumn.key] = row[totalColumn.key];
-        }
-        if (Object.keys(updateRow).length > 0) {
-          var rowId = row._id;
-          rowIds.push(rowId);
-          updatedRows[rowId] = updateRow;
-          oldRows[rowId] = oldRow;
-        }
-      } else {
-        // insert new row
-        var newRow = {};
-        newRow[nameColumn.key] = groupName;
-        if (totalColumn) {
-          newRow[totalColumn.key] = getValidValueForColumn(totalColumn, total.total);
-        }
-        newRows.push(newRow);
-      }
-    });
-    return {
-      newRows: newRows,
-      updatedRows: updatedRows,
-      rowIds: rowIds,
-      oldRows: oldRows
-    };
-  }
-
-  // one dimension table with summary columns
-  Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
-    var key = item.key;
-    var column = statisticTableColumns.find(function (column) {
-      return column.key === key;
-    });
-    if (column) {
-      columnMap[key] = TableUtils.getTableColumnByName(updateTable, column.name);
-    }
-  });
-
-  // updated rows
-  var nameColumnKey = nameColumn.key;
-  pivot_rows.forEach(function (item) {
-    var name = item.name,
-      original_name = item.original_name,
-      total = item.total;
-    var groupName = isEmptyName(original_name) ? intl.get(EMPTY_NAME) : name;
-    var row = tableRows.find(function (row) {
-      return row[nameColumnKey] === groupName;
-    });
-    if (row) {
-      var updateRow = {};
-      var oldRow = {};
-      Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
-        var key = item.key;
-        var column = columnMap[key];
-        var totalCellValue = getValidValueForColumn(column, total[key]);
-        if (column && isCellValueChanged(row[column.key], totalCellValue, column.type)) {
-          updateRow[column.key] = totalCellValue;
-          oldRow[column.key] = row[column.key];
-        }
-      });
-      if (Object.keys(updateRow).length > 0) {
-        var rowId = row._id;
-        rowIds.push(rowId);
-        updatedRows[rowId] = updateRow;
-        oldRows[rowId] = oldRow;
-      }
-    } else {
-      var newRow = _defineProperty({}, nameColumn.key, groupName);
-      Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
-        var key = item.key;
-        var column = columnMap[key];
-        if (column) {
-          var totalCellValue = getValidValueForColumn(column, total[key]);
-          newRow[column.key] = totalCellValue;
-        }
-      });
-      newRows.push(newRow);
-    }
-  });
-  return {
-    newRows: newRows,
-    updatedRows: updatedRows,
-    rowIds: rowIds,
-    oldRows: oldRows
-  };
-};
-var getUpdatedTwoDimensionStatisticTableResultToTable = function getUpdatedTwoDimensionStatisticTableResultToTable(_ref4) {
-  var updateTable = _ref4.updateTable,
-    statisticalResult = _ref4.statisticalResult;
-  var pivotResult = statisticalResult.pivotResult,
-    groupbyColumn = statisticalResult.groupbyColumn;
-  var nameColumn = TableUtils.getTableColumnByName(updateTable, groupbyColumn.name);
-  if (!nameColumn) return {};
-  var pivot_rows = pivotResult.pivot_rows,
-    pivot_columns = pivotResult.pivot_columns;
-  var tableRows = updateTable.rows;
-  var columnMap = {};
-  var newRows = [];
-  var updatedRows = {};
-  var rowIds = [];
-  var oldRows = {};
-
-  // updated columns
-  Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
-    var key = item.key,
-      original_key = item.original_key;
-    var columnName = isEmptyName(original_key) ? intl.get(EMPTY_NAME) : key;
-    columnMap[columnName] = TableUtils.getTableColumnByName(updateTable, columnName);
-  });
-  columnMap['total'] = TableUtils.getTableColumnByName(updateTable, intl.get('Total'));
-
-  // updated rows
-  var _loop = function _loop(i) {
-    var pivotRow = pivot_rows[i];
-    var name = pivotRow.name,
-      original_name = pivotRow.original_name,
-      cells = pivotRow.cells,
-      total = pivotRow.total;
-    if (isEmptyName(original_name)) {
-      name = intl.get(EMPTY_NAME);
-    }
-    var nameColumnKey = nameColumn.key;
-    var row = tableRows.find(function (row) {
-      return row[nameColumnKey] === name;
-    });
-    var totalColumn = columnMap['total'];
-    if (row) {
-      // update old row
-      var updatedRow = {};
-      var oldRow = {}; // op used
-      var validTotalCellValue = getValidValueForColumn(totalColumn, total);
-      if (totalColumn && isCellValueChanged(row[totalColumn.key], validTotalCellValue, totalColumn.type)) {
-        updatedRow[totalColumn.key] = validTotalCellValue;
-        oldRow[totalColumn.key] = row[totalColumn.key];
-      }
-      Object.keys(cells).forEach(function (key) {
-        var columnName = isEmptyName(key) ? intl.get(EMPTY_NAME) : key;
-        var column = columnMap[columnName];
-        var validCellValue = getValidValueForColumn(column, cells[key].total);
-        if (column && isCellValueChanged(row[column.key], validCellValue, column.type)) {
-          updatedRow[column.key] = validCellValue;
-          oldRow[column.key] = row[column.key];
-        }
-      });
-      if (Object.keys(updatedRow).length > 0) {
-        var rowId = row._id;
-        rowIds.push(rowId);
-        updatedRows[rowId] = updatedRow;
-        oldRows[rowId] = oldRow;
-      }
-    } else {
-      // insert new row
-      var newRow = {};
-      newRow[nameColumnKey] = name;
-      if (totalColumn) {
-        newRow[totalColumn.key] = getValidValueForColumn(totalColumn, name);
-      }
-      Object.keys(cells).forEach(function (key) {
-        var columnName = isEmptyName(key) ? intl.get(EMPTY_NAME) : key;
-        var column = columnMap[columnName];
-        if (column) {
-          newRow[column.key] = getValidValueForColumn(column, cells[key].total);
-        }
-      });
-      if (Object.keys(newRow).length > 0) {
-        newRows.push(newRow);
-      }
-    }
-  };
-  for (var i = 0; i < pivot_rows.length; i++) {
-    _loop(i);
-  }
-  return {
-    newRows: newRows,
-    updatedRows: updatedRows,
-    oldRows: oldRows,
-    rowIds: rowIds
-  };
-};
-
-/**
-  * statisticalResult: {
-  *  columnGroupbyColumn: null,
-  *  groupbyColumn: null,
-  *  pivotResult: {
-  *    pivot_columns: [],
-  *    pivot_rows: [
-  *      { name: 'xxx', original_name: 'xxx', total }
-  *    ]
-  *  },
-  *  statisticTableColumns: null,
-  *  summaryColumn: null,
-  * }
-  *
-  * @return {
-  *   columns: [
-  *      {
-  *        name: xxx,
-  *        type: CellType.DATE
-  *        data: { format }
-  *      }, {
-  *        name: xxx,
-  *        type: CellType.NUMBER
-  *        data: { decimal, thousands, precision, enable_precision, format }
-  *      },
-  *    ],
-  *    rows: [
-  *      { columnName: value, xxx },
-  *    ]
-  * }
-  */
-export var exportStatisticToTable = function exportStatisticToTable(_ref5) {
-  var statisticalResult = _ref5.statisticalResult;
-  var pivotResult = statisticalResult.pivotResult,
-    groupbyColumn = statisticalResult.groupbyColumn,
-    columnGroupbyColumn = statisticalResult.columnGroupbyColumn;
-  var pivot_columns = pivotResult.pivot_columns;
-  if (!groupbyColumn) return {};
-
-  // two dimension table
-  if (columnGroupbyColumn) {
-    return getTwoDimensionStatisticTableResultToTable({
-      statisticalResult: statisticalResult
-    });
-  }
-  if (!Array.isArray(pivot_columns)) return {};
-  return getOneDimensionStatisticTableResultToTable({
-    statisticalResult: statisticalResult
-  });
-};
-export var getOneDimensionStatisticTableResultToTable = function getOneDimensionStatisticTableResultToTable(_ref6) {
-  var statisticalResult = _ref6.statisticalResult;
+var exportOneDimensionToTable = function exportOneDimensionToTable(_ref3) {
+  var statisticalResult = _ref3.statisticalResult;
   var pivotResult = statisticalResult.pivotResult,
     groupbyColumn = statisticalResult.groupbyColumn,
     statisticTableColumns = statisticalResult.statisticTableColumns,
@@ -393,8 +126,8 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
     var isIncludeHour = false;
     if (summaryColumn) {
       if (isSummaryDateColumn(summaryColumn)) {
-        var _ref7 = summaryColumn.data || {},
-          format = _ref7.format;
+        var _ref4 = summaryColumn.data || {},
+          format = _ref4.format;
         columnData = {
           format: format
         };
@@ -406,12 +139,12 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
           such as the data attribute in the function column, which contains other content that is not
           useful for creating a new column
         */
-        var _ref8 = summaryColumn.data || {},
-          decimal = _ref8.decimal,
-          thousands = _ref8.thousands,
-          precision = _ref8.precision,
-          enable_precision = _ref8.enable_precision,
-          _format = _ref8.format;
+        var _ref5 = summaryColumn.data || {},
+          decimal = _ref5.decimal,
+          thousands = _ref5.thousands,
+          precision = _ref5.precision,
+          enable_precision = _ref5.enable_precision,
+          _format = _ref5.format;
         columnData = {
           decimal: decimal,
           thousands: thousands,
@@ -432,7 +165,7 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
 
     // generator rows
     pivot_rows.forEach(function (item) {
-      var _newRow2;
+      var _newRow;
       var name = item.name,
         original_name = item.original_name,
         total = item.total;
@@ -441,7 +174,7 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
       if (_isDateSummaryColumn && cellValue) {
         cellValue = isIncludeHour ? dayjs(cellValue).format('YYYY-MM-DD HH:mm') : dayjs(cellValue).format('YYYY-MM-DD');
       }
-      var newRow = (_newRow2 = {}, _defineProperty(_newRow2, groupbyColumn.name, groupName), _defineProperty(_newRow2, intl.get('Total'), cellValue), _newRow2);
+      var newRow = (_newRow = {}, _defineProperty(_newRow, groupbyColumn.name, groupName), _defineProperty(_newRow, intl.get('Total'), cellValue), _newRow);
       rows.push(newRow);
     });
     return {
@@ -462,8 +195,8 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
       var columnType = CellType.NUMBER;
       if (isSummaryDateColumn(column)) {
         columnType = CellType.DATE;
-        var _ref9 = column.data || {},
-          _format2 = _ref9.format;
+        var _ref6 = column.data || {},
+          _format2 = _ref6.format;
         _columnData = {
           format: _format2
         };
@@ -473,12 +206,12 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
           such as the data attribute in the function column, which contains other content that is not
           useful for creating a new column
         */
-        var _ref10 = column.data || {},
-          _decimal = _ref10.decimal,
-          _thousands = _ref10.thousands,
-          _precision = _ref10.precision,
-          _enable_precision = _ref10.enable_precision,
-          _format3 = _ref10.format;
+        var _ref7 = column.data || {},
+          _decimal = _ref7.decimal,
+          _thousands = _ref7.thousands,
+          _precision = _ref7.precision,
+          _enable_precision = _ref7.enable_precision,
+          _format3 = _ref7.format;
         _columnData = {
           decimal: _decimal,
           thousands: _thousands,
@@ -505,12 +238,14 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
     var groupName = isEmptyName(original_name) ? intl.get(EMPTY_NAME) : name;
     var newRow = _defineProperty({}, groupbyColumn.name, groupName);
     Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
-      var key = item.key;
+      var key = item.key,
+        method = item.method;
       var column = columnMap[key];
+      var cellValueKey = key + method;
       var name = column.name,
         type = column.type,
         data = column.data;
-      var cellValue = total[key];
+      var cellValue = total[cellValueKey];
       if (type === CellType.DATE && cellValue) {
         var dateFormat = data && data.format && data.format.indexOf('HH:mm') > -1 ? 'YYYY-MM-DD HH:mm' : 'YYYY-MM-DD';
         cellValue = dayjs(cellValue).format(dateFormat);
@@ -524,8 +259,8 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
     rows: rows
   };
 };
-export var getTwoDimensionStatisticTableResultToTable = function getTwoDimensionStatisticTableResultToTable(_ref11) {
-  var statisticalResult = _ref11.statisticalResult;
+var exportTwoDimensionToTable = function exportTwoDimensionToTable(_ref8) {
+  var statisticalResult = _ref8.statisticalResult;
   var pivotResult = statisticalResult.pivotResult,
     groupbyColumn = statisticalResult.groupbyColumn,
     summaryColumn = statisticalResult.summaryColumn;
@@ -550,8 +285,8 @@ export var getTwoDimensionStatisticTableResultToTable = function getTwoDimension
   if (summaryColumn) {
     if (isSummaryDateColumn(summaryColumn)) {
       _isDateSummaryColumn = true;
-      var _ref12 = summaryColumn.data || {},
-        format = _ref12.format;
+      var _ref9 = summaryColumn.data || {},
+        format = _ref9.format;
       columnData = {
         format: format
       };
@@ -562,12 +297,12 @@ export var getTwoDimensionStatisticTableResultToTable = function getTwoDimension
         such as the data attribute in the function column, which contains other content that is not
         useful for creating a new column
       */
-      var _ref13 = summaryColumn.data || {},
-        decimal = _ref13.decimal,
-        thousands = _ref13.thousands,
-        precision = _ref13.precision,
-        enable_precision = _ref13.enable_precision,
-        _format4 = _ref13.format;
+      var _ref10 = summaryColumn.data || {},
+        decimal = _ref10.decimal,
+        thousands = _ref10.thousands,
+        precision = _ref10.precision,
+        enable_precision = _ref10.enable_precision,
+        _format4 = _ref10.format;
       columnData = {
         decimal: decimal,
         thousands: thousands,
@@ -628,23 +363,487 @@ export var getTwoDimensionStatisticTableResultToTable = function getTwoDimension
     rows: rows
   };
 };
-export var updateStatisticToTable = function updateStatisticToTable(_ref14) {
-  var updateTable = _ref14.updateTable,
-    statisticalResult = _ref14.statisticalResult;
-  var groupbyColumn = statisticalResult.groupbyColumn,
-    columnGroupbyColumn = statisticalResult.columnGroupbyColumn;
-  if (!groupbyColumn) return {};
-
-  // two dimension table
+var getTwoDimensionWithSummaryColumns = function getTwoDimensionWithSummaryColumns(_ref11) {
+  var statisticalResult = _ref11.statisticalResult;
+  var pivotResult = statisticalResult.pivotResult,
+    groupbyColumn = statisticalResult.groupbyColumn;
+  var pivot_rows = pivotResult.pivot_rows,
+    pivot_columns = pivotResult.pivot_columns,
+    pivot_summary_multiple_columns = pivotResult.pivot_summary_multiple_columns,
+    formulaRows = pivotResult.formulaRows,
+    isSqlQuery = pivotResult.isSqlQuery;
+  var summaryColumns = pivot_summary_multiple_columns.filter(Boolean);
+  if (!groupbyColumn || summaryColumns.length === 0 || !Array.isArray(pivot_columns) || pivot_columns.length === 0 || !Array.isArray(pivot_rows) || pivot_rows.length === 0) return {};
+  var groupbyColumnName = groupbyColumn.name;
+  var firstSummaryColumn = summaryColumns[0];
+  var columns = [{
+    // name column
+    key: '0000',
+    type: CellType.TEXT,
+    name: groupbyColumnName,
+    data: null
+  }];
+  var tmpColumns = [];
+  pivot_columns.forEach(function (pivotColumn) {
+    var pivotColumnKey = pivotColumn.key,
+      original_key = pivotColumn.original_key;
+    var pivotColumnColumnName = isEmptyName(original_key) ? intl.get(EMPTY_NAME) : pivotColumnKey;
+    summaryColumns.forEach(function (summaryColumn) {
+      var key = summaryColumn.key,
+        type = summaryColumn.type,
+        sqlKey = summaryColumn.sqlKey,
+        column_name = summaryColumn.column_name,
+        data = summaryColumn.data,
+        method = summaryColumn.method;
+      var newColumnName = "".concat(pivotColumnColumnName, "-").concat(column_name);
+      columns.push({
+        // just support number column
+        type: CellType.NUMBER,
+        name: newColumnName,
+        data: data
+      });
+      tmpColumns.push({
+        name: newColumnName,
+        pivotColumnKey: pivotColumnKey,
+        key: key,
+        type: type,
+        sqlKey: sqlKey,
+        method: method
+      });
+    });
+  });
+  columns.push({
+    type: CellType.NUMBER,
+    name: intl.get('Total'),
+    data: firstSummaryColumn.data
+  });
+  var rows = [];
+  pivot_rows.forEach(function (pivotRow) {
+    var name = pivotRow.name,
+      original_name = pivotRow.original_name,
+      cells = pivotRow.cells;
+    if (isEmptyName(original_name)) {
+      name = intl.get(EMPTY_NAME);
+    }
+    var newRow = _defineProperty({}, groupbyColumnName, name);
+    var total = 0;
+    tmpColumns.forEach(function (tmpColumn) {
+      var name = tmpColumn.name,
+        pivotColumnKey = tmpColumn.pivotColumnKey,
+        key = tmpColumn.key,
+        type = tmpColumn.type,
+        sqlKey = tmpColumn.sqlKey,
+        method = tmpColumn.method;
+      var cell = cells && cells[pivotColumnKey];
+      var cellRows = cell && cell.rows;
+      if (!Array.isArray(cellRows) || cellRows.length === 0) {
+        newRow[name] = 0;
+      } else {
+        var cellValue = getPivotTableSummaryTotal(type, key, sqlKey, STATISTICS_COUNT_TYPE.ADVANCED, method, cellRows, formulaRows, isSqlQuery);
+        newRow[name] = cellValue;
+        total += cellValue;
+      }
+    });
+    newRow[intl.get('Total')] = total;
+    rows.push(newRow);
+  });
+  return {
+    columns: columns,
+    rows: rows
+  };
+};
+var exportTwoDimensionWithSummaryColumnsToTable = function exportTwoDimensionWithSummaryColumnsToTable(_ref12) {
+  var statisticalResult = _ref12.statisticalResult;
+  return getTwoDimensionWithSummaryColumns({
+    statisticalResult: statisticalResult
+  });
+};
+var updatedOneDimensionToTable = function updatedOneDimensionToTable(_ref13) {
+  var updateTable = _ref13.updateTable,
+    statisticalResult = _ref13.statisticalResult;
+  var pivotResult = statisticalResult.pivotResult,
+    groupbyColumn = statisticalResult.groupbyColumn,
+    statisticTableColumns = statisticalResult.statisticTableColumns;
+  if (!groupbyColumn) return {};
+  var nameColumn = TableUtils.getTableColumnByName(updateTable, groupbyColumn.name);
+  if (!nameColumn) return {};
+  var pivot_rows = pivotResult.pivot_rows,
+    pivot_columns = pivotResult.pivot_columns;
+  var tableRows = updateTable.rows;
+  var columnMap = {};
+  var newRows = [];
+  var updatedRows = {};
+  var oldRows = {};
+  var rowIds = [];
+
+  // one dimension table no summary columns
+  if (pivot_columns.length < 2) {
+    columnMap['total'] = TableUtils.getTableColumnByName(updateTable, intl.get('Total'));
+
+    // updated rows
+    pivot_rows.forEach(function (item) {
+      var name = item.name,
+        original_name = item.original_name,
+        total = item.total;
+      var groupName = isEmptyName(original_name) ? intl.get(EMPTY_NAME) : name;
+      var row = tableRows.find(function (row) {
+        return row[nameColumn.key] === groupName;
+      });
+      var totalColumn = columnMap['total'];
+      if (row) {
+        // update old row
+        var updateRow = {};
+        var oldRow = {};
+        var validTotalCellValue = getValidValueForColumn(totalColumn, total.total);
+        if (totalColumn && isCellValueChanged(row[totalColumn.key], validTotalCellValue, totalColumn.type)) {
+          updateRow[totalColumn.key] = validTotalCellValue;
+          oldRow[totalColumn.key] = row[totalColumn.key];
+        }
+        if (Object.keys(updateRow).length > 0) {
+          var rowId = row._id;
+          rowIds.push(rowId);
+          updatedRows[rowId] = updateRow;
+          oldRows[rowId] = oldRow;
+        }
+      } else {
+        // insert new row
+        var newRow = {};
+        newRow[nameColumn.key] = groupName;
+        if (totalColumn) {
+          newRow[totalColumn.key] = getValidValueForColumn(totalColumn, total.total);
+        }
+        newRows.push(newRow);
+      }
+    });
+    return {
+      newRows: newRows,
+      updatedRows: updatedRows,
+      rowIds: rowIds,
+      oldRows: oldRows
+    };
+  }
+
+  // one dimension table with summary columns
+  Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
+    var key = item.key;
+    var column = statisticTableColumns.find(function (column) {
+      return column.key === key;
+    });
+    if (column) {
+      columnMap[key] = TableUtils.getTableColumnByName(updateTable, column.name);
+    }
+  });
+
+  // updated rows
+  var nameColumnKey = nameColumn.key;
+  pivot_rows.forEach(function (item) {
+    var name = item.name,
+      original_name = item.original_name,
+      total = item.total;
+    var groupName = isEmptyName(original_name) ? intl.get(EMPTY_NAME) : name;
+    var row = tableRows.find(function (row) {
+      return row[nameColumnKey] === groupName;
+    });
+    if (row) {
+      var updateRow = {};
+      var oldRow = {};
+      Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
+        var key = item.key,
+          method = item.method;
+        var column = columnMap[key];
+        var cellValueKey = key + method;
+        var totalCellValue = getValidValueForColumn(column, total[cellValueKey]);
+        if (column && isCellValueChanged(row[column.key], totalCellValue, column.type)) {
+          updateRow[column.key] = totalCellValue;
+          oldRow[column.key] = row[column.key];
+        }
+      });
+      if (Object.keys(updateRow).length > 0) {
+        var rowId = row._id;
+        rowIds.push(rowId);
+        updatedRows[rowId] = updateRow;
+        oldRows[rowId] = oldRow;
+      }
+    } else {
+      var newRow = _defineProperty({}, nameColumn.key, groupName);
+      Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
+        var key = item.key,
+          method = item.method;
+        var cellValueKey = key + method;
+        var column = columnMap[key];
+        if (column) {
+          var totalCellValue = getValidValueForColumn(column, total[cellValueKey]);
+          newRow[column.key] = totalCellValue;
+        }
+      });
+      newRows.push(newRow);
+    }
+  });
+  return {
+    newRows: newRows,
+    updatedRows: updatedRows,
+    rowIds: rowIds,
+    oldRows: oldRows
+  };
+};
+var updateTwoDimensionToTable = function updateTwoDimensionToTable(_ref14) {
+  var updateTable = _ref14.updateTable,
+    statisticalResult = _ref14.statisticalResult;
+  var pivotResult = statisticalResult.pivotResult,
+    groupbyColumn = statisticalResult.groupbyColumn;
+  var nameColumn = TableUtils.getTableColumnByName(updateTable, groupbyColumn.name);
+  if (!nameColumn) return {};
+  var pivot_rows = pivotResult.pivot_rows,
+    pivot_columns = pivotResult.pivot_columns;
+  var tableRows = updateTable.rows;
+  var columnMap = {};
+  var newRows = [];
+  var updatedRows = {};
+  var rowIds = [];
+  var oldRows = {};
+
+  // updated columns
+  var updateColumns = [];
+  Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
+    var key = item.key,
+      original_key = item.original_key;
+    var columnName = isEmptyName(original_key) ? intl.get(EMPTY_NAME) : key;
+    var column = TableUtils.getTableColumnByName(updateTable, columnName);
+    columnMap[columnName] = column;
+    updateColumns.push(column);
+  });
+  var totalColumn = TableUtils.getTableColumnByName(updateTable, intl.get('Total'));
+  columnMap['total'] = totalColumn;
+  updateColumns.push(totalColumn);
+
+  // updated rows
+  var _loop = function _loop(i) {
+    var pivotRow = pivot_rows[i];
+    var name = pivotRow.name,
+      original_name = pivotRow.original_name,
+      cells = pivotRow.cells,
+      total = pivotRow.total;
+    if (isEmptyName(original_name)) {
+      name = intl.get(EMPTY_NAME);
+    }
+    var nameColumnKey = nameColumn.key;
+    var row = tableRows.find(function (row) {
+      return row[nameColumnKey] === name;
+    });
+    var totalColumn = columnMap['total'];
+    if (row) {
+      // update old row
+      var rowId = row._id;
+      var updatedRow = {};
+      var oldRow = {}; // op used
+      var validTotalCellValue = getValidValueForColumn(totalColumn, total);
+      if (totalColumn && isCellValueChanged(row[totalColumn.key], validTotalCellValue, totalColumn.type)) {
+        updatedRow[totalColumn.key] = validTotalCellValue;
+        oldRow[totalColumn.key] = row[totalColumn.key];
+      }
+      var keys = Object.keys(cells);
+      if (keys.length === 0) {
+        updateColumns.forEach(function (column) {
+          var key = column.key,
+            type = column.type;
+          var newCellValue = key === totalColumn.key ? 0 : null;
+          if (isCellValueChanged(row[key], newCellValue, type)) {
+            updatedRow[key] = newCellValue;
+            oldRow[key] = row[key];
+          }
+        });
+      } else {
+        keys.forEach(function (key) {
+          var columnName = isEmptyName(key) ? intl.get(EMPTY_NAME) : key;
+          var column = columnMap[columnName];
+          var validCellValue = getValidValueForColumn(column, cells[key].total);
+          if (column && isCellValueChanged(row[column.key], validCellValue, column.type)) {
+            updatedRow[column.key] = validCellValue;
+            oldRow[column.key] = row[column.key];
+          }
+        });
+      }
+      if (Object.keys(updatedRow).length > 0) {
+        rowIds.push(rowId);
+        updatedRows[rowId] = updatedRow;
+        oldRows[rowId] = oldRow;
+      }
+    } else {
+      // insert new row
+      var newRow = {};
+      newRow[nameColumnKey] = name;
+      if (totalColumn) {
+        newRow[totalColumn.key] = getValidValueForColumn(totalColumn, name);
+      }
+      Object.keys(cells).forEach(function (key) {
+        var columnName = isEmptyName(key) ? intl.get(EMPTY_NAME) : key;
+        var column = columnMap[columnName];
+        if (column) {
+          newRow[column.key] = getValidValueForColumn(column, cells[key].total);
+        }
+      });
+      if (Object.keys(newRow).length > 0) {
+        newRows.push(newRow);
+      }
+    }
+  };
+  for (var i = 0; i < pivot_rows.length; i++) {
+    _loop(i);
+  }
+  return {
+    newRows: newRows,
+    updatedRows: updatedRows,
+    oldRows: oldRows,
+    rowIds: rowIds
+  };
+};
+var updateTwoDimensionWithSummaryColumnsToTable = function updateTwoDimensionWithSummaryColumnsToTable(_ref15) {
+  var updateTable = _ref15.updateTable,
+    statisticalResult = _ref15.statisticalResult;
+  var groupbyColumn = statisticalResult.groupbyColumn;
+  var nameColumn = groupbyColumn && TableUtils.getTableColumnByName(updateTable, groupbyColumn.name);
+  if (!nameColumn) return {};
+  var _getTwoDimensionWithS = getTwoDimensionWithSummaryColumns({
+      statisticalResult: statisticalResult
+    }),
+    exportingColumns = _getTwoDimensionWithS.columns,
+    exportingRows = _getTwoDimensionWithS.rows;
+  if (!Array.isArray(exportingColumns) || exportingColumns.length === 0 || !Array.isArray(exportingRows) || exportingRows.length === 0) {
+    return {};
+  }
+  var tableRows = updateTable.rows,
+    tableColumns = updateTable.columns;
+  var nameColumnKey = nameColumn.key;
+  var groupbyColumnName = groupbyColumn.name;
+  var newRows = [];
+  var updatedRows = {};
+  var rowIds = [];
+  var oldRows = {};
+  var nameCellValueExistRowMap = {};
+  tableRows.forEach(function (row) {
+    var nameCellValue = row[nameColumnKey];
+    if (!nameCellValueExistRowMap[nameCellValue]) {
+      nameCellValueExistRowMap[nameCellValue] = row;
+    }
+  });
+  exportingRows.forEach(function (exportingRow) {
+    var nameCellValue = exportingRow[groupbyColumnName];
+    var existRow = nameCellValueExistRowMap[nameCellValue];
+    if (existRow) {
+      // update the row already exist
+      var exportingRowData = {};
+      var existRowData = {};
+      tableColumns.forEach(function (tableColumn) {
+        var tableColumnKey = tableColumn.key,
+          tableColumnType = tableColumn.type,
+          tableColumnName = tableColumn.name;
+        var existCellValue = existRow[tableColumnKey];
+        var exportingCellValue = exportingRow[tableColumnName];
+        if (tableColumn && isCellValueChanged(existCellValue, exportingCellValue, tableColumnType)) {
+          exportingRowData[tableColumnKey] = exportingCellValue;
+          existRowData[tableColumnKey] = existCellValue;
+        }
+      });
+      if (Object.keys(exportingRowData).length > 0) {
+        var rowId = existRow._id;
+        rowIds.push(rowId);
+        updatedRows[rowId] = exportingRowData;
+        oldRows[rowId] = existRowData;
+      }
+    } else {
+      // create new row which not exist
+      newRows.push(exportingRow);
+    }
+  });
+  return {
+    newRows: newRows,
+    updatedRows: updatedRows,
+    oldRows: oldRows,
+    rowIds: rowIds
+  };
+};
+
+/**
+  * statisticalResult: {
+  *  columnGroupbyColumn: null,
+  *  groupbyColumn: null,
+  *  pivotResult: {
+  *    pivot_columns: [],
+  *    pivot_rows: [
+  *      { name: 'xxx', original_name: 'xxx', total }
+  *    ]
+  *  },
+  *  statisticTableColumns: null,
+  *  summaryColumn: null,
+  * }
+  *
+  * @return {
+  *   columns: [
+  *      {
+  *        name: xxx,
+  *        type: CellType.DATE
+  *        data: { format }
+  *      }, {
+  *        name: xxx,
+  *        type: CellType.NUMBER
+  *        data: { decimal, thousands, precision, enable_precision, format }
+  *      },
+  *    ],
+  *    rows: [
+  *      { columnName: value, xxx },
+  *    ]
+  * }
+  */
+export var exportStatisticToTable = function exportStatisticToTable(_ref16) {
+  var statisticalResult = _ref16.statisticalResult;
+  var pivotResult = statisticalResult.pivotResult,
+    groupbyColumn = statisticalResult.groupbyColumn,
+    columnGroupbyColumn = statisticalResult.columnGroupbyColumn;
+  var pivot_columns = pivotResult.pivot_columns,
+    pivot_summary_multiple_columns = pivotResult.pivot_summary_multiple_columns;
+  if (!groupbyColumn) return {};
+
+  // two dimension table
   if (columnGroupbyColumn) {
-    return getUpdatedTwoDimensionStatisticTableResultToTable({
+    if (Array.isArray(pivot_summary_multiple_columns) && pivot_summary_multiple_columns.length > 0) {
+      return exportTwoDimensionWithSummaryColumnsToTable({
+        statisticalResult: statisticalResult
+      });
+    }
+    return exportTwoDimensionToTable({
+      statisticalResult: statisticalResult
+    });
+  }
+  if (!Array.isArray(pivot_columns)) return {};
+  return exportOneDimensionToTable({
+    statisticalResult: statisticalResult
+  });
+};
+export var updateStatisticToTable = function updateStatisticToTable(_ref17) {
+  var updateTable = _ref17.updateTable,
+    statisticalResult = _ref17.statisticalResult;
+  var groupbyColumn = statisticalResult.groupbyColumn,
+    columnGroupbyColumn = statisticalResult.columnGroupbyColumn,
+    pivotResult = statisticalResult.pivotResult;
+  var pivot_summary_multiple_columns = pivotResult.pivot_summary_multiple_columns;
+  if (!groupbyColumn) return {};
+
+  // two dimension table
+  if (columnGroupbyColumn) {
+    if (Array.isArray(pivot_summary_multiple_columns) && pivot_summary_multiple_columns.length > 0) {
+      return updateTwoDimensionWithSummaryColumnsToTable({
+        updateTable: updateTable,
+        statisticalResult: statisticalResult
+      });
+    }
+    return updateTwoDimensionToTable({
       updateTable: updateTable,
       statisticalResult: statisticalResult
     });
   }
 
   // one dimension table
-  return getUpdatedOneDimensionStatisticTableResultToTable({
+  return updatedOneDimensionToTable({
     updateTable: updateTable,
     statisticalResult: statisticalResult
   });

package/es/utils/pivot-table.js

@@ -0,0 +1,91 @@
+import { FORMULA_COLUMN_TYPES_MAP, isNumber } from 'dtable-store';
+import { STATISTICS_COUNT_TYPE, SUMMARY_METHOD_MAP } from '../constants';
+var getCellValueFromRow = function getCellValueFromRow(row, formulaRow, columnType, columnKey, sqlKey, isSqlQuery) {
+  if (!isSqlQuery) {
+    if (FORMULA_COLUMN_TYPES_MAP[columnType]) {
+      var cellValue = formulaRow[columnKey];
+      return Array.isArray(cellValue) ? cellValue[0] : cellValue;
+    }
+    return row[columnKey];
+  }
+  return row[sqlKey];
+};
+export var getPivotTableSummaryTotal = function getPivotTableSummaryTotal(summaryColumnType, summaryColumnKey, sqlKey, summaryType, summaryMethod, rows, formulaRows, isSqlQuery) {
+  if (summaryType === STATISTICS_COUNT_TYPE.COUNT) {
+    return rows.length;
+  }
+  if (summaryType !== STATISTICS_COUNT_TYPE.ADVANCED) {
+    return 0;
+  }
+  switch (summaryMethod) {
+    case SUMMARY_METHOD_MAP.Distinct_values:
+      {
+        var count = 0;
+        var existMap = {};
+        rows.forEach(function (row) {
+          var formulaRow = formulaRows && formulaRows[row._id];
+          var cellValue = getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          if (!cellValue) {
+            if (cellValue === 0) {
+              cellValue = '0';
+            } else {
+              cellValue = !!cellValue;
+            }
+          }
+          if (!existMap[cellValue]) {
+            existMap[cellValue] = true;
+            count++;
+          }
+        });
+        return count;
+      }
+    case SUMMARY_METHOD_MAP.Sum:
+    case SUMMARY_METHOD_MAP.Mean:
+      {
+        var sum = 0;
+        var validNumbersCount = 0;
+        rows.forEach(function (row) {
+          var formulaRow = formulaRows && formulaRows[row._id];
+          var cellValue = getCellValueFromRow(row, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          if (isNumber(cellValue)) {
+            validNumbersCount++;
+            sum += cellValue;
+          }
+        });
+        if (summaryMethod === SUMMARY_METHOD_MAP.Sum) {
+          sum = Number.parseFloat(sum.toFixed(8));
+        } else if (summaryMethod === SUMMARY_METHOD_MAP.Mean) {
+          sum = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
+        }
+        return sum;
+      }
+    case SUMMARY_METHOD_MAP.Max:
+    case SUMMARY_METHOD_MAP.Min:
+      {
+        if (rows.length === 0) {
+          return 0;
+        }
+        var result = rows.reduce(function (current, next) {
+          var currentFormulaRow = formulaRows && formulaRows[current._id];
+          var nextFormulaRow = formulaRows && formulaRows[next._id];
+          var currentValue = getCellValueFromRow(current, currentFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          var nextValue = getCellValueFromRow(next, nextFormulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+          if (!nextValue && nextValue !== 0) {
+            return current;
+          }
+          var isNextGreater = currentValue < nextValue;
+          if (summaryMethod === SUMMARY_METHOD_MAP.Min) {
+            return isNextGreater ? current : next;
+          } else {
+            return isNextGreater ? next : current;
+          }
+        });
+        var formulaRow = formulaRows && formulaRows[result._id];
+        return getCellValueFromRow(result, formulaRow, summaryColumnType, summaryColumnKey, sqlKey, isSqlQuery);
+      }
+    default:
+      {
+        return 0;
+      }
+  }
+};

package/es/utils/sql-utils.js

@@ -37,6 +37,21 @@ export var getSqlGroup = function getSqlGroup(granularity, column) {
   }
   return "`".concat(columnName, "`");
 };
+export var getPieChartSqlGroupName = function getPieChartSqlGroupName(statisticRecord, selectedColumn, groupName) {
+  var original_name_list = statisticRecord.original_name_list,
+    name_list = statisticRecord.name_list;
+  var sqlString = '';
+  var list = original_name_list.length > 0 ? original_name_list : name_list;
+  list.forEach(function (item, index) {
+    if (index === 0) {
+      sqlString += getSqlGroupName(name_list[0], original_name_list[0], selectedColumn);
+    } else {
+      var sqlName = getSqlGroupName(name_list[index], original_name_list[index], selectedColumn);
+      sqlString = "".concat(sqlString, " or ").concat(groupName, "=").concat(sqlName);
+    }
+  });
+  return sqlString;
+};
 export var getSqlString = function getSqlString(statItem, statisticRecord, _ref) {
   var isColumn = _ref.isColumn,
     isCurrentView = _ref.isCurrentView,
@@ -63,6 +78,9 @@ export var getSqlString = function getSqlString(statItem, statisticRecord, _ref)
     group_original_name = statisticRecord.group_original_name,
     group_name = statisticRecord.group_name;
   var sqlName = getSqlGroupName(name, original_name, selectedColumn);
+  if ((type === STAT_TYPE.PIE || type === STAT_TYPE.RING) && original_name === 'Others') {
+    sqlName = getPieChartSqlGroupName(statisticRecord, selectedColumn, groupName);
+  }
   var sqlGroupName;
   if (isGroup) {
     sqlGroupName = getSqlGroupName(group_name, group_original_name, columnSelectedColumn);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -12,8 +12,8 @@
     "@seafile/seafile-calendar": "0.0.24",
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
-    "dtable-store": "4.0.6",
-    "dtable-web-api": "4.0.4",
+    "dtable-store": "4.0.12",
+    "dtable-web-api": "4.0.5",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",
     "rc-slider": "^9.7.4",