sea-chart 0.0.86 → 0.0.87

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

@@ -233,6 +233,10 @@ 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.includes(target);
   }
   return source === null && target === null || source === undefined && target === undefined || source === target;
@@ -1020,7 +1024,8 @@ BaseUtils.getGroupLabel = (cellValue, formulaRow, column, dateGranularity, geoGr
         if (!Array.isArray(cellValue)) {
           return [];
         }
-        return cellValue.filter(id => options.findIndex(o => o.id === id) > -1);
+        const newCellValue = cellValue.filter(id => options.findIndex(o => o.id === id) > -1);
+        return newCellValue.sort();
       }
     case CellType.COLLABORATOR:
       {

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

@@ -262,10 +262,16 @@ 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 {
-          name.forEach(n => {
-            pivotRowIndex = pivot_rows.findIndex(r => n === r.name);
-            updateTwoDimensionRows(pivot_rows, pivot_columns, pivotRowIndex, n, row, isRowGroupbyColumnDataAsAnArray, cellValueForColumn, chart, groupbyColumn, table);
-          });
+          // 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);
+            });
+          }
         }
       } else {
         pivotRowIndex = pivot_rows.findIndex(pivotRow => {
@@ -325,15 +331,26 @@ function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow
         });
       }
     } else {
-      key.forEach(k => {
-        pivotColumnIndex = pivot_columns.findIndex(r => r.key === k);
+      // 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));
         if (pivotColumnIndex < 0) {
           pivot_columns.push({
-            key: k,
-            original_key: k
+            key: key,
+            original_key: key
           });
         }
-      });
+      } 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 => {
@@ -610,7 +627,7 @@ function getTotal(summary_column, summary_type, summary_method) {
   if (summary_type === CHART_SUMMARY_TYPE.COUNT) {
     total = rowsLength;
   } else if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
-    if (summary_method === CHART_SUMMARY_TYPE.Distinct_values) {
+    if (summary_method === CHART_SUMMARY_TYPE.Distinct_values || summary_method === 'Distinct_values') {
       total = 0;
       let existMap = {};
       rows.forEach(row => {

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

@@ -235,7 +235,7 @@ SQLStatisticsUtils.getGroupData = (result, groupColumn) => {
   }
   return groupList;
 };
-SQLStatisticsUtils.updateTwoDimensionColumns = (pivot_columns, key, _ref) => {
+SQLStatisticsUtils.updateTwoDimensionColumns = (pivot_columns, key, _ref, columnGroupbyColumn) => {
   let {
     isIncludeEmpty,
     isCellValueAsAnArray
@@ -251,6 +251,18 @@ SQLStatisticsUtils.updateTwoDimensionColumns = (pivot_columns, key, _ref) => {
       }
       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) {
@@ -609,7 +621,7 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
       _SQLStatisticsUtils.updateTwoDimensionColumns(pivot_columns, columnGroupbyColumnCellValueKey, {
         isIncludeEmpty: groupby_include_empty_cells,
         isCellValueAsAnArray: isRowGroupbyColumnDataAsAnArray
-      });
+      }, columnGroupbyColumn);
     }
     if (BaseUtils.isValidCellValue(groupbyColumnCellValue, groupby_include_empty_cells)) {
       if (MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[groupbyColumn.type]) {
@@ -624,15 +636,13 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
             multipleNumericColumnsWithMethod
           }, chartSQLMap);
         } else {
-          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);
-          });
+          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);
         }
       } else {
         let pivotRowIndex = pivot_rows.findIndex(r => {

package/dist/utils/row-utils.js

@@ -33,7 +33,7 @@ export const getFormattedLabel = (column, name, collaborators) => {
     type: columnType,
     data: columnData
   } = column || {};
-  if (columnType === CellType.SINGLE_SELECT || columnType === CellType.MULTIPLE_SELECT) {
+  if (columnType === CellType.SINGLE_SELECT) {
     let options = columnData ? columnData.options : [];
     let selectedOption = options.find(o => {
       let id = name;
@@ -48,6 +48,12 @@ export const getFormattedLabel = (column, name, collaborators) => {
     if (selectedOption) {
       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 (Array.isArray(name)) {
+      return name;
+    }
+    return [];
   } else if (columnType === CellType.COLLABORATOR) {
     let collaborator = collaborators.find(item => {
       let email = name;

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

@@ -159,6 +159,7 @@
   overflow: hidden;
   display: flex;
   justify-content: center;
+  align-items: center;
 }
 
 .sea-chart-pivot-table .pivot-table-header-summary-columns-container > div,

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

@@ -122,9 +122,10 @@ class PivotTableDisplayName extends React.Component {
             } = this.props;
             const {
               original_name,
-              name
+              name,
+              original_key
             } = rowData;
-            const newValue = original_name || name;
+            const newValue = original_name || name || original_key;
             const options = getColumnOptions(column);
             const validValue = Array.isArray(newValue) && newValue.length !== 0 ? newValue : [newValue];
             displayName = /*#__PURE__*/React.createElement("div", {

package/dist/view/wrapper/trend.js

@@ -76,10 +76,10 @@ class Trend extends Component {
         previous
       } = data || {};
       let color = '#fa5757',
-        icon = '\u2193';
+        icon = 'dtable-icon-down1';
       if (type === 'up') {
         color = '#34aa95';
-        icon = '\u2191';
+        icon = 'dtable-icon-up1';
       }
       if (labelFontSize <= 12) {
         return /*#__PURE__*/React.createElement("span", {
@@ -98,9 +98,11 @@ class Trend extends Component {
             backgroundColor: "".concat(color, "26"),
             textAlign: 'center',
             marginRight: '8px',
-            fontWeight: 'bold'
-          }
-        }, icon), /*#__PURE__*/React.createElement("span", {
+            fontWeight: 'bold',
+            fontSize: '10px'
+          },
+          className: "dtable-font ".concat(icon)
+        }), /*#__PURE__*/React.createElement("span", {
           style: {
             color: "".concat(color)
           }
@@ -132,9 +134,11 @@ class Trend extends Component {
           backgroundColor: "".concat(color, "26"),
           textAlign: 'center',
           marginRight: '8px',
-          fontWeight: 'bold'
-        }
-      }, " ", icon, " "), /*#__PURE__*/React.createElement("span", {
+          fontWeight: 'bold',
+          fontSize: '11px'
+        },
+        className: "dtable-font ".concat(icon)
+      }), /*#__PURE__*/React.createElement("span", {
         style: {
           color: color,
           marginRight: '0px'

package/package.json

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