sea-chart 1.1.115 → 1.1.117

package/dist/utils/cell-format-utils.js

@@ -1,6 +1,5 @@
 import dayjs from 'dayjs';
 import { CellType, COLLABORATOR_COLUMN_TYPES, FORMULA_RESULT_TYPE, getCollaboratorsName, getFormulaDisplayString, FORMULA_COLUMN_TYPES_MAP, getCellValueDisplayString } from 'dtable-utils';
-import ObjectUtils from './object-utils';
 export const getClientFormulaDisplayString = function (value, columnData) {
   let {
     collaborators = []
@@ -30,12 +29,15 @@ export const getClientLinkDisplayString = (links, columnData, _ref) => {
   if (!columnData || !Array.isArray(links) || links.length === 0) {
     return null;
   }
-
-  // eslint-disable-next-line
-  const formulaData = ObjectUtils.hasOwnProperty(columnData, 'result_type') ? columnData : {
-    ...columnData,
-    result_type: FORMULA_RESULT_TYPE.ARRAY
-  };
+  let formulaData = columnData;
+  const hasResultType = Object.prototype.hasOwnProperty.call(columnData, 'result_type');
+  if (!hasResultType) {
+    formulaData = {
+      ...columnData,
+      result_type: FORMULA_RESULT_TYPE.ARRAY,
+      array_type: 'text'
+    };
+  }
   const displayValue = links.map(link => link.display_value);
   return getClientFormulaDisplayString(displayValue, formulaData, {
     collaborators

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

@@ -762,6 +762,43 @@ BaseUtils.updateTableViewListItemNameAndColor = async (result, column, nameKey,
       };
       // for linked formula, need to call recursively, using it's result as the result of the promise
       resultPromise = _BaseUtils.updateTableViewListItemNameAndColor(result, linkedColumn, nameKey, colorKey, isScatterChart);
+    } else if (columnType === CellType.FORMULA) {
+      const {
+        result_type: resultType,
+        array_type: arrayType,
+        array_data: arrayData
+      } = columnData || {};
+      if (resultType === FORMULA_RESULT_TYPE.NUMBER) {
+        const valueNumber = parseFloat(name);
+        result[nameKey] = isNumber(valueNumber) ? getNumberDisplayString(valueNumber, columnData) : name;
+        isNameField && (result.original_name = name);
+      } else if (resultType === FORMULA_RESULT_TYPE.DATE || resultType === CellType.CTIME || resultType === CellType.MTIME) {
+        result[nameKey] = getFormulaDisplayString(name, columnData);
+        isNameField && (result.original_name = name);
+      } else if (arrayType && arrayData) {
+        const formulaArrayColumn = {
+          ...column,
+          type: arrayType,
+          data: arrayData
+        };
+        resultPromise = _BaseUtils.updateTableViewListItemNameAndColor(result, formulaArrayColumn, nameKey, colorKey, isScatterChart, isNameField);
+      } else if (Array.isArray(name)) {
+        result[nameKey] = name.map(item => {
+          if (isValidCollaboratorEmail(item)) {
+            const collaborator = getKnownCollaboratorByEmail(item);
+            return collaborator ? collaborator.name : item;
+          }
+          return item;
+        }).join(', ');
+        isNameField && (result.original_name = name.join(', '));
+      } else if (typeof name === 'string' && isValidCollaboratorEmail(name)) {
+        const collaborator = getKnownCollaboratorByEmail(name);
+        result[nameKey] = collaborator ? collaborator.name : name;
+        isNameField && (result.original_name = name);
+      } else {
+        result[nameKey] = getFormulaDisplayString(name, columnData);
+        isNameField && (result.original_name = name);
+      }
     }
     resolve(resultPromise);
   });

package/dist/utils/row-record-utils.js

@@ -1,7 +1,7 @@
 import _ButtonFormatter from "dtable-ui-component/lib/ButtonFormatter";
 import _RateFormatter from "dtable-ui-component/lib/RateFormatter";
 import React from 'react';
-import { CellType, FORMULA_RESULT_TYPE, getNumberDisplayString, getDateDisplayString, getCellValueStringResult, isNumber, isDateColumn, isValidLink, getColumnOptions } from 'dtable-utils';
+import { CellType, FORMULA_RESULT_TYPE, COLLABORATOR_COLUMN_TYPES, getNumberDisplayString, getDateDisplayString, getCellValueStringResult, isNumber, isValidLink, getColumnOptions } from 'dtable-utils';
 import dayjs from 'dayjs';
 import { isEqual } from 'lodash-es';
 import cellFormatterFactory from '../components/cell-factory/cell-formatter-factory';
@@ -517,11 +517,21 @@ const getFilterByColumnTypeForPivot = (columnKey, columns, value, rows) => {
   }
   let type = column.type;
   const columnType = column.type;
-  if (columnType === CellType.FORMULA) {
-    type = column.data.result_type;
+  const {
+    result_type,
+    array_type
+  } = column.data || {};
+
+  // get the actual type for formula columns
+  if (type === CellType.FORMULA) {
+    if (result_type === FORMULA_RESULT_TYPE.ARRAY && array_type) {
+      type = array_type;
+    } else {
+      type = result_type;
+    }
   }
-  if (columnType === CellType.LINK_FORMULA) {
-    type = column.data.array_type;
+  if (type === CellType.LINK_FORMULA) {
+    type = array_type;
     // extract display_value from link formula column value
     if (Array.isArray(value) && value.length > 0) {
       value = value[0];
@@ -531,9 +541,9 @@ const getFilterByColumnTypeForPivot = (columnKey, columns, value, rows) => {
   // handle link column based on array_type
   if (columnType === CellType.LINK) {
     var _column$data, _value$;
-    const arrayType = (_column$data = column.data) === null || _column$data === void 0 ? void 0 : _column$data.array_type;
-    if (arrayType) {
-      type = arrayType;
+    const linkArrayType = (_column$data = column.data) === null || _column$data === void 0 ? void 0 : _column$data.array_type;
+    if (linkArrayType) {
+      type = linkArrayType;
     }
     // extract display_value from link column value
     if (Array.isArray(value) && value.length > 0 && ((_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.display_value) !== undefined) {
@@ -547,19 +557,24 @@ const getFilterByColumnTypeForPivot = (columnKey, columns, value, rows) => {
   if (typeof value === 'string') {
     value = value.trim();
   }
+
+  // handle collaborator type for formula/link_formula columns
+  const isFormulaCollaborator = (columnType === CellType.FORMULA || columnType === CellType.LINK_FORMULA) && result_type === FORMULA_RESULT_TYPE.ARRAY && COLLABORATOR_COLUMN_TYPES.includes(array_type);
   if (USE_OPTION_ID_CELL_TYPES.includes(column.type)) {
     const options = getColumnOptions(column);
     // name may contains spaces
     // value maybe id or name, find option by name or id
     const selectedOption = options.find(o => o.name.trim() === value || o.id === value);
     filter['filter_term'] = selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.id;
+  } else if (isFormulaCollaborator) {
+    filter['filter_term'] = Array.isArray(value) ? value : [value];
   } else {
     // value may contains spaces
     filter['filter_term'] = value;
   }
-
-  // link_formula and link use is
-  if ([CellType.LINK_FORMULA, CellType.LINK].includes(columnType)) {
+  if (isFormulaCollaborator) {
+    filter['filter_predicate'] = filterPredicateMap[CellType.COLLABORATOR];
+  } else if ([CellType.LINK_FORMULA, CellType.LINK].includes(columnType)) {
     filter['filter_predicate'] = filterPredicateMap[columnType];
   } else {
     filter['filter_predicate'] = filterPredicateMap[type];
@@ -582,13 +597,23 @@ const getFilterByColumnType = (columnKey, columns, rows, sqlColumnKey) => {
   let value;
   let type = column.type;
   let columnType = column.type;
+  const {
+    result_type,
+    array_type
+  } = column.data || {};
   const correctRow = rows.find(r => sqlColumnKey in r);
   value = correctRow && correctRow[sqlColumnKey];
-  if (columnType === CellType.FORMULA) {
-    type = column.data.result_type;
+
+  // get the actual type for formula columns
+  if (type === CellType.FORMULA) {
+    if (result_type === FORMULA_RESULT_TYPE.ARRAY && array_type) {
+      type = array_type;
+    } else {
+      type = result_type;
+    }
   }
-  if (columnType === CellType.LINK_FORMULA) {
-    type = column.data.array_type;
+  if (type === CellType.LINK_FORMULA) {
+    type = array_type;
     // extract display_value from link formula column value
     if (Array.isArray(value) && value.length > 0) {
       value = value[0];
@@ -598,9 +623,9 @@ const getFilterByColumnType = (columnKey, columns, rows, sqlColumnKey) => {
   // handle link column based on array_type
   if (columnType === CellType.LINK) {
     var _column$data2, _value$2;
-    const arrayType = (_column$data2 = column.data) === null || _column$data2 === void 0 ? void 0 : _column$data2.array_type;
-    if (arrayType) {
-      type = arrayType;
+    const linkArrayType = (_column$data2 = column.data) === null || _column$data2 === void 0 ? void 0 : _column$data2.array_type;
+    if (linkArrayType) {
+      type = linkArrayType;
     }
     // extract display_value from link column value
     if (Array.isArray(value) && value.length > 0 && ((_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.display_value) !== undefined) {
@@ -614,14 +639,21 @@ const getFilterByColumnType = (columnKey, columns, rows, sqlColumnKey) => {
     return filter;
   }
 
+  // handle collaborator type for formula/link_formula columns
+  const isFormulaCollaborator = (columnType === CellType.FORMULA || columnType === CellType.LINK_FORMULA) && result_type === FORMULA_RESULT_TYPE.ARRAY && COLLABORATOR_COLUMN_TYPES.includes(array_type);
+
   // value may contains spaces
   if (typeof value === 'string') {
     value = value.trim();
   }
-  filter['filter_term'] = value;
-
-  // link_formula and link use is
-  if ([CellType.LINK_FORMULA, CellType.LINK].includes(columnType)) {
+  if (isFormulaCollaborator) {
+    filter['filter_term'] = Array.isArray(value) ? value : [value];
+  } else {
+    filter['filter_term'] = value;
+  }
+  if (isFormulaCollaborator) {
+    filter['filter_predicate'] = filterPredicateMap[CellType.COLLABORATOR];
+  } else if ([CellType.LINK_FORMULA, CellType.LINK].includes(columnType)) {
     filter['filter_predicate'] = filterPredicateMap[columnType];
   } else {
     filter['filter_predicate'] = filterPredicateMap[type];

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "sea-chart",
-  "version": "1.1.115",
+  "version": "1.1.117",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
     "@antv/g2": "4.1.46",
+    "@antv/util": "^3.3.2",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",