sea-chart 0.0.51-alpha.3 → 0.0.51

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

@@ -10,7 +10,27 @@ import ObjectUtils from '../object-utils';
 import intl from '../../intl';
 import context from '../../context';
 import { isValidCollaboratorEmail } from '../collaborator';
-class BaseUtils {}
+class BaseUtils {
+  constructor() {
+    this.sortDataByKey = (data, key, sortType) => {
+      data.sort((curr, next) => {
+        const currentVal = curr[key];
+        const nextVal = next[key];
+        if (!currentVal && currentVal !== 0) {
+          return -1;
+        }
+        if (!nextVal && nextVal !== 0) {
+          return 1;
+        }
+        if (sortType === CHART_DATA_SORT_TYPE.ASCENDING) {
+          return currentVal > nextVal ? 1 : -1;
+        } else {
+          return currentVal > nextVal ? -1 : 1;
+        }
+      });
+    };
+  }
+}
 _BaseUtils = BaseUtils;
 BaseUtils.isCollaborator = column => {
   return column.type === CellType.COLLABORATOR;
@@ -247,7 +267,7 @@ BaseUtils.getSummaryValueDisplayString = function (summaryColumn, summaryValue)
   let summaryMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'count';
   if (!summaryColumn) return summaryValue;
   if (!summaryValue && summaryValue !== 0) return summaryValue;
-  if ((summaryMethod === null || summaryMethod === void 0 ? void 0 : summaryMethod.toUpperCase()) === 'DISTINCT_VALUES') return summaryValue;
+  if (summaryMethod.toUpperCase() === 'DISTINCT_VALUES') return summaryValue;
   const {
     data
   } = summaryColumn;
@@ -748,23 +768,6 @@ BaseUtils.sortByDate = (currentDate, nextDate) => {
   if (currentDate.name < nextDate.name) return -1;
   return 0;
 };
-BaseUtils.sortDataByKey = (data, key, sortType) => {
-  data.sort((curr, next) => {
-    const currentVal = curr[key];
-    const nextVal = next[key];
-    if (!currentVal && currentVal !== 0) {
-      return -1;
-    }
-    if (!nextVal && nextVal !== 0) {
-      return 1;
-    }
-    if (sortType === CHART_DATA_SORT_TYPE.ASCENDING) {
-      return currentVal > nextVal ? 1 : -1;
-    } else {
-      return currentVal > nextVal ? -1 : 1;
-    }
-  });
-};
 BaseUtils.moveNullDataToEnd = arr => {
   let nullData;
   const nullDataIndex = arr.findIndex(item => {

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

@@ -111,7 +111,7 @@ SQLStatisticsUtils.formatedTableSqlRows = (chart, sqlRows, chartSQLMap, columnMa
   if (config.summary_type === CHART_SUMMARY_TYPE.COUNT) {
     sqlRows.forEach((item, index) => {
       const collaborators = item[sqlGroupbyColumnKey];
-      // Multiple collaborators in the same cell
+      // Multiple collaborators
       if ((collaborators === null || collaborators === void 0 ? void 0 : collaborators.length) > 1) {
         newSqlRows.splice(index, 1);
         collaborators.forEach(item => {
@@ -152,7 +152,7 @@ SQLStatisticsUtils.formatedTableSqlRows = (chart, sqlRows, chartSQLMap, columnMa
     }
     sqlRows.forEach((item, index) => {
       const collaborators = item[sqlGroupbyColumnKey];
-      // Multiple collaborators in the same cell
+      // Multiple collaborators
       if ((collaborators === null || collaborators === void 0 ? void 0 : collaborators.length) > 1) {
         newSqlRows.splice(index, 1);
         collaborators.forEach(collaborator => {
@@ -646,40 +646,6 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   pivot_table_total, chart);
   BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name');
   BaseUtils.sortCharts(pivot_columns, columnGroupbyColumn, 'key');
-  console.log('pivot_rows', pivot_rows);
-  const mergeSameCollaborator = pivot_rows => {
-    const new_pivot_rows = [];
-    pivot_rows.forEach(item => {
-      var _item$name;
-      // Single Collaborator in cell
-      if ((item === null || item === void 0 ? void 0 : (_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name.length) === 1) {
-        const curCollaborator = item.name[0];
-        const length = new_pivot_rows.length;
-        if (length > 1 && new_pivot_rows[length - 1]) {
-          var _new_pivot_rows;
-          const preCollaborator = (_new_pivot_rows = new_pivot_rows[length - 1]) === null || _new_pivot_rows === void 0 ? void 0 : _new_pivot_rows.name[0];
-          if (curCollaborator === preCollaborator) {
-            const newItem = {
-              ...item,
-              cells: {
-                ...new_pivot_rows[length - 1].cells,
-                ...item.cells
-              },
-              total: new_pivot_rows[length - 1].total + item.total
-            };
-            new_pivot_rows[length - 1] = newItem;
-            return;
-          }
-        }
-        new_pivot_rows.push({
-          ...item
-        });
-      }
-    });
-    console.log('new_pivot_rows', new_pivot_rows);
-    return new_pivot_rows;
-  };
-  pivot_rows = mergeSameCollaborator(pivot_rows);
   const summary_columns = [summaryColumn, ...summaryColumnsWithMethod.map(item => item.column)];
   return {
     summary_columns,

package/dist/utils/column-utils.js

@@ -3,7 +3,7 @@ import { COLUMNS_ICON_CONFIG } from 'dtable-utils';
 import React from 'react';
 import { MIRROR_COLUMN_LIST, CHART_SUMMARY_TYPE } from '../constants';
 import { getClientFormulaDisplayString } from './cell-format-utils';
-import { BaseUtils } from './chart-utils';
+import { ChartUtils } from './chart-utils';
 
 // get dtable column options
 export function getColumnOptions(columns) {
@@ -461,7 +461,7 @@ export const sortDataByGroupSum = (data, sortType) => {
   });
 
   // sort group
-  BaseUtils.sortDataByKey(nameSumMap, 'valueSum', sortType);
+  ChartUtils.sortDataByKey(nameSumMap, 'valueSum', sortType);
   return nameSumMap.reduce((accumulator, currentItem) => accumulator.concat(currentItem.items), []);
 };
 export const formatNumericValue = function (value) {

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

@@ -105,8 +105,7 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
           })
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: name,
-          column: groupbyColumn,
-          rowData: rowItem
+          column: groupbyColumn
         })), display_total && /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
             'pivot-empty-cell': !isValidTotalDisplayValue,

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

@@ -124,8 +124,7 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
           })
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: name,
-          column: groupbyColumn,
-          rowData: rowItem
+          column: groupbyColumn
         })), Array.isArray(pivot_columns) && pivot_columns.map((columnMap, cellIdx) => {
           const isSelectedCell = selectRowIdx === rowIdx && selectedCellIdx === cellIdx;
           const isSelectedCellTop = selectRowIdx - 1 === rowIdx && selectedCellIdx === cellIdx;

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

@@ -128,16 +128,7 @@ class PivotTableDisplayName extends React.Component {
           }
         case CellType.COLLABORATOR:
           {
-            const {
-              rowData
-            } = this.props;
-            const {
-              original_name
-            } = rowData || {};
-            let validValue = Array.isArray(value) && value.length !== 0 ? value : [];
-            if (original_name) {
-              validValue = [original_name];
-            }
+            const validValue = Array.isArray(value) && value.length !== 0 ? value : [];
             const unknowEmails = validValue.filter(email => !getCollaborator(collaborators, email));
 
             // if need to query unknowEmails

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

@@ -78,8 +78,7 @@ class TwoDimensionTable extends PureComponent {
           key: "pivot-column-".concat(index)
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: original_key,
-          column: columnGroupbyColumn || {},
-          rowData: item
+          column: columnGroupbyColumn || {}
         }));
       }), display_total && /*#__PURE__*/React.createElement("th", {
         className: classnames('pivot-table-header', {
@@ -187,8 +186,7 @@ class TwoDimensionTable extends PureComponent {
           })
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: name,
-          column: groupbyColumn,
-          rowData: rowItem
+          column: groupbyColumn
         })), Array.isArray(cells) && cells.map((c, cellIdx) => {
           const isSelectedCell = selectRowIdx === rowIdx && selectedCellIdx === cellIdx;
           const isSelectedCellTop = selectRowIdx - 1 === rowIdx && selectedCellIdx === cellIdx;

package/package.json

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