sea-chart 0.0.51 → 0.0.53-alpha.0

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

@@ -10,27 +10,7 @@ import ObjectUtils from '../object-utils';
 import intl from '../../intl';
 import context from '../../context';
 import { isValidCollaboratorEmail } from '../collaborator';
-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;
-        }
-      });
-    };
-  }
-}
+class BaseUtils {}
 _BaseUtils = BaseUtils;
 BaseUtils.isCollaborator = column => {
   return column.type === CellType.COLLABORATOR;
@@ -267,7 +247,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.toUpperCase() === 'DISTINCT_VALUES') return summaryValue;
+  if ((summaryMethod === null || summaryMethod === void 0 ? void 0 : summaryMethod.toUpperCase()) === 'DISTINCT_VALUES') return summaryValue;
   const {
     data
   } = summaryColumn;
@@ -768,6 +748,23 @@ 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 => {
@@ -1348,4 +1345,34 @@ BaseUtils.summaryDurationResult = (result, duration, summaryType, summaryMethod,
     comparedValue
   };
 };
+BaseUtils.mergePivotTableSameCollaborator = pivot_rows => {
+  const new_pivot_rows = [];
+  pivot_rows.forEach(item => {
+    var _item$name;
+    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
+      });
+    }
+  });
+  return new_pivot_rows;
+};
 export default BaseUtils;

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

@@ -646,6 +646,7 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   pivot_table_total, chart);
   BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name');
   BaseUtils.sortCharts(pivot_columns, columnGroupbyColumn, 'key');
+  pivot_rows = BaseUtils.mergePivotTableSameCollaborator(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 { ChartUtils } from './chart-utils';
+import { BaseUtils } from './chart-utils';
 
 // get dtable column options
 export function getColumnOptions(columns) {
@@ -461,7 +461,7 @@ export const sortDataByGroupSum = (data, sortType) => {
   });
 
   // sort group
-  ChartUtils.sortDataByKey(nameSumMap, 'valueSum', sortType);
+  BaseUtils.sortDataByKey(nameSumMap, 'valueSum', sortType);
   return nameSumMap.reduce((accumulator, currentItem) => accumulator.concat(currentItem.items), []);
 };
 export const formatNumericValue = function (value) {

package/dist/view/index.css

@@ -58,8 +58,6 @@
 
 .sea-chart-formatter .sea-chart-trend-formatter-container {
   padding: 20px;
-  border: 2px solid #e2e2e2;
-  border-radius: 6px;
 }
 
 .sea-chart-formatter .sea-chart-container.show-x-axis-label,

package/dist/view/wrapper/table/index.js

@@ -25,12 +25,15 @@ class Table extends PureComponent {
         return /*#__PURE__*/React.createElement("div", null, intl.get('There_are_too_many_statistics_entries_to_display'));
       }
       if (columnGroupbyColumn) {
+        console.log('TwoDimensionTable');
         return /*#__PURE__*/React.createElement(TwoDimensionTable, this.props);
       }
       if (!Array.isArray(pivot_columns)) return null;
       if (pivot_columns.length < 2) {
+        console.log('NoNumericColumns');
         return /*#__PURE__*/React.createElement(OneDimensionTableNoNumericColumns, this.props);
       }
+      console.log('WithNumericColumns');
       return /*#__PURE__*/React.createElement(OneDimensionTableWithNumericColumns, this.props);
     };
   }
@@ -38,6 +41,7 @@ class Table extends PureComponent {
     const {
       result
     } = this.props;
+    console.log('result', result);
     return /*#__PURE__*/React.createElement("div", {
       className: "sea-chart-table-wrapper sea-chart-".concat(result.dimensions, "-table-wrapper")
       // onClick={this.onTableClick}

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

@@ -105,7 +105,8 @@ class OneDimensionTableNoNumericColumns extends PureComponent {
           })
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: name,
-          column: groupbyColumn
+          column: groupbyColumn,
+          rowData: rowItem
         })), 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,7 +124,8 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
           })
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: name,
-          column: groupbyColumn
+          column: groupbyColumn,
+          rowData: rowItem
         })), 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

@@ -73,6 +73,7 @@ class PivotTableDisplayName extends React.Component {
       }, optionName);
     };
     this.renderCollaborator = collaborator => {
+      console.log('renderCollaborator', collaborator);
       if (!collaborator) return null;
       const {
         avatar_url,
@@ -103,6 +104,7 @@ class PivotTableDisplayName extends React.Component {
         collaborators
       } = this.state;
       let displayName;
+      console.log('column-type', type, column);
       switch (type) {
         case CellType.SINGLE_SELECT:
           {
@@ -128,7 +130,16 @@ class PivotTableDisplayName extends React.Component {
           }
         case CellType.COLLABORATOR:
           {
-            const validValue = Array.isArray(value) && value.length !== 0 ? value : [];
+            const {
+              rowData
+            } = this.props;
+            const {
+              original_name
+            } = rowData || {};
+            let validValue = Array.isArray(value) && value.length !== 0 ? value : [];
+            if (original_name) {
+              validValue = [original_name];
+            }
             const unknowEmails = validValue.filter(email => !getCollaborator(collaborators, email));
 
             // if need to query unknowEmails
@@ -229,6 +240,7 @@ class PivotTableDisplayName extends React.Component {
                   let user = array_type === CellType.COLLABORATOR ? getCollaborator(collaborators, email) : getKnownCollaboratorByEmail(email);
                   return (user || {}).name;
                 });
+                displayValue = displayValue.join(' ');
               }
             }
             displayName = /*#__PURE__*/React.createElement("div", {

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

@@ -78,7 +78,8 @@ class TwoDimensionTable extends PureComponent {
           key: "pivot-column-".concat(index)
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: original_key,
-          column: columnGroupbyColumn || {}
+          column: columnGroupbyColumn || {},
+          rowData: item
         }));
       }), display_total && /*#__PURE__*/React.createElement("th", {
         className: classnames('pivot-table-header', {
@@ -186,7 +187,8 @@ class TwoDimensionTable extends PureComponent {
           })
         }, /*#__PURE__*/React.createElement(PivotTableDisplayName, {
           value: name,
-          column: groupbyColumn
+          column: groupbyColumn,
+          rowData: rowItem
         })), 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",
+  "version": "0.0.53-alpha.0",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",