sea-chart 0.0.89-alpha.0 → 0.0.89-beta

package/dist/settings/widgets/group-by.js

@@ -111,7 +111,7 @@ class GroupBy extends Component {
             type: 'text'
           },
           label: /*#__PURE__*/React.createElement("span", {
-            className: 'select-module select-module-name ml-0'
+            className: "ml-0"
           }, intl.get('Not_used'))
         });
       }

package/dist/utils/chart-utils/original-data-utils/index.js

@@ -84,6 +84,7 @@ OriginalDataUtils.calculateChart = async (chart, value, callback) => {
       chartTableColumns
     });
   } catch (error) {
+    console.log('Error', error);
     const error_message = getErrorMessage(error);
     return callback && callback(error_message, '', null);
   }

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

@@ -284,10 +284,40 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
   if (summary_column_key) {
     summaryColumn = getTableColumnByKey(table, summary_column_key);
   }
+
+  // Single field
   let {
     pivot_columns_total,
     pivot_table_total
-  } = getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formulaRows, pivot_rows, pivot_columns);
+  } = getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formulaRows, pivot_rows, pivot_columns, 0);
+
+  // Multiple field
+  if (Array.isArray(summary_columns) && summary_columns.length > 0) {
+    summary_columns.forEach((item, index) => {
+      if (item && Object.keys(item).length !== 0) {
+        const {
+          column_key,
+          summary_method
+        } = item;
+        const itemSummaryColumn = getTableColumnByKey(table, column_key);
+        const itemSummaryMethod = summary_method;
+        if (itemSummaryColumn && itemSummaryMethod) {
+          // The index of a single field is 0, so the index of a multiple-select field starts at 1.
+          const currentItemIndex = index + 1;
+          const {
+            pivot_columns_total: item_pivot_columns_total,
+            pivot_table_total: item_pivot_table_total
+          } = getTwoDimensionTotal(itemSummaryColumn, summary_type, itemSummaryMethod, formulaRows, pivot_rows, pivot_columns, currentItemIndex);
+
+          // Update pivot_columns_total and pivot_table_total
+          Object.keys(item_pivot_columns_total).forEach(key => {
+            pivot_columns_total[key] = pivot_columns_total[key] + item_pivot_columns_total[key];
+          });
+          pivot_table_total = pivot_table_total + item_pivot_table_total;
+        }
+      }
+    });
+  }
   BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name');
   BaseUtils.sortCharts(pivot_columns, rowGroupbyColumn, 'key');
 
@@ -529,6 +559,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
 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] : [];
+  let index = arguments.length > 6 ? arguments[6] : undefined;
   let pivot_columns_total = {};
   let pivot_table_total = 0;
   let dateColumnsTotalArr = [];
@@ -551,7 +582,7 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
         let {
           rows
         } = cells[key];
-        let subTotal = getTotal(summaryColumn, summary_type, summary_method, rows, formula_rows, (_cells$key = cells[key]) === null || _cells$key === void 0 ? void 0 : _cells$key.total);
+        let subTotal = getTotal(summaryColumn, summary_type, summary_method, rows, formula_rows, (_cells$key = cells[key]) === null || _cells$key === void 0 ? void 0 : _cells$key.total, index);
         if (isSummaryDateColumn) {
           if (subTotal === 0) {
             cells[key].total = 0;
@@ -564,9 +595,9 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
         } else {
           if (Array.isArray(subTotal)) {
             cells[key].total = subTotal;
-            total += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
+            total += subTotal[index][1] ? subTotal[index][1] - 0 : 0;
             let columnTotal = pivot_columns_total[key] ? pivot_columns_total[key] : 0;
-            columnTotal += subTotal[0][1] ? subTotal[0][1] - 0 : 0;
+            columnTotal += subTotal[index][1] ? subTotal[index][1] - 0 : 0;
             pivot_columns_total[key] = columnTotal;
           } else {
             cells[key].total = subTotal;
@@ -623,6 +654,7 @@ 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] : {};
   let oldTotal = arguments.length > 5 ? arguments[5] : undefined;
+  let index = arguments.length > 6 ? arguments[6] : undefined;
   const summary_column_key = summary_column ? summary_column.key : '';
   const summary_column_type = summary_column ? summary_column.type : '';
   const rowsLength = rows.length;
@@ -654,7 +686,7 @@ function getTotal(summary_column, summary_type, summary_method) {
           total++;
         }
       });
-      total = getTotalByType(oldTotal, total);
+      total = getTotalByType(oldTotal, total, index);
       return total;
     }
     if (summary_column && isDateColumn(summary_column)) {
@@ -712,10 +744,10 @@ function getTotal(summary_column, summary_type, summary_method) {
               }
             });
             if (summary_method === 'Sum') {
-              total = getTotalByType(oldTotal, Number.parseFloat(sum.toFixed(8)));
+              total = getTotalByType(oldTotal, Number.parseFloat(sum.toFixed(8)), index);
             } else if (summary_method === 'Mean') {
               const val = validNumbersCount === 0 ? 0 : Number.parseFloat((sum / validNumbersCount).toFixed(8));
-              total = getTotalByType(oldTotal, val);
+              total = getTotalByType(oldTotal, val, index);
             }
             break;
           }
@@ -748,15 +780,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 = getTotalByType(oldTotal, formulaRow[summary_column_key][0], index);
                   } else {
-                    getTotalByType(oldTotal, formulaRow[summary_column_key]);
+                    getTotalByType(oldTotal, formulaRow[summary_column_key], index);
                   }
                 } else {
-                  total = getTotalByType(oldTotal, null);
+                  total = getTotalByType(oldTotal, null, index);
                 }
               } else {
-                total = getTotalByType(oldTotal, result[summary_column_key]);
+                total = getTotalByType(oldTotal, result[summary_column_key], index);
               }
             }
             break;
@@ -770,7 +802,7 @@ function getTotal(summary_column, summary_type, summary_method) {
   }
   // formula_rows result can be '#VALUE!'
   if (total === '#VALUE!') {
-    total = getTotalByType(oldTotal, 0);
+    total = getTotalByType(oldTotal, 0, index);
   }
   return total || 0;
 }
@@ -820,11 +852,11 @@ function getDateMaxOrMinTotal(dateArr, type) {
   dateIndex = list.indexOf(dateValue);
   return dateArr[dateIndex];
 }
-function getTotalByType(oldTotal, value) {
+function getTotalByType(oldTotal, value, index) {
   let newTotal = '';
   if (Array.isArray(oldTotal)) {
     newTotal = JSON.parse(JSON.stringify(oldTotal));
-    newTotal[0][1] = value;
+    newTotal[index][1] = value;
   } else {
     newTotal = value;
   }

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

@@ -60,7 +60,7 @@ SQLStatisticsUtils.getGroupLabelFromDB = (cellValue, column, chart) => {
       {
         if (!Array.isArray(collaborators) || collaborators.length === 0) return [];
         if (!Array.isArray(cellValue) || cellValue.length === 0) return [];
-        return cellValue;
+        return cellValue.filter(email => collaborators.find(option => option.email === email));
       }
     case CellType.CREATOR:
     case CellType.LAST_MODIFIER:

package/dist/view/wrapper/table/one-dimension-table-with-numeric-columns.js

@@ -1,5 +1,6 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
+import { isNumber } from 'dtable-utils';
 import { BaseUtils } from '../../../utils';
 import intl from '../../../intl';
 import { CHART_THEME_COLOR } from '../../../constants';
@@ -22,14 +23,24 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
         });
       }
     };
+    this.getRowTotal = (rowTotal, value) => {
+      if (value && isNumber(value)) {
+        return rowTotal + value;
+      }
+      return rowTotal;
+    };
     this.renderHeader = () => {
       const {
         result,
         groupbyColumn,
         columnGroupbyColumn,
         selectedCell,
-        chartTableColumns
+        chartTableColumns,
+        chart
       } = this.props;
+      const {
+        display_total = true
+      } = chart.config;
       const {
         name: groupName
       } = groupbyColumn;
@@ -43,6 +54,7 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
         rowIdx: selectRowIdx,
         cellIdx: selectedCellIdx
       } = selectedCell || {};
+      const isSelectedTotalHeaderBottom = selectRowIdx === 0 && selectedCellIdx === (pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length);
       return /*#__PURE__*/React.createElement("thead", {
         className: "seatable-table-header-sm"
       }, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", {
@@ -59,7 +71,11 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
           }),
           key: "pivot-column-".concat(index)
         }, /*#__PURE__*/React.createElement("div", null, column.name));
-      })));
+      }), display_total && /*#__PURE__*/React.createElement("th", {
+        className: classnames('pivot-table-header', {
+          'selected-pivot-cell-top': isSelectedTotalHeaderBottom
+        })
+      }, /*#__PURE__*/React.createElement("div", null, intl.get('Total')))));
     };
     this.toggleRecords = (cell, selectedCell) => {
       if (window.isMobile) return;
@@ -108,13 +124,20 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
       const pivotRowsLen = Array.isArray(pivot_rows) ? pivot_rows.length : 0;
       let pivotColumnCells = [];
       const isSelectRowTotalCellRight = selectRowIdx === pivotRowsLen && selectedCellIdx === 0;
+      let lastRowTotal = 0;
+      let lastRows = [];
       return /*#__PURE__*/React.createElement("tbody", null, pivotRowsLen > 0 && pivot_rows.map((rowItem, rowIdx) => {
         const {
           name,
           total,
           rows
         } = rowItem;
+        lastRows.push(rows);
         const isSelectedRowNameRight = selectRowIdx === rowIdx && selectedCellIdx === 0;
+        const isSelectedTotalCell = selectRowIdx === rowIdx && selectedCellIdx === (pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length);
+        const isSelectedTotalCellTop = selectRowIdx - 1 === rowIdx && selectedCellIdx === (pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length);
+        const isSelectedTotalCellLeft = selectRowIdx === rowIdx && selectedCellIdx - 1 === (pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length) - 1;
+        let rowTotal = 0;
         if (!Array.isArray(pivot_columns)) {
           pivotColumnCells[rowIdx] = rowItem.rows || [];
         }
@@ -137,6 +160,7 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
             key
           } = columnMap;
           const column = chartTableColumns.find(item => item.key === key);
+          rowTotal = this.getRowTotal(rowTotal, total[key]);
           const displayValue = BaseUtils.getSummaryValueDisplayString(column, total[key], this.summaryColumnsMethodMap[key]);
           const isValidDisplayValue = BaseUtils.isValidValue(displayValue, display_empty);
           if (Array.isArray(rows) && rows.length > 0) {
@@ -168,7 +192,25 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
               'selected-pivot-cell-border': isSelectedCell
             })
           }));
-        }));
+        }), display_total && /*#__PURE__*/React.createElement("td", {
+          className: classnames('pivot-cell', {
+            'selected-pivot-cell': isSelectedTotalCell,
+            'selected-pivot-cell-top': isSelectedTotalCellTop,
+            'selected-pivot-cell-left': isSelectedTotalCellLeft
+          }),
+          onClick: () => this.toggleRecords({
+            rows,
+            name: rowItem === null || rowItem === void 0 ? void 0 : rowItem.name,
+            total: rowTotal
+          }, {
+            rowIdx
+          }),
+          title: rowTotal ? rowTotal : 0
+        }, rowTotal ? rowTotal : /*#__PURE__*/React.createElement("i", null, "0"), /*#__PURE__*/React.createElement("span", {
+          className: classnames({
+            'selected-pivot-cell-border': isSelectedTotalCell
+          })
+        })));
       }), display_total && /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", {
         className: classnames('pivot-column-total', {
           'selected-pivot-cell-left': isSelectRowTotalCellRight
@@ -181,6 +223,7 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
         const isValidTotalDisplayValue = BaseUtils.isValidValue(totalDisplayValue, display_empty);
         const isSelectRowTotalCell = selectRowIdx === pivot_rows.length && selectedCellIdx === index;
         const isSelectRowTotalCellLeft = selectRowIdx === pivot_rows.length && selectedCellIdx - 1 === index;
+        lastRowTotal = this.getRowTotal(lastRowTotal, pivotColumnTotal);
         return /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
             'pivot-empty-cell': !isValidTotalDisplayValue,
@@ -201,7 +244,19 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
             'selected-pivot-cell-border': isSelectRowTotalCell
           })
         }));
-      })));
+      }), /*#__PURE__*/React.createElement("td", {
+        className: classnames('pivot-cell', {
+          'pivot-empty-cell': !BaseUtils.isValidValue(lastRowTotal, display_empty)
+        }),
+        onClick: () => this.toggleRecords({
+          rows: lastRows,
+          total: lastRowTotal
+        }, {
+          rowIdx: pivot_rows.length,
+          cellIdx: pivot_columns === null || pivot_columns === void 0 ? void 0 : pivot_columns.length
+        }),
+        title: lastRowTotal
+      }, BaseUtils.isValidValue(lastRowTotal, display_empty) ? lastRowTotal : /*#__PURE__*/React.createElement("i", null))));
     };
     this.init(_props);
   }

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

@@ -1,7 +1,6 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
-import { CellType } from 'dtable-utils';
-import classNames from 'classnames';
+import { CellType, isNumber } from 'dtable-utils';
 import { BaseUtils } from '../../../utils';
 import intl from '../../../intl';
 import { CHART_SUMMARY_TYPE, CHART_THEME_COLOR } from '../../../constants';
@@ -104,7 +103,7 @@ class TwoDimensionTable extends PureComponent {
             globalTheme: globalTheme
           }));
         })));
-      }), /*#__PURE__*/React.createElement("th", {
+      }), display_total && /*#__PURE__*/React.createElement("th", {
         className: "pivot-table-header"
       })));
     };
@@ -148,6 +147,12 @@ class TwoDimensionTable extends PureComponent {
         })
       }, /*#__PURE__*/React.createElement("i", null));
     };
+    this.getRowTotal = (rowTotal, value) => {
+      if (value && isNumber(value)) {
+        return rowTotal + value;
+      }
+      return rowTotal;
+    };
     this.renderRows = () => {
       const {
         result,
@@ -199,8 +204,7 @@ class TwoDimensionTable extends PureComponent {
         if (!Array.isArray(pivot_columns)) {
           pivotColumnCells[rowIdx] = rowItem.rows || [];
         }
-        const summaryDisplayValue = BaseUtils.getSummaryValueDisplayString(summaryColumn, total, summaryMethod);
-        const isValidSummaryDisplayValue = BaseUtils.isValidValue(summaryDisplayValue, display_empty);
+        let rowTotal = 0;
         return /*#__PURE__*/React.createElement("tr", {
           key: 'table-row' + rowIdx
         }, /*#__PURE__*/React.createElement("td", {
@@ -222,6 +226,7 @@ class TwoDimensionTable extends PureComponent {
           if (isCount) {
             const displayValue = total;
             const isValidDisplayValue = BaseUtils.isValidValue(displayValue, display_empty);
+            rowTotal = this.getRowTotal(rowTotal, displayValue);
             if (c && Array.isArray(c.rows) && c.rows.length > 0) {
               pivotRowCells.push(...c.rows);
               if (pivotColumnCells[cellIdx]) {
@@ -262,6 +267,7 @@ class TwoDimensionTable extends PureComponent {
             const summaryCellColumn = summaryColumns === null || summaryColumns === void 0 ? void 0 : summaryColumns.find(item => item.key === summaryCellColumnKey);
             const displayValue = BaseUtils.getSummaryValueDisplayString(summaryCellColumn, summaryCell[1], summaryMethod);
             const isValidDisplayValue = BaseUtils.isValidValue(displayValue, display_empty);
+            rowTotal = this.getRowTotal(rowTotal, summaryCell[1]);
             return /*#__PURE__*/React.createElement("div", {
               key: "table-cell-".concat(cellIdx, "-").concat(idx),
               className: classnames('pivot-cell', {
@@ -278,7 +284,6 @@ class TwoDimensionTable extends PureComponent {
           }), !total && !(typeof total === 'number') && this.renderEmpty(summaryColumns, cellIdx)));
         }), display_total && /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
-            'pivot-empty-cell': !isValidSummaryDisplayValue,
             'selected-pivot-cell': isSelectedTotalCell,
             'selected-pivot-cell-top': isSelectedTotalCellTop,
             'selected-pivot-cell-left': isSelectedTotalCellLeft
@@ -291,8 +296,8 @@ class TwoDimensionTable extends PureComponent {
             rowIdx,
             cellIdx: cells.length
           }),
-          title: summaryDisplayValue
-        }, isValidSummaryDisplayValue ? summaryDisplayValue : /*#__PURE__*/React.createElement("i", null), /*#__PURE__*/React.createElement("span", {
+          title: rowTotal
+        }, BaseUtils.isValidValue(rowTotal, display_empty) ? rowTotal : /*#__PURE__*/React.createElement("i", null), /*#__PURE__*/React.createElement("span", {
           className: classnames({
             'selected-pivot-cell-border': isSelectedTotalCell
           })

package/package.json

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