sea-chart 1.1.13 → 1.1.15

package/dist/components/statistic-record-dialog/index.js

@@ -50,6 +50,9 @@ class StatisticRecordDialog extends React.Component {
           const detailFilterConditions = {
             filters: getFilterConditions(statisticRecord, chart, this.table.columns)
           };
+          if ((statisticRecord === null || statisticRecord === void 0 ? void 0 : statisticRecord.name) === '_Others') {
+            detailFilterConditions.filter_conjunction = 'Or';
+          }
           context.api.customQueryRows(currentElementId, detailFilterConditions).then(res => {
             const {
               results: rows

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

@@ -10,16 +10,17 @@ import ObjectUtils from '../object-utils';
 import intl from '../../intl';
 import context from '../../context';
 import { isValidCollaboratorEmail } from '../collaborator';
+import { formatRowTotal } from '../index';
 export function findIfColumnDataIsArray(column) {
   // link-formula may also be an array type column
   let isGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[column.type];
   if (column.type === CellType.LINK_FORMULA) {
     const {
-      array_type,
       result_type
     } = column.data || {};
-    // collaborator, creator or last-modifier
-    if (COLLABORATOR_COLUMN_TYPES.includes(array_type) && result_type === 'array') {
+    // linked date need to be handled separately, cause it has dateGranularity
+    // it's no longer an array after "getLabelFromDB" processing
+    if (result_type === 'array' && column.data.array_type !== 'date') {
       isGroupbyColumnDataAsAnArray = true;
     }
   }
@@ -307,7 +308,7 @@ BaseUtils.getSummaryValueDisplayString = function (summaryColumn, summaryValue)
     // The date returned by db carries T and Z, so that there is a time difference in data formatting
     return getDateDisplayString(summaryValue.replace(/[T|Z]/g, ' '), format);
   }
-  if (typeof summaryValue !== 'number') return summaryValue;
+  if (typeof summaryValue !== 'number') return formatRowTotal(summaryValue);
   return getNumberDisplayString(summaryValue, data || DEFAULT_NUMBER_FORMAT_OBJECT);
 };
 BaseUtils.isNumericSummaryColumn = summaryColumn => {
@@ -615,7 +616,7 @@ BaseUtils.formatPieChartData = (data, chart, tables, currentTheme, useColumnColo
 };
 // table
 // format SINGLE_SELECT, LAST_MODIFIER, CREATOR, COLLABORATOR, DATE, NUMBER
-BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorKey, isScatterChart) => {
+BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
   let {
     type: columnType,
     data: columnData
@@ -626,11 +627,13 @@ BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorK
     let selectedOption = getOption(options, name);
     let {
       name: optionName,
-      color: optionColor
+      color: optionColor,
+      id
     } = selectedOption || {};
     if (selectedOption) {
       result[nameKey] = optionName;
       result[colorKey] = optionColor;
+      isNameField && (result.original_name = id);
     } else {
       result[colorKey] = '#dbdbdb';
     }
@@ -645,6 +648,7 @@ BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorK
         return;
       }
       result[nameKey] = users.map(user => user.name).join(', ');
+      isNameField && (result.original_name = users.map(user => user.email).join(', '));
     });
   } else if (columnType === CellType.CREATOR || columnType === CellType.LAST_MODIFIER) {
     // move collaborators logic to collaborator-utils.js
@@ -658,10 +662,12 @@ BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorK
         return;
       }
       result[nameKey] = users.map(user => user.name).join(', ');
+      isNameField && (result.original_name = users.map(user => user.email).join(', '));
     });
   } else if (columnType === CellType.NUMBER) {
     let valueNumber = parseFloat(name);
     result[nameKey] = isNumber(valueNumber) ? getNumberDisplayString(valueNumber, columnData) : name;
+    isNameField && (result.original_name = name);
   } else if (columnType === CellType.DATE) {
     name = name + '';
     if (name && name.split('-').length === 3) {
@@ -679,11 +685,21 @@ BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorK
       let valueNumber = parseFloat(name);
       result[nameKey] = isNumber(valueNumber) ? getNumberDisplayString(valueNumber, columnData) : name;
     }
+    const {
+      array_data,
+      array_type
+    } = columnData;
+    const linkedColumn = {
+      ...column,
+      type: array_type,
+      data: array_data
+    };
+    return _BaseUtils.updateTableViewListItemNameAndColor(result, linkedColumn, nameKey, colorKey, isScatterChart);
   }
 };
-BaseUtils.updateTableViewList = (result, column, nameKey, colorKey, isScatterChart) => {
+BaseUtils.updateTableViewList = (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
   result.forEach(result => {
-    _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey, isScatterChart);
+    _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey, isScatterChart, isNameField);
   });
 };
 // sort chart

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

@@ -1,16 +1,15 @@
 var _SQLStatisticsUtils;
 import dayjs from 'dayjs';
-import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, DateUtils, COLLABORATOR_COLUMN_TYPES } from 'dtable-utils';
+import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, DateUtils } from 'dtable-utils';
 import { isObject } from 'lodash';
 import { cloneDeep } from 'lodash-es';
-import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, TABLE_DIMENSIONS, Y_AXIS_TYPE_PREFIX, STYLE_COLORS, TREND_TYPES } from '../../constants';
+import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, TABLE_DIMENSIONS, Y_AXIS_TYPE_PREFIX, STYLE_COLORS, TREND_TYPES, CHART_STYLE_COLORS } from '../../constants';
 import { chartColumn2SqlColumn, summaryMethodColumn2SqlColumn } from '../sql';
 import { getClientLinkDisplayString } from '../cell-format-utils';
 import { column2SqlColumn } from '../sql/column-2-sql-column';
 import { formatNumericValue, getFormattedValue, getSummaryResult } from '../column-utils';
 import { getCompareDate } from '../trend-utils';
 import intl from '../../intl';
-import { getUsers } from '../collaborator-utils';
 import BaseUtils, { findIfColumnDataIsArray } from './base-utils';
 class SQLStatisticsUtils {}
 _SQLStatisticsUtils = SQLStatisticsUtils;
@@ -30,14 +29,8 @@ SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivo
     case CellType.CTIME:
     case CellType.MTIME:
       {
-        if (!dateGranularity) {
-          return cellValue || null;
-        }
-        if (dateGranularity.toUpperCase() === 'QUARTER') {
-          // TODO: fix the unknown word 'QUARTAR'
-          return DateUtils.getDateByGranularity(cellValue, 'QUARTAR');
-        }
-        return DateUtils.getDateByGranularity(cellValue, dateGranularity);
+        // handled in sql query result
+        return cellValue;
       }
     case CellType.NUMBER:
       {
@@ -84,14 +77,13 @@ SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivo
           return DateUtils.getDateByGranularity(validValue, dateGranularity);
         }
 
-        // collaborator, creator or last-modifier
-        if (COLLABORATOR_COLUMN_TYPES.includes(array_type) && result_type === 'array' && !isPivot) {
-          const users = await getUsers(validValue);
-          return users.map(user => user.name);
-        } else if (result_type === 'array' && isPivot) {
+        // handles mutiple select
+        if (result_type === 'array') {
           return cellValue;
         }
-        if (!validValue && validValue !== 0) return null;
+        if (!validValue && validValue !== 0) {
+          return null;
+        }
         return validValue;
       }
     case CellType.LINK:
@@ -371,14 +363,32 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = async (chart, sqlRows
     for (const row of newSqlRows) {
       const total = row[sqlSummaryColumnKey] || 0;
       allTotal += total;
+      const name = await _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, chart.config, true);
       pivot_rows.push({
-        name: await _SQLStatisticsUtils.getGroupLabelFromDB(row[sqlGroupbyColumnKey], groupbyColumn, chart.config, true),
+        name,
         rows: [],
         total: {
           total
         }
       });
     }
+    if (groupbyColumn.type === CellType.LINK_FORMULA && groupbyColumn.data.array_type === 'date') {
+      pivot_rows = pivot_rows.reduce((acc, item) => {
+        const {
+          name,
+          total: {
+            total
+          }
+        } = item;
+        const index = acc.findIndex(r => r.name === name);
+        if (index < 0) {
+          acc.push(item);
+        } else {
+          acc[index].total.total += total;
+        }
+        return acc;
+      }, []);
+    }
     BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name', true);
     return {
       pivot_columns,
@@ -432,6 +442,23 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = async (chart, sqlRows
       total: rowTotal
     });
   }
+  if (groupbyColumn.type === CellType.LINK_FORMULA && groupbyColumn.data.array_type === 'date') {
+    pivot_rows = pivot_rows.reduce((acc, item) => {
+      const {
+        name,
+        total: {
+          total
+        }
+      } = item;
+      const index = acc.findIndex(r => r.name === name);
+      if (index < 0) {
+        acc.push(item);
+      } else {
+        acc[index].total.total += total;
+      }
+      return acc;
+    }, []);
+  }
   if (pivot_columns.length < 2) {
     const pivot_column = pivot_columns[0];
     const {
@@ -486,14 +513,15 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = async (chart, sqlRows
   let isRowGroupbyColumnDataAsAnArray, isGroupbyColumnDataAsAnArray;
 
   // Group by column
-  if (isGroupByColumnLinkFormula) {
+  // linked date need to be handled separately, cause it has dateGranularity and no longer an array after processed by "getLabelFromDB"
+  if (isGroupByColumnLinkFormula && groupbyColumn.data.array_type !== 'date') {
     isGroupbyColumnDataAsAnArray = true;
   } else {
     isGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[groupbyColumn.type];
   }
 
   // column group by column
-  if (isColumnGroupByColumnLinkFormula) {
+  if (isColumnGroupByColumnLinkFormula && groupbyColumn.data.array_type !== 'date') {
     isRowGroupbyColumnDataAsAnArray = true;
   } else {
     isRowGroupbyColumnDataAsAnArray = !!MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP[columnGroupbyColumn.type];
@@ -653,7 +681,8 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = async (chart, sqlRows, chart
             itemRow.value = itemRow.value + summaryValue;
           }
         } else {
-          key.forEach(item => {
+          // in case of multiple values, The index of the raw value array correspond one-to-one with the index of the formatted array
+          key.forEach((item, index) => {
             let itemIdx = result.findIndex(v => v.name === item);
             if (itemIdx < 0) {
               result.push({
@@ -691,7 +720,7 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = async (chart, sqlRows, chart
     }
   }
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
-  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color');
+  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
   if (SUPPORT_DATA_SORT_CHART_TYPES.includes(type) && sort_type) {
     BaseUtils.sortChartData(result, sort_type);
     return result;
@@ -781,8 +810,7 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = async (chart, sqlRows, char
       names.forEach(name => {
         takenApart.push({
           ...item,
-          name,
-          original_name: name
+          name
         });
       });
     });
@@ -804,7 +832,7 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = async (chart, sqlRows, char
     result = assembled;
   }
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
-  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '');
+  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
   return result;
 };
 SQLStatisticsUtils.compareSQLResult2Javascript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -1114,7 +1142,7 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
       }
     }
   }
-  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '');
+  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
   return result;
 };
@@ -1218,8 +1246,8 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = async (chart,
     }
   }
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
-  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color');
-  BaseUtils.updateTableViewList(result, columnGroupbyColumn, 'group_name', 'group_color');
+  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
+  BaseUtils.updateTableViewList(result, columnGroupbyColumn, 'group_name', 'group_color', false, false);
   return result;
 };
 SQLStatisticsUtils.groupingChartSQLResult2JavaScript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -1274,7 +1302,7 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = async (chart, sqlRows, ch
       }
     }
     BaseUtils.sortCharts(result, groupbyColumn, 'name');
-    BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color');
+    BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
     return result;
   }
   if (!columnGroupbyColumn) {
@@ -1374,14 +1402,16 @@ SQLStatisticsUtils.mirrorMapChartSQLResult2JavaScript = async (chart, sqlRows, c
           value: equal2GroupData0 ? value : 0,
           formatted_value: equal2GroupData0 ? formattedValue : 0,
           group_name: groupData[0].name,
-          color: groupData[0].color
+          color: groupData[0].color,
+          rows: [item]
         }, {
           name: label,
           original_name: item[column_key],
           value: equal2GroupData1 ? value : 0,
           formatted_value: equal2GroupData1 ? formattedValue : 0,
           group_name: groupData[1].name,
-          color: groupData[1].color
+          color: groupData[1].color,
+          rows: [item]
         });
       }
     }
@@ -1625,48 +1655,94 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables)
     target_column,
     column_groupby_column
   } = sqlColumns;
-
-  // format the fetched value
-  BaseUtils.updateTableViewList(sqlRows, name_column, name_column.key, 'color');
-  if (sqlColumnGroupByColumnKey) BaseUtils.updateTableViewList(sqlRows, column_groupby_column, sqlColumnGroupByColumnKey, 'color');
   const res = [];
   let summedSqlRows;
+  const nameColumnDataAsAnArray = findIfColumnDataIsArray(name_column);
   if (!isGroup) {
-    const sumSqlRows = sqlRows.reduce((acc, row) => {
-      const nameValue = _SQLStatisticsUtils._get_completeness_name(row, name_column);
-      if (!acc[nameValue]) {
-        acc[nameValue] = row;
-      } else {
-        const accRow = acc[nameValue];
-        Object.keys(row).forEach(key => {
-          if (key === name_column.key) return;
-          accRow[key] = accRow[key] + row[key];
+    if (nameColumnDataAsAnArray) {
+      const sumSqlRows = sqlRows.reduce((acc, row) => {
+        const names = row[name_column.key];
+        names.forEach(name => {
+          if (!acc[name]) {
+            row[name_column.key] = name;
+            acc[name] = row;
+          } else {
+            const accRow = acc[name];
+            Object.keys(row).forEach(key => {
+              if (key === completed_column.key || key === target_column.key) {
+                accRow[key] = accRow[key] + row[key];
+              }
+            });
+          }
         });
-      }
-      return acc;
-    }, {});
-    summedSqlRows = Object.values(sumSqlRows);
+        return acc;
+      }, {});
+      summedSqlRows = Object.values(sumSqlRows);
+    } else {
+      const sumSqlRows = sqlRows.reduce((acc, row) => {
+        const nameValue = row[name_column.key];
+        if (!acc[nameValue]) {
+          acc[nameValue] = row;
+        } else {
+          const accRow = acc[nameValue];
+          Object.keys(row).forEach(key => {
+            if (key === completed_column.key || key === target_column.key) {
+              accRow[key] = accRow[key] + row[key];
+            }
+          });
+        }
+        return acc;
+      }, {});
+      summedSqlRows = Object.values(sumSqlRows);
+    }
   } else {
-    const sumSqlRowsWithGroupBy = sqlRows.reduce((acc, row) => {
-      const nameValue = _SQLStatisticsUtils._get_completeness_name(row, name_column);
-      const groupby = row[sqlColumnGroupByColumnKey];
-      const key = "".concat(nameValue, "_").concat(groupby);
-      if (!acc[key]) {
-        acc[key] = row;
-      } else {
-        const accRow = acc[key];
-        Object.keys(row).forEach(key => {
-          if (key === completed_column.key || key === target_column.key) {
-            accRow[key] = accRow[key] + row[key];
+    if (nameColumnDataAsAnArray) {
+      const sumSqlRows = sqlRows.reduce((acc, row) => {
+        const names = row[name_column.key];
+        const groupby = row[sqlColumnGroupByColumnKey];
+        names.forEach(name => {
+          const key = "".concat(name, "_").concat(groupby);
+          if (!acc[key]) {
+            row[name_column.key] = name;
+            acc[key] = row;
+          } else {
+            const accRow = acc[key];
+            Object.keys(row).forEach(k => {
+              if (key === completed_column.key || key === target_column.key) {
+                accRow[key] = accRow[key] + row[key];
+              }
+            });
           }
         });
-      }
-      return acc;
-    }, {});
-    summedSqlRows = Object.values(sumSqlRowsWithGroupBy);
+        return acc;
+      }, {});
+      summedSqlRows = Object.values(sumSqlRows);
+    } else {
+      const sumSqlRows = sqlRows.reduce((acc, row) => {
+        const nameValue = row[name_column.key];
+        const groupby = row[sqlColumnGroupByColumnKey];
+        const key = "".concat(nameValue, "_").concat(groupby);
+        if (!acc[key]) {
+          acc[key] = row;
+        } else {
+          const accRow = acc[key];
+          Object.keys(row).forEach(key => {
+            if (key === completed_column.key || key === target_column.key) {
+              accRow[key] = accRow[key] + row[key];
+            }
+          });
+        }
+        return acc;
+      }, {});
+      summedSqlRows = Object.values(sumSqlRows);
+    }
   }
+
+  // format the fetched value
+  BaseUtils.updateTableViewList(sqlRows, name_column, name_column.key, 'color', false, true);
+  if (sqlColumnGroupByColumnKey) BaseUtils.updateTableViewList(sqlRows, column_groupby_column, sqlColumnGroupByColumnKey, 'color', false, false);
   summedSqlRows.forEach(row => {
-    const nameValue = _SQLStatisticsUtils._get_completeness_name(row, name_column);
+    const nameValue = row[name_column.key];
     let targetValue;
     let completedValue;
     let groupby;
@@ -1686,15 +1762,20 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables)
     } else {
       completedRate = (completedValue / targetValue * 100).toFixed(0);
     }
+    const {
+      original_name
+    } = row;
     res.push({
       name: nameValue,
+      original_name,
       group_name: 'completed',
       groupby,
-      color: row.color,
+      color: row.color || CHART_STYLE_COLORS[0],
       value: completedValue
     });
     res.push({
       name: nameValue,
+      original_name,
       group_name: 'rest',
       value: Math.max(targetValue - completedValue, 0),
       groupby,
@@ -1727,9 +1808,9 @@ SQLStatisticsUtils.scatterSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, c
   // format sql rows
   const originalSqlRows = cloneDeep(sqlRows);
   const isScatter = true;
-  BaseUtils.updateTableViewList(sqlRows, groupbyColumn, groupbyColumn.key, 'color', isScatter);
-  BaseUtils.updateTableViewList(sqlRows, summaryColumn, summaryColumn.key, 'color', isScatter);
-  if (sqlColumnGroupbyColumnKey) BaseUtils.updateTableViewList(sqlRows, columnGroupbyColumn, sqlColumnGroupbyColumnKey, 'color');
+  BaseUtils.updateTableViewList(sqlRows, groupbyColumn, groupbyColumn.key, 'color', isScatter, true);
+  BaseUtils.updateTableViewList(sqlRows, summaryColumn, summaryColumn.key, 'color', isScatter, true);
+  if (sqlColumnGroupbyColumnKey) BaseUtils.updateTableViewList(sqlRows, columnGroupbyColumn, sqlColumnGroupbyColumnKey, 'color', isScatter, false);
   const res = [];
   sqlRows.forEach((row, index) => {
     const xValue = row[sqlXColumnKey] ? '' + row[sqlXColumnKey] : intl.get('Empty');
@@ -1744,6 +1825,7 @@ SQLStatisticsUtils.scatterSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, c
       value: yValue,
       groupby,
       original_value: {
+        rows: [originalSqlRow],
         name: originalXValue,
         value: originalYValue,
         groupby: originalGroupby

package/dist/utils/index.js

@@ -14,6 +14,13 @@ export { getDateColumnFormat, isCheckboxColumn, getColumnByKey, isStatisticMapCo
 export { generatorKey } from './key-generator';
 export { translateCalendar } from './date-translate';
 export { isFunction } from './common-utils';
+export function formatRowTotal(rowTotal) {
+  if (rowTotal % 1 !== 0) {
+    return rowTotal.toFixed(2);
+  } else {
+    return rowTotal;
+  }
+}
 
 /**
  * return a deep cloned list sorted by the given list

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

@@ -12,7 +12,7 @@ import Highlighter from '../components/highlighter/highlighter';
 import DigitalSignUtils from '../utils/digital-sign-utils';
 import { getColumnByKey } from '../utils/column-utils';
 import context from '../context';
-import { xAxisMap, groupAxisMap } from '../constants';
+import { xAxisMap, groupAxisMap, COMPLTETELESS_CHART_TYPES } from '../constants';
 export const UNSHOW_COLUMN_TYPE = [CellType.LINK, CellType.LONG_TEXT, CellType.FORMULA, CellType.LINK_FORMULA];
 export const getCellRecordWidth = column => {
   let {
@@ -502,19 +502,41 @@ const filterPredicateMap = {
   [CellType.BOOL]: 'is'
 };
 const USE_OPTION_ID_CELL_TYPES = [CellType.SINGLE_SELECT, CellType.MULTIPLE_SELECT];
-const getFilterByColumnType = (columnKey, columns, value) => {
+const getFilterByColumnType = (columnKey, columns, value, rows) => {
+  if (!rows) rows = [];
   const filter = {
     column_key: columnKey || ''
   };
   const column = getColumnByKey(columnKey, columns);
-  if (column && (isDateColumn(column) || (column === null || column === void 0 ? void 0 : column.type) === CellType.GEOLOCATION)) {
+  if (!column) {
+    return filter;
+  }
+  let type = column.type;
+  if (type === CellType.LINK_FORMULA) {
+    type = column.data.array_type;
+    const correctRow = rows.find(r => columnKey in r);
+    value = correctRow && correctRow[columnKey];
+    Array.isArray(value) && (value = value[0]);
+  }
+  if (type === CellType.FORMULA) {
+    type = column.data.result_type;
+    const correctRow = rows.find(r => columnKey in r);
+    value = correctRow && correctRow[columnKey];
+  }
+
+  // pie chart and ring chart
+  if (value === '_Others') {
+    const correctRow = rows.find(r => columnKey in r);
+    value = correctRow && correctRow[columnKey];
+  }
+  if (column && [CellType.GEOLOCATION, CellType.DATE].includes(type)) {
     filter['value'] = value;
     return filter;
   }
   if (typeof value === 'string') {
     value = value.trim();
   }
-  if (USE_OPTION_ID_CELL_TYPES.includes(column === null || column === void 0 ? void 0 : column.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
@@ -524,12 +546,13 @@ const getFilterByColumnType = (columnKey, columns, value) => {
     // value may contains spaces
     filter['filter_term'] = value;
   }
-  filter['filter_predicate'] = filterPredicateMap[column === null || column === void 0 ? void 0 : column.type];
+  filter['filter_predicate'] = filterPredicateMap[type];
   return filter;
 };
 export const getFilterConditions = function (statisticRecord, chart) {
   let columns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   const {
+    original_name = '',
     name = '',
     group_name = '',
     groupby = '',
@@ -559,18 +582,28 @@ export const getFilterConditions = function (statisticRecord, chart) {
       }
     });
     if (xValueList.length === 1) {
-      const columnFilter = getFilterByColumnType(config[columnKey], columns, xValueList[0]);
+      const columnFilter = getFilterByColumnType(config[columnKey], columns, xValueList[0], rows);
       filters.push(columnFilter);
     }
     if (yValueList.length === 1) {
-      const columnFilter = getFilterByColumnType(config[groupColumnKey], columns, yValueList[0]);
+      const columnFilter = getFilterByColumnType(config[groupColumnKey], columns, yValueList[0], rows);
       filters.push(columnFilter);
     }
   } else {
-    const columnFilter = getFilterByColumnType(config[columnKey], columns, name);
-    filters.push(columnFilter);
+    // pie and ring chart
+    if (name === '_Others') {
+      const columnFilters = rows.map(r => getFilterByColumnType(config[columnKey], columns, name, [r]));
+      filters.push(...columnFilters);
+    } else {
+      const columnFilter = getFilterByColumnType(config[columnKey], columns, original_name || name, rows);
+      filters.push(columnFilter);
+    }
     if (groupColumnKey && config[groupColumnKey]) {
-      const groupColumnFilter = getFilterByColumnType(config[groupColumnKey], columns, group_name || groupby);
+      let groupNameFiled = group_name || groupby;
+      if (COMPLTETELESS_CHART_TYPES.includes(type)) {
+        groupNameFiled = groupby;
+      }
+      const groupColumnFilter = getFilterByColumnType(config[groupColumnKey], columns, groupNameFiled);
       filters.push(groupColumnFilter);
     }
   }

package/dist/view/wrapper/completeness.js

@@ -152,7 +152,8 @@ export default function Completeness(_ref) {
     return () => {
       currentChart.chart.destroy();
     };
-  }, [chart, chartColorTheme, data, globalTheme, summaryColumn, tables, toggleRecords]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [chart, chartColorTheme, data, globalTheme, summaryColumn, tables]);
   return /*#__PURE__*/React.createElement("div", {
     className: classnames('sea-chart-completeness-chart sea-chart-container', {
       'show-x-axis-label': (_chartRef$current = chartRef.current) === null || _chartRef$current === void 0 ? void 0 : _chartRef$current.isShowXAxisLabel(chart),

package/dist/view/wrapper/pie.js

@@ -142,7 +142,6 @@ class Pie extends ChartComponent {
         globalTheme
       } = this.props;
       const theme = CHART_THEME_COLOR[globalTheme];
-      const item = evt.data.data;
       this.currentChart.label('name*value*percent', (name, value, percent) => {
         let displayValue;
         displayValue = BaseUtils.getSummaryValueDisplayString(summaryColumn, value, summaryMethod);

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

@@ -8,6 +8,7 @@ class Table extends PureComponent {
   constructor() {
     super(...arguments);
     this.toggleRecords = (cell, selectedCell) => {
+      if (!cell.rows || !cell.rows.length) return;
       cell && (cell.isPivot = true);
       this.props.toggleRecords(cell, selectedCell);
     };

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

@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { isNumber } from 'dtable-utils';
-import { BaseUtils } from '../../../utils';
+import { BaseUtils, formatRowTotal } from '../../../utils';
 import intl from '../../../intl';
 import { CHART_THEME_COLOR } from '../../../constants';
 import PivotTableDisplayName from './pivot-table-display-name';
@@ -195,8 +195,8 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
           })
           // onClick={() => this.toggleRecords({ rows, name: rowItem?.name, total: rowTotal }, { rowIdx })}
           ,
-          title: rowTotal ? rowTotal : 0
-        }, rowTotal ? rowTotal : /*#__PURE__*/React.createElement("i", null, "0"), /*#__PURE__*/React.createElement("span", {
+          title: rowTotal ? formatRowTotal(rowTotal) : 0
+        }, rowTotal ? formatRowTotal(rowTotal) : /*#__PURE__*/React.createElement("i", null, "0"), /*#__PURE__*/React.createElement("span", {
           className: classnames({
             'selected-pivot-cell-border': isSelectedTotalCell
           })
@@ -206,7 +206,6 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
           'selected-pivot-cell-left': isSelectRowTotalCellRight
         })
       }, /*#__PURE__*/React.createElement("div", null, intl.get('Total'))), Array.isArray(pivot_columns) && pivot_columns.map((c, index) => {
-        const pivotColumnCell = pivotColumnCells[index];
         const pivotColumnTotal = pivot_columns_total[c.key];
         const column = chartTableColumns.find(column => column.key === c.key);
         const totalDisplayValue = BaseUtils.getSummaryValueDisplayString(column, pivotColumnTotal, this.summaryColumnsMethodMap[c.key]);
@@ -235,8 +234,8 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
         })
         // onClick={() => this.toggleRecords({ rows: lastRows, total: lastRowTotal }, { rowIdx: pivot_rows.length, cellIdx: pivot_columns?.length })}
         ,
-        title: lastRowTotal
-      }, BaseUtils.isValidValue(lastRowTotal, display_empty) ? lastRowTotal : /*#__PURE__*/React.createElement("i", null))));
+        title: formatRowTotal(lastRowTotal)
+      }, BaseUtils.isValidValue(lastRowTotal, display_empty) ? formatRowTotal(lastRowTotal) : /*#__PURE__*/React.createElement("i", null))));
     };
     this.init(_props);
   }

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

@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { CellType, isNumber } from 'dtable-utils';
-import { BaseUtils } from '../../../utils';
+import { BaseUtils, formatRowTotal } from '../../../utils';
 import intl from '../../../intl';
 import { CHART_SUMMARY_TYPE, CHART_THEME_COLOR } from '../../../constants';
 import PivotTableDisplayName from './pivot-table-display-name';
@@ -298,7 +298,7 @@ class TwoDimensionTable extends PureComponent {
             cellIdx: cells.length
           }),
           title: rowTotal
-        }, BaseUtils.isValidValue(rowTotal, display_empty) ? rowTotal : /*#__PURE__*/React.createElement("i", null), /*#__PURE__*/React.createElement("span", {
+        }, BaseUtils.isValidValue(rowTotal, display_empty) ? formatRowTotal(rowTotal) : /*#__PURE__*/React.createElement("i", null), /*#__PURE__*/React.createElement("span", {
           className: classnames({
             'selected-pivot-cell-border': isSelectedTotalCell
           })

package/package.json

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