sea-chart 0.0.99 → 0.0.100

package/dist/context.js

@@ -102,8 +102,8 @@ class Context {
     this.getViewRows = (view, table, value) => {
       return this.api.getViewRows(view, table, value);
     };
-    this.getTableFormulaResults = (table, rows, value) => {
-      return this.api.getTableFormulaResults(table, rows, value);
+    this.getTableFormulaResults = (table, rows, value, view_id) => {
+      return this.api.getTableFormulaResults(table, rows, value, view_id);
     };
     this.getChartImageUrl = type => {
       const name = CHART_TYPE_IMAGE[type];

package/dist/settings/index.js

@@ -2,7 +2,7 @@ import React, { useCallback, useMemo, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import intl from '../intl';
-import { settingsContext } from '../utils/contexts';
+import { settingsContext, DepartmentsContext } from '../utils/contexts';
 import { eventStopPropagation } from '../utils';
 import { BaseUtils } from '../utils';
 import { CHART_SETTINGS_TYPE, CHART_SETTINGS } from '../constants';
@@ -18,7 +18,8 @@ const Settings = _ref => {
     hideTitleStyleSetting,
     tables,
     onChange,
-    children
+    children,
+    departments
   } = _ref;
   const [type, setType] = useState(CHART_SETTINGS_TYPE.DATA);
   const [labelColorConfigs, setLabelColorConfigs] = useState([]);
@@ -83,12 +84,16 @@ const Settings = _ref => {
   }, /*#__PURE__*/React.createElement("div", {
     id: "sea-chart-settings-content",
     className: "chart-settings-content"
-  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(DataSettings, {
+  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(DepartmentsContext.Provider, {
+    value: {
+      departments
+    }
+  }, /*#__PURE__*/React.createElement(DataSettings, {
     dataSources: dataSources,
     chart: chart,
     tables: tables,
     onChange: modifyStatistic
-  }), type === CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
+  })), type === CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
     chart: chart,
     tables: tables,
     labelColorConfigs: labelColorConfigs,

package/dist/settings/widgets/data-filter/index.js

@@ -1,10 +1,11 @@
 import _DTableFiltersPopover from "dtable-ui-component/lib/DTableFiltersPopover";
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useContext, useMemo, useState } from 'react';
 import { Label, FormGroup } from 'reactstrap';
 import { getTableById } from 'dtable-utils';
 import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
 import context from '../../../context';
+import { DepartmentsContext } from '../../../utils/contexts';
 import './index.css';
 const DataFilter = _ref => {
   let {
@@ -13,6 +14,9 @@ const DataFilter = _ref => {
     onChange
   } = _ref;
   const [isFilterSetterShow, setIsFilterSetterShow] = useState(false);
+  const {
+    departments
+  } = useContext(DepartmentsContext);
   const toggleFilterPopover = useCallback(event => {
     eventStopPropagation(event);
     setIsFilterSetterShow(!isFilterSetterShow);
@@ -77,6 +81,7 @@ const DataFilter = _ref => {
     filters: filters,
     filterConjunction: filterConjunction,
     columns: table.columns,
+    departments: departments,
     collaborators: collaborators,
     hidePopover: toggleFilterPopover,
     update: updateFilters

package/dist/settings/widgets/select-view/index.js

@@ -16,11 +16,14 @@ const SelectView = _ref => {
     const table = getTableById(tables, selectedTableId);
     if (!table) return [];
     let views = getNonPrivateViews(table.views);
-    const selectedView = views.find(view => view._id === selectedViewId);
+    let selectedView = views.find(view => view._id === selectedViewId);
+    if (!selectedView) {
+      selectedView = views[0];
+    }
 
     // not support archive view on plugin, do not show archive view
     // but if it is selected, keep it
-    if (!isArchiveView(selectedView)) {
+    if (selectedView && !isArchiveView(selectedView)) {
       views = views.filter(v => !isArchiveView(v));
     }
     return Array.isArray(views) ? views.map(view => {

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

@@ -233,10 +233,6 @@ BaseUtils.getChartGroups = charts => {
 };
 BaseUtils.isSameGroup = (isColumnDataAsAnArray, source, target) => {
   if (isColumnDataAsAnArray) {
-    // column type is multiple-select
-    if (Array.isArray(source) && Array.isArray(target)) {
-      return JSON.stringify(source) === JSON.stringify(target);
-    }
     return (!Array.isArray(source) || source.length === 0) && !target || (source === null || source === void 0 ? void 0 : source.includes(target));
   }
   return source === null && target === null || source === undefined && target === undefined || source === target;
@@ -288,7 +284,7 @@ BaseUtils.isDateSummaryColumn = summaryColumn => {
   } = summaryColumn;
   return type !== CellType.LINK && isDateColumn(summaryColumn);
 };
-BaseUtils.getSummaryValue = (_ref, currentValue, nextValue) => {
+BaseUtils.getSummaryValue = (_ref, currentValue, nextValue, isPivotCalculator) => {
   let {
     summaryMethod,
     summaryColumn
@@ -314,7 +310,7 @@ 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 (currentValue && nextValue && isPivotCalculator) {
       if (summaryMethod === 'MAX') {
         return Math.max(currentValue, nextValue);
       }
@@ -1365,6 +1361,188 @@ BaseUtils.summaryDurationResult = (result, duration, summaryType, summaryMethod,
     comparedValue
   };
 };
+BaseUtils.formatedTableSqlRowsByCollaboratorAndMultiple = (chart, sqlRows, chartSQLMap, columnMap) => {
+  const {
+    config
+  } = chart;
+  const {
+    columnGroupbyColumn
+  } = columnMap; // columnMap is selected columns for row grouping and column grouping
+  let {
+    sqlGroupbyColumnKey,
+    sqlSummaryColumnKey,
+    summarySQLColumnName2ColumnKey,
+    sqlColumnGroupbyColumnKey
+  } = chartSQLMap;
+  const newSqlRows = JSON.parse(JSON.stringify(sqlRows));
+  if (config.summary_type === CHART_SUMMARY_TYPE.COUNT) {
+    // has column group
+    if (sqlColumnGroupbyColumnKey) {
+      if ((columnGroupbyColumn === null || columnGroupbyColumn === void 0 ? void 0 : columnGroupbyColumn.type) === CellType.COLLABORATOR) {
+        return newSqlRows;
+      }
+      if ((columnGroupbyColumn === null || columnGroupbyColumn === void 0 ? void 0 : columnGroupbyColumn.type) === CellType.MULTIPLE_SELECT) {
+        return newSqlRows;
+      }
+    }
+
+    // no has column group
+    if (!sqlColumnGroupbyColumnKey) {
+      sqlRows.forEach((sqlRow, index) => {
+        const collaborators = sqlRow[sqlGroupbyColumnKey];
+        // Multiple collaborators
+        if ((collaborators === null || collaborators === void 0 ? void 0 : collaborators.length) > 1) {
+          const oldCollaboratorCount = sqlRow[sqlSummaryColumnKey];
+          newSqlRows.splice(index, 1);
+          collaborators.forEach(item => {
+            const rowIndex = newSqlRows.findIndex(rows => {
+              var _rows$sqlGroupbyColum;
+              return ((_rows$sqlGroupbyColum = rows[sqlGroupbyColumnKey]) === null || _rows$sqlGroupbyColum === void 0 ? void 0 : _rows$sqlGroupbyColum[0]) === item;
+            });
+            if (rowIndex !== -1) {
+              if (newSqlRows[rowIndex][sqlSummaryColumnKey] && oldCollaboratorCount) {
+                newSqlRows[rowIndex][sqlSummaryColumnKey] = newSqlRows[rowIndex][sqlSummaryColumnKey] + oldCollaboratorCount;
+              }
+            } else {
+              const obj = {};
+              if (sqlGroupbyColumnKey) {
+                obj[sqlGroupbyColumnKey] = [item];
+              }
+              if (sqlSummaryColumnKey) {
+                obj[sqlSummaryColumnKey] = oldCollaboratorCount;
+              }
+              newSqlRows.push({
+                ...sqlRow,
+                ...obj
+              });
+            }
+          });
+        }
+      });
+    }
+  }
+  if (config.summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+    let summarySQLColumnName2ColumnKeys;
+    if (summarySQLColumnName2ColumnKey) {
+      summarySQLColumnName2ColumnKeys = Object.keys(summarySQLColumnName2ColumnKey);
+    } else if (sqlColumnGroupbyColumnKey) {
+      summarySQLColumnName2ColumnKeys = [sqlColumnGroupbyColumnKey];
+    } else {
+      console.error('on formatedTableSqlRows: summarySQLColumnName2ColumnKey is null');
+      return [];
+    }
+
+    // has column group
+    if (sqlColumnGroupbyColumnKey) {
+      if ((columnGroupbyColumn === null || columnGroupbyColumn === void 0 ? void 0 : columnGroupbyColumn.type) === CellType.COLLABORATOR) {
+        return newSqlRows;
+      }
+      if ((columnGroupbyColumn === null || columnGroupbyColumn === void 0 ? void 0 : columnGroupbyColumn.type) === CellType.MULTIPLE_SELECT) {
+        return newSqlRows;
+      }
+
+      // Add a quantity field to calculate the average
+      newSqlRows.forEach(item => {
+        summarySQLColumnName2ColumnKeys.forEach(key => {
+          if (key.startsWith('AVG')) {
+            item["COUNT(".concat(key.slice(3), ")")] = item['COUNT(*)'];
+            // Update avg
+            const newKey = 'SUM' + key.slice(3);
+            item[key] = item[newKey] / item["COUNT(".concat(key.slice(3), ")")];
+          }
+        });
+      });
+    }
+
+    // no has column group
+    if (!sqlColumnGroupbyColumnKey) {
+      // Add a quantity field to calculate the average
+      newSqlRows.forEach(item => {
+        summarySQLColumnName2ColumnKeys.forEach(key => {
+          if (key.startsWith('AVG')) {
+            item["COUNT(".concat(key.slice(3), ")")] = item['COUNT(*)'];
+          }
+        });
+      });
+      sqlRows.forEach((item, index) => {
+        const collaborators = item[sqlGroupbyColumnKey];
+        // Multiple collaborators
+        if ((collaborators === null || collaborators === void 0 ? void 0 : collaborators.length) > 1) {
+          newSqlRows.splice(index, 1);
+          collaborators.forEach(collaborator => {
+            const rowIndex = newSqlRows.findIndex(rows => {
+              var _rows$sqlGroupbyColum2;
+              return ((_rows$sqlGroupbyColum2 = rows[sqlGroupbyColumnKey]) === null || _rows$sqlGroupbyColum2 === void 0 ? void 0 : _rows$sqlGroupbyColum2[0]) === collaborator;
+            });
+            // has same collaborator
+            if (rowIndex !== -1) {
+              summarySQLColumnName2ColumnKeys.forEach(key => {
+                let newKey = key;
+                // Avg: The avg is calculated by sum / count
+                if (key.startsWith('AVG')) {
+                  newKey = 'SUM' + key.slice(3);
+                  newSqlRows[rowIndex]["COUNT(".concat(key.slice(3), ")")] = newSqlRows[rowIndex]["COUNT(".concat(key.slice(3), ")")] + item['COUNT(*)'];
+                }
+                // Sum
+                if (newKey.startsWith('SUM') && newSqlRows[rowIndex][newKey]) {
+                  newSqlRows[rowIndex][newKey] = newSqlRows[rowIndex][newKey] + item[newKey];
+                }
+                // Min
+                if (key.startsWith('MIN')) {
+                  const oldValue = item[newKey];
+                  const newValue = newSqlRows[rowIndex][newKey];
+                  newSqlRows[rowIndex][newKey] = Math.min(oldValue, newValue);
+                }
+                // Max
+                if (key.startsWith('MAX')) {
+                  const oldValue = item[newKey];
+                  const newValue = newSqlRows[rowIndex][newKey];
+                  newSqlRows[rowIndex][newKey] = Math.max(oldValue, newValue);
+                }
+                // DISTINCT
+                if (key.includes('DISTINCT')) {
+                  newSqlRows[rowIndex][newKey] = newSqlRows[rowIndex][newKey] + item[newKey];
+                }
+              });
+            } else {
+              // no has same collaborator
+              const obj = {};
+              if (sqlGroupbyColumnKey) {
+                obj[sqlGroupbyColumnKey] = [collaborator];
+              }
+              summarySQLColumnName2ColumnKeys.forEach(key => {
+                let newKey = key;
+                // Avg: The avg is calculated by sum / count
+                if (key.startsWith('AVG')) {
+                  newKey = 'SUM' + key.slice(3);
+                  obj["COUNT(".concat(key.slice(3), ")")] = item['COUNT(*)'];
+                }
+                // Sum
+                if (newKey.startsWith('SUM')) {
+                  obj[newKey] = item[newKey];
+                }
+              });
+              newSqlRows.push({
+                ...item,
+                ...obj
+              });
+            }
+          });
+        }
+      });
+      newSqlRows.forEach(item => {
+        summarySQLColumnName2ColumnKeys.forEach(key => {
+          // Update avg
+          if (key.startsWith('AVG')) {
+            const newKey = 'SUM' + key.slice(3);
+            item[key] = item[newKey] / item["COUNT(".concat(key.slice(3), ")")];
+          }
+        });
+      });
+    }
+  }
+  return newSqlRows;
+};
 BaseUtils.mergePivotTableSameCollaborator = pivot_rows => {
   const new_pivot_rows = [];
   pivot_rows.forEach(item => {
@@ -1426,4 +1604,46 @@ BaseUtils.recalculateAvg = sqlRows => {
   });
   return sqlRows;
 };
+BaseUtils.updateCollaboratorAndMultipleAvg = (pivot_rows, all) => {
+  const new_pivot_rows = JSON.parse(JSON.stringify(pivot_rows));
+  // All summary field columns
+  all.forEach(item => {
+    if ((item === null || item === void 0 ? void 0 : item.summary_method.toUpperCase()) === 'MEAN') {
+      const avgColumnName = item.column.name;
+      const avgColumnKey = item.column.key;
+      new_pivot_rows.forEach(rows => {
+        Object.values(rows.cells).forEach(cell => {
+          // get all sum and count
+          let allSum = 0;
+          let allCount = 0;
+          cell.rows.forEach(r => {
+            allSum = allSum + r["SUM(".concat(avgColumnName, ")")];
+            allCount = allCount + r["COUNT(*)"];
+          });
+
+          // set avg, avg = sum / count
+          cell.total.forEach((item, index) => {
+            if (Array.isArray(item) && item[2] === avgColumnKey) {
+              cell.total[index][1] = allSum / allCount;
+            }
+          });
+        });
+      });
+    }
+  });
+  return new_pivot_rows;
+};
+BaseUtils.isCollaboratorColumnOrMultipleColumn = columnMap => {
+  const {
+    columnGroupbyColumn,
+    groupbyColumn
+  } = columnMap || {};
+  if (columnGroupbyColumn && groupbyColumn && (columnGroupbyColumn === null || columnGroupbyColumn === void 0 ? void 0 : columnGroupbyColumn.type) === CellType.COLLABORATOR && (groupbyColumn === null || groupbyColumn === void 0 ? void 0 : groupbyColumn.type) === CellType.COLLABORATOR) {
+    return true;
+  }
+  if (columnGroupbyColumn && groupbyColumn && (columnGroupbyColumn === null || columnGroupbyColumn === void 0 ? void 0 : columnGroupbyColumn.type) === CellType.MULTIPLE_SELECT && (groupbyColumn === null || groupbyColumn === void 0 ? void 0 : groupbyColumn.type) === CellType.MULTIPLE_SELECT) {
+    return true;
+  }
+  return false;
+};
 export default BaseUtils;

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

@@ -60,16 +60,20 @@ OriginalDataUtils.calculateChart = async (chart, value, callback) => {
     } = chart;
     const {
       table_id,
+      view_id,
       type
     } = config || {};
     const table = getTableById(value.tables, table_id);
     const calculator = calculatorMap[type] || calculatorMap[BASIC_CHART];
     const result = await calculator(config, value, {
-      getViewRows: (view, table) => {
-        const rows = context.getViewRows(view, table, value);
+      getViewRows: async (view, table) => {
+        const rows = await context.getViewRows(view, table, value);
         return rows;
       },
-      getTableFormulaResults: (table, rows) => context.getTableFormulaResults(table, rows, value)
+      getTableFormulaResults: async (table, rows) => {
+        const res = await context.getTableFormulaResults(table, rows, value, view_id);
+        return res;
+      }
     });
     const groupbyColumn = BaseUtils.getGroupColumn(table, chart);
     const columnGroupbyColumn = BaseUtils.getColumnGroupColumn(table, chart);

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

@@ -261,16 +261,10 @@ async function calculateTwoDimensionTable(chart, value, _ref2) {
           let pivotRowIndex = pivot_rows.findIndex(r => !r.name);
           updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, null, row, isRowGroupbyColumnDataAsAnArray, cellValueForColumn, chart, groupbyColumn, table);
         } else {
-          // groupbyColumn type is multiple-select use equal
-          if ((groupbyColumn === null || groupbyColumn === void 0 ? void 0 : groupbyColumn.type) === 'multiple-select') {
-            pivotRowIndex = pivot_rows.findIndex(r => JSON.stringify(name) === JSON.stringify(r.name));
-            updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, name, row, isRowGroupbyColumnDataAsAnArray, cellValueForColumn, chart, groupbyColumn, table);
-          } else {
-            name.forEach(n => {
-              pivotRowIndex = pivot_rows.findIndex(r => n === r.name);
-              updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, n, row, isRowGroupbyColumnDataAsAnArray, cellValueForColumn, chart, groupbyColumn, table);
-            });
-          }
+          name.forEach(n => {
+            pivotRowIndex = pivot_rows.findIndex(r => n === r.name);
+            updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, n, row, isRowGroupbyColumnDataAsAnArray, cellValueForColumn, chart, groupbyColumn, table);
+          });
         }
       } else {
         pivotRowIndex = pivot_rows.findIndex(pivotRow => {
@@ -364,26 +358,15 @@ function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow
         });
       }
     } else {
-      // column is multiple-select use equal
-      if ((column === null || column === void 0 ? void 0 : column.type) === 'multiple-select') {
-        const pivotColumnIndex = pivot_columns.findIndex(r => JSON.stringify(r.key) === JSON.stringify(key));
+      key.forEach(k => {
+        pivotColumnIndex = pivot_columns.findIndex(r => r.key === k);
         if (pivotColumnIndex < 0) {
           pivot_columns.push({
-            key: key,
-            original_key: key
+            key: k,
+            original_key: k
           });
         }
-      } else {
-        key.forEach(k => {
-          pivotColumnIndex = pivot_columns.findIndex(r => r.key === k);
-          if (pivotColumnIndex < 0) {
-            pivot_columns.push({
-              key: k,
-              original_key: k
-            });
-          }
-        });
-      }
+      });
     }
   } else {
     pivotColumnIndex = pivot_columns.findIndex(r => {
@@ -464,7 +447,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
               const computedValue = BaseUtils.getSummaryValue({
                 summaryMethod: current.summary_method.toUpperCase(),
                 summaryColumn: current.column
-              }, currentValue, nextValue);
+              }, currentValue, nextValue, true);
               const columnName = current.column.name;
               return [columnName, computedValue, columnKey];
             });

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

@@ -102,121 +102,6 @@ SQLStatisticsUtils.getGroupLabelFromDB = (cellValue, column, chart) => {
       }
   }
 };
-SQLStatisticsUtils.formatedTableSqlRows = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
-  const {
-    config
-  } = chart;
-  let {
-    sqlGroupbyColumnKey,
-    sqlSummaryColumnKey,
-    summarySQLColumnName2ColumnKey,
-    sqlColumnGroupbyColumnKey
-  } = chartSQLMap;
-  const newSqlRows = JSON.parse(JSON.stringify(sqlRows));
-  if (config.summary_type === CHART_SUMMARY_TYPE.COUNT) {
-    sqlRows.forEach((item, index) => {
-      const collaborators = item[sqlGroupbyColumnKey];
-      // Multiple collaborators
-      if ((collaborators === null || collaborators === void 0 ? void 0 : collaborators.length) > 1) {
-        newSqlRows.splice(index, 1);
-        collaborators.forEach(item => {
-          const rowIndex = newSqlRows.findIndex(rows => {
-            var _rows$sqlGroupbyColum;
-            return ((_rows$sqlGroupbyColum = rows[sqlGroupbyColumnKey]) === null || _rows$sqlGroupbyColum === void 0 ? void 0 : _rows$sqlGroupbyColum[0]) === item;
-          });
-          if (rowIndex !== -1) {
-            if (newSqlRows[rowIndex][sqlSummaryColumnKey]) {
-              newSqlRows[rowIndex][sqlSummaryColumnKey] = newSqlRows[rowIndex][sqlSummaryColumnKey] + 1;
-            }
-          } else {
-            const obj = {};
-            if (sqlGroupbyColumnKey) {
-              obj[sqlGroupbyColumnKey] = [item];
-            }
-            if (sqlSummaryColumnKey) {
-              obj[sqlSummaryColumnKey] = 1;
-            }
-            newSqlRows.push({
-              ...item,
-              ...obj
-            });
-          }
-        });
-      }
-    });
-  }
-  if (config.summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
-    let summarySQLColumnName2ColumnKeys;
-    if (summarySQLColumnName2ColumnKey) {
-      summarySQLColumnName2ColumnKeys = Object.keys(summarySQLColumnName2ColumnKey);
-    } else if (sqlColumnGroupbyColumnKey) {
-      summarySQLColumnName2ColumnKeys = [sqlColumnGroupbyColumnKey];
-    } else {
-      console.error('on formatedTableSqlRows: summarySQLColumnName2ColumnKey is null');
-      return [];
-    }
-    sqlRows.forEach((item, index) => {
-      const collaborators = item[sqlGroupbyColumnKey];
-      // Multiple collaborators
-      if ((collaborators === null || collaborators === void 0 ? void 0 : collaborators.length) > 1) {
-        newSqlRows.splice(index, 1);
-        collaborators.forEach(collaborator => {
-          const rowIndex = newSqlRows.findIndex(rows => {
-            var _rows$sqlGroupbyColum2;
-            return ((_rows$sqlGroupbyColum2 = rows[sqlGroupbyColumnKey]) === null || _rows$sqlGroupbyColum2 === void 0 ? void 0 : _rows$sqlGroupbyColum2[0]) === collaborator;
-          });
-          if (rowIndex !== -1) {
-            summarySQLColumnName2ColumnKeys.forEach(key => {
-              let newKey = key;
-              // The avg is calculated by sum column
-              if (key.startsWith('AVG')) {
-                newKey = 'SUM' + key.slice(3);
-              }
-              // Update sum and count
-              if (newKey.startsWith('SUM') && newSqlRows[rowIndex][newKey]) {
-                newSqlRows[rowIndex][newKey] = newSqlRows[rowIndex][newKey] + item[newKey];
-              }
-              if (newSqlRows[rowIndex]['COUNT(*)']) {
-                newSqlRows[rowIndex]['COUNT(*)'] = newSqlRows[rowIndex]['COUNT(*)'] + 1;
-              }
-            });
-          } else {
-            const obj = {};
-            if (sqlGroupbyColumnKey) {
-              obj[sqlGroupbyColumnKey] = [collaborator];
-            }
-            summarySQLColumnName2ColumnKeys.forEach(key => {
-              let newKey = key;
-              // The avg is calculated by sum column
-              if (key.startsWith('AVG')) {
-                newKey = 'SUM' + key.slice(3);
-              }
-              // Update sum and count
-              if (newKey.startsWith('SUM')) {
-                obj[newKey] = item[newKey];
-              }
-              obj['COUNT(*)'] = 1;
-            });
-            newSqlRows.push({
-              ...item,
-              ...obj
-            });
-          }
-        });
-      }
-    });
-    newSqlRows.forEach(item => {
-      summarySQLColumnName2ColumnKeys.forEach(key => {
-        // Update avg
-        if (key.startsWith('AVG')) {
-          const newKey = 'SUM' + key.slice(3);
-          item[key] = item[newKey] / item['COUNT(*)'];
-        }
-      });
-    });
-  }
-  return newSqlRows;
-};
 SQLStatisticsUtils.getGroupData = (result, groupColumn) => {
   const {
     options = {}
@@ -252,18 +137,6 @@ SQLStatisticsUtils.updateTwoDimensionColumns = (pivot_columns, key, _ref, column
       }
       return;
     }
-
-    // columnGroupbyColumn is multiple-select use equal
-    if ((columnGroupbyColumn === null || columnGroupbyColumn === void 0 ? void 0 : columnGroupbyColumn.type) === 'multiple-select') {
-      const pivotColumnIndex = pivot_columns.findIndex(r => JSON.stringify(r.key) === JSON.stringify(key));
-      if (pivotColumnIndex < 0) {
-        pivot_columns.push({
-          key: key,
-          original_key: key
-        });
-      }
-      return;
-    }
     key.forEach(k => {
       const pivotColumnIndex = pivot_columns.findIndex(r => r.key === k);
       if (pivotColumnIndex < 0) {
@@ -288,7 +161,7 @@ SQLStatisticsUtils.updateTwoDimensionColumns = (pivot_columns, key, _ref, column
 };
 SQLStatisticsUtils.updateTwoDimensionRows = (chart, pivot_rows, pivot_columns, index, name,
 // count,
-row, isColumnDataAsAnArray, cellValue, _ref2, chartSQLMap) => {
+row, isColumnDataAsAnArray, cellValue, _ref2, chartSQLMap, columnMap) => {
   let {
     singleNumeriColumnWithMethod,
     multipleNumericColumnsWithMethod
@@ -323,7 +196,11 @@ row, isColumnDataAsAnArray, cellValue, _ref2, chartSQLMap) => {
         if (cells[key]) {
           cells[key].rows.push(row);
           if (isCount) {
-            cells[key].total = row[sqlSummaryColumnKey];
+            if (BaseUtils.isCollaboratorColumnOrMultipleColumn(columnMap)) {
+              cells[key].total = total + row[sqlSummaryColumnKey];
+            } else {
+              cells[key].total = row[sqlSummaryColumnKey];
+            }
           } else {
             cells[key].total = summarySQLColumnKeys.map((columnKey, i) => {
               const current = all.find(item => item.column.key === columnKey);
@@ -332,9 +209,9 @@ row, isColumnDataAsAnArray, cellValue, _ref2, chartSQLMap) => {
               // use columnKey to find current value
               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);
+              }, currentValue, nextValue, BaseUtils.isCollaboratorColumnOrMultipleColumn(columnMap));
               const columnName = current.column.name;
 
               // keep column key to find currentValue on updating
@@ -478,8 +355,8 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   let pivot_rows = [];
   const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
   let newSqlRows = sqlRows;
-  if (groupbyColumn.type === CellType.COLLABORATOR) {
-    newSqlRows = _SQLStatisticsUtils.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+  if ([CellType.COLLABORATOR, CellType.MULTIPLE_SELECT].includes(groupbyColumn.type)) {
+    newSqlRows = BaseUtils.formatedTableSqlRowsByCollaboratorAndMultiple(chart, sqlRows, chartSQLMap, columnMap);
   }
   if (isCount) {
     let allTotal = 0;
@@ -595,8 +472,8 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   // const summaryMethod = (summary_method || 'sum').toUpperCase();
 
   let newSqlRows = sqlRows;
-  if (groupbyColumn.type === CellType.COLLABORATOR) {
-    newSqlRows = _SQLStatisticsUtils.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+  if ([CellType.COLLABORATOR, CellType.MULTIPLE_SELECT].includes(groupbyColumn.type)) {
+    newSqlRows = BaseUtils.formatedTableSqlRowsByCollaboratorAndMultiple(chart, sqlRows, chartSQLMap, columnMap);
   }
   let pivot_columns = [];
   let pivot_rows = [];
@@ -636,15 +513,17 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
           row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
             singleNumeriColumnWithMethod,
             multipleNumericColumnsWithMethod
-          }, chartSQLMap);
+          }, chartSQLMap, columnMap);
         } else {
-          let pivotRowIndex = pivot_rows.findIndex(r => JSON.stringify(groupbyColumnCellValueKey) === JSON.stringify(r.name));
-          _SQLStatisticsUtils.updateTwoDimensionRows(chart, pivot_rows, pivot_columns, pivotRowIndex, groupbyColumnCellValueKey,
-          // count,
-          row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
-            singleNumeriColumnWithMethod,
-            multipleNumericColumnsWithMethod
-          }, chartSQLMap);
+          groupbyColumnCellValueKey.forEach(n => {
+            let pivotRowIndex = pivot_rows.findIndex(r => n === r.name);
+            _SQLStatisticsUtils.updateTwoDimensionRows(chart, pivot_rows, pivot_columns, pivotRowIndex, n,
+            // count,
+            row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
+              singleNumeriColumnWithMethod,
+              multipleNumericColumnsWithMethod
+            }, chartSQLMap, columnMap);
+          });
         }
       } else {
         let pivotRowIndex = pivot_rows.findIndex(r => {
@@ -656,10 +535,16 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
         row, isRowGroupbyColumnDataAsAnArray, columnGroupbyColumnCellValueKey, {
           singleNumeriColumnWithMethod,
           multipleNumericColumnsWithMethod
-        }, chartSQLMap);
+        }, chartSQLMap, columnMap);
       }
     }
   });
+
+  // update Collaborator and Multiple mean value
+  if (BaseUtils.isCollaboratorColumnOrMultipleColumn(columnMap)) {
+    const new_pivot_rows = BaseUtils.updateCollaboratorAndMultipleAvg(pivot_rows, [singleNumeriColumnWithMethod, ...multipleNumericColumnsWithMethod]);
+    pivot_rows = new_pivot_rows;
+  }
   [pivot_columns_total, pivot_table_total] = _SQLStatisticsUtils.getAndUpdateTwoDimensionTotal(pivot_columns_total, pivot_columns, pivot_rows,
   // { summaryMethod, summaryColumn }
   pivot_table_total, chart);

package/dist/utils/contexts.js

@@ -1,2 +1,3 @@
 import React from 'react';
-export const settingsContext = React.createContext('');
+export const settingsContext = React.createContext('');
+export const DepartmentsContext = React.createContext([]);

package/dist/utils/row-utils.js

@@ -29,7 +29,6 @@ export const isValidRow = (row, formulaRow, column, includeEmpty) => {
   }
   return cellValue || cellValue === 0;
 };
-const RETURN_ARRAY_CHART_TYPES = [CHART_TYPE.TABLE];
 export const getFormattedLabel = (column, name, collaborators, chartType) => {
   let {
     type: columnType,
@@ -51,13 +50,6 @@ export const getFormattedLabel = (column, name, collaborators, chartType) => {
       return optionName;
     }
   } else if (columnType === CellType.MULTIPLE_SELECT) {
-    // Return the array directly and process it in the rendering, file directly: src/view/wrapper/table/pivot-table-display-name.js
-    if (RETURN_ARRAY_CHART_TYPES.includes(chartType)) {
-      if (Array.isArray(name)) {
-        return name;
-      }
-      return [];
-    }
     const options = getColumnOptions(column);
     let selectedOption = getOption(options, name);
     let {

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

@@ -475,8 +475,8 @@ class ChartDataSQL {
         }
       });
 
-      // groupby_column is COLLABORATOR , replace AVG with SUM, and add 'COUNT(*)'
-      if (groupby_column.type === CellType.COLLABORATOR) {
+      // groupby_column is COLLABORATOR or MULTIPLE_SELECT, replace AVG with SUM, and add 'COUNT(*)'
+      if (groupby_column.type === CellType.COLLABORATOR || groupby_column.type === CellType.MULTIPLE_SELECT) {
         summary_column_names.forEach((item, index) => {
           if (item.startsWith('AVG')) {
             summary_column_names[index] = 'SUM' + item.slice(3);
@@ -484,12 +484,6 @@ 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(', ');
       return summary_column_names_str;
     };

package/package.json

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