sea-chart 1.1.9 → 1.1.10

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

@@ -1437,7 +1437,7 @@ BaseUtils.formatedTableSqlRowsByCollaboratorAndMultiple = (chart, sqlRows, chart
     summarySQLColumnName2ColumnKey,
     sqlColumnGroupbyColumnKey
   } = chartSQLMap;
-  const newSqlRows = JSON.parse(JSON.stringify(sqlRows));
+  let newSqlRows = JSON.parse(JSON.stringify(sqlRows));
   if (config.summary_type === CHART_SUMMARY_TYPE.COUNT) {
     // has column group
     if (sqlColumnGroupbyColumnKey) {
@@ -1448,40 +1448,26 @@ BaseUtils.formatedTableSqlRowsByCollaboratorAndMultiple = (chart, sqlRows, chart
         return newSqlRows;
       }
     }
-
+    let collaboratorsRowsMap = {};
     // no has column group
     if (!sqlColumnGroupbyColumnKey) {
-      sqlRows.forEach((sqlRow, index) => {
+      sqlRows.forEach(sqlRow => {
         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
-              });
-            }
-          });
-        }
+        collaborators.forEach(c => {
+          if (collaboratorsRowsMap[c]) {
+            const existedRow = collaboratorsRowsMap[c];
+            sqlRow[sqlSummaryColumnKey] && (existedRow[sqlSummaryColumnKey] += sqlRow[sqlSummaryColumnKey]);
+          } else {
+            const row = {
+              ...sqlRow
+            };
+            sqlGroupbyColumnKey && row[sqlGroupbyColumnKey] && (row[sqlGroupbyColumnKey] = [c]);
+            sqlSummaryColumnKey && row[sqlSummaryColumnKey] && (row[sqlSummaryColumnKey] = sqlRow[sqlSummaryColumnKey]);
+            collaboratorsRowsMap[c] = row;
+          }
+        });
       });
+      newSqlRows = Object.values(collaboratorsRowsMap);
     }
   }
   if (config.summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
@@ -1534,8 +1520,8 @@ BaseUtils.formatedTableSqlRowsByCollaboratorAndMultiple = (chart, sqlRows, chart
           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;
+              var _rows$sqlGroupbyColum;
+              return ((_rows$sqlGroupbyColum = rows[sqlGroupbyColumnKey]) === null || _rows$sqlGroupbyColum === void 0 ? void 0 : _rows$sqlGroupbyColum[0]) === collaborator;
             });
             // has same collaborator
             if (rowIndex !== -1) {

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

@@ -169,9 +169,7 @@ SQLStatisticsUtils.updateTwoDimensionColumns = (pivot_columns, key, _ref, column
     });
   }
 };
-SQLStatisticsUtils.updateTwoDimensionRows = (chart, pivot_rows, pivot_columns, index, name,
-// count,
-row, isColumnDataAsAnArray, cellValue, _ref2, chartSQLMap, columnMap) => {
+SQLStatisticsUtils.updateTwoDimensionRows = (chart, pivot_rows, pivot_columns, index, name, row, isColumnDataAsAnArray, cellValue, _ref2, chartSQLMap, columnMap) => {
   let {
     singleNumeriColumnWithMethod,
     multipleNumericColumnsWithMethod
@@ -353,7 +351,8 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = async (chart, sqlRows
   let pivot_rows = [];
   const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
 
-  // handle LINK_FORMULA
+  // if key is an array, handle it here ,currently only handle collaborator and multiple select
+  // MULTIPLE_CELL_VALUE_COLUMN_TYPE = [CellType.COLLABORATOR, CellType.MULTIPLE_SELECT, CellType.LINK]
   const isGroupByColumnLinkFormula = groupbyColumn.type === CellType.LINK_FORMULA;
   let newSqlRows = sqlRows;
   if (isGroupByColumnLinkFormula) {
@@ -499,6 +498,9 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = async (chart, sqlRows
   } else {
     isRowGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[columnGroupbyColumn.type];
   }
+
+  // if key is an array, handle it here ,currently only handle collaborator and multiple select
+  // MULTIPLE_CELL_VALUE_COLUMN_TYPE = [CellType.COLLABORATOR, CellType.MULTIPLE_SELECT, CellType.LINK]
   if (isGroupByColumnLinkFormula) {
     const {
       array_type
@@ -513,9 +515,7 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = async (chart, sqlRows
   let pivot_columns = [];
   let pivot_rows = [];
   let pivot_columns_total = {};
-  // let pivot_table_total = BaseUtils.initTotal(summaryMethod);
   let pivot_table_total = 0;
-  // const isRowGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[columnGroupbyColumn.type];
 
   // update pivot_columns
   for (const row of newSqlRows) {
@@ -549,6 +549,7 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = async (chart, sqlRows
       columnGroupbyColumnCellValueKey = await _SQLStatisticsUtils.getGroupLabelFromDB(columnGroupbyColumnCellValue, columnGroupbyColumn, chart.config, true);
     }
     if (BaseUtils.isValidCellValue(groupbyColumnCellValue, groupby_include_empty_cells)) {
+      // data is an array is handled previously, but to keep capability, still use old code
       if (isGroupbyColumnDataAsAnArray) {
         if ((!Array.isArray(groupbyColumnCellValueKey) || groupbyColumnCellValueKey.length === 0) && groupby_include_empty_cells) {
           let pivotRowIndex = pivot_rows.findIndex(r => !r.name);
@@ -588,9 +589,7 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = async (chart, sqlRows
     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);
+  [pivot_columns_total, pivot_table_total] = _SQLStatisticsUtils.getAndUpdateTwoDimensionTotal(pivot_columns_total, pivot_columns, pivot_rows, pivot_table_total, chart);
   BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name', true);
   BaseUtils.sortCharts(pivot_columns, columnGroupbyColumn, 'key', true);
   if ((groupbyColumn === null || groupbyColumn === void 0 ? void 0 : groupbyColumn.type) === CellType.COLLABORATOR) {

package/dist/view/wrapper/funnel.js

@@ -89,7 +89,7 @@ class Funnel extends ChartComponent {
       } else {
         labelStyle = {
           position: 'left',
-          offset: -30,
+          offsetX: -80,
           style: {
             fontSize: funnel_label_font_size,
             fill: theme.labelColor
@@ -105,8 +105,8 @@ class Funnel extends ChartComponent {
       this.chart.axis(false);
       this.chart.coordinate('rect').transpose().scale(1, -1);
       this.chart.interval().adjust('symmetric').position('name*value').shape('funnel').color('name', ['#0050B3', '#1890FF', '#40A9FF', '#69C0FF', '#BAE7FF']).label('name*value*percent', name => {
-        if (name.length > 35) {
-          name = name.substring(0, 35) + '...';
+        if (name.length > 10) {
+          name = name.substring(0, 10) + '...';
         }
         return {
           content: funnel_show_labels ? "".concat(name) : ''

package/dist/view/wrapper/table/pivot-table-display-name.js

@@ -1,4 +1,5 @@
 import React, { Fragment } from 'react';
+import PropTypes, { array } from 'prop-types';
 import shallowEqual from 'shallowequal';
 import dayjs from 'dayjs';
 import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_RESULT_TYPE, getOption, getCollaborator, getNumberDisplayString, isNumber, isValidEmail } from 'dtable-utils';
@@ -129,6 +130,11 @@ class PivotTableDisplayName extends React.Component {
             } else {
               options = getColumnOptions(column);
             }
+
+            // if this is a link-formula column and linked to a single select column, in this case the value is an array
+            if (Array.isArray(value)) {
+              value = value[0];
+            }
             let option = getOption(options, value) || {};
             if (Object.keys(option).length === 0) {
               option = options.find(item => item.name === value) || {};
@@ -263,7 +269,13 @@ class PivotTableDisplayName extends React.Component {
           }
         case CellType.LINK:
           {
-            const displayValue = getClientFormulaDisplayString([value], data, {
+            let newValue;
+            if (!array.isArray(value)) {
+              newValue = [value];
+            } else {
+              newValue = value;
+            }
+            const displayValue = getClientFormulaDisplayString(newValue, data, {
               collaborators
             }) || null;
             displayName = /*#__PURE__*/React.createElement("div", {

package/package.json

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