sea-chart 1.1.15 → 1.1.16

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

@@ -48,9 +48,12 @@ class StatisticRecordDialog extends React.Component {
         var _context$api, _context$api2;
         if ((_context$api = context.api) === null || _context$api === void 0 ? void 0 : _context$api.customQueryRows) {
           const detailFilterConditions = {
-            filters: getFilterConditions(statisticRecord, chart, this.table.columns)
+            filters: getFilterConditions(statisticRecord, chart, this.table)
           };
-          if ((statisticRecord === null || statisticRecord === void 0 ? void 0 : statisticRecord.name) === '_Others') {
+
+          // if more then 2 filters, use 'Or' conjunction to get them all
+          // if the statistic record is '_Others', use 'Or' conjunction to get them all
+          if ((detailFilterConditions === null || detailFilterConditions === void 0 ? void 0 : detailFilterConditions.filters.length) > 2 || statisticRecord.name === '_Others') {
             detailFilterConditions.filter_conjunction = 'Or';
           }
           context.api.customQueryRows(currentElementId, detailFilterConditions).then(res => {

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

@@ -12,7 +12,8 @@ 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, COMPLTETELESS_CHART_TYPES } from '../constants';
+import { xAxisMap, groupAxisMap } from '../constants';
+import { chartColumn2SqlColumn } from './sql';
 export const UNSHOW_COLUMN_TYPE = [CellType.LINK, CellType.LONG_TEXT, CellType.FORMULA, CellType.LINK_FORMULA];
 export const getCellRecordWidth = column => {
   let {
@@ -499,10 +500,11 @@ const filterPredicateMap = {
   [CellType.EMAIL]: 'is',
   [CellType.URL]: 'is',
   [CellType.STRING]: 'is',
-  [CellType.BOOL]: 'is'
+  [CellType.BOOL]: 'is',
+  [CellType.LINK_FORMULA]: 'has_any_of'
 };
 const USE_OPTION_ID_CELL_TYPES = [CellType.SINGLE_SELECT, CellType.MULTIPLE_SELECT];
-const getFilterByColumnType = (columnKey, columns, value, rows) => {
+const getFilterByColumnTypeForPivot = (columnKey, columns, value, rows) => {
   if (!rows) rows = [];
   const filter = {
     column_key: columnKey || ''
@@ -512,24 +514,14 @@ const getFilterByColumnType = (columnKey, columns, value, rows) => {
     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 (type === CellType.LINK_FORMULA) {
+    type = column.data.array_type;
+    Array.isArray(value) && (value = value[0]);
   }
-  if (column && [CellType.GEOLOCATION, CellType.DATE].includes(type)) {
+  if (column && [CellType.GEOLOCATION, CellType.DATE, CellType.MTIME, CellType.CTIME].includes(type)) {
     filter['value'] = value;
     return filter;
   }
@@ -549,13 +541,55 @@ const getFilterByColumnType = (columnKey, columns, value, rows) => {
   filter['filter_predicate'] = filterPredicateMap[type];
   return filter;
 };
-export const getFilterConditions = function (statisticRecord, chart) {
-  let columns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+const getFilterByColumnType = (columnKey, columns, rows, sqlColumnKey) => {
+  if (!rows) rows = [];
+  const filter = {
+    column_key: columnKey || ''
+  };
+
+  // need column to get type
+  const column = getColumnByKey(columnKey, columns);
+  if (!column) {
+    return filter;
+  }
+
+  // normal case
+  let value;
+  let type = column.type;
+  let columnType = column.type;
+  const correctRow = rows.find(r => sqlColumnKey in r);
+  value = correctRow && correctRow[sqlColumnKey];
+  if (type === CellType.FORMULA) {
+    type = column.data.result_type;
+  }
+  if (type === CellType.LINK_FORMULA) {
+    type = column.data.array_type;
+  }
+  if (column && [CellType.GEOLOCATION, CellType.DATE, CellType.MTIME, CellType.CTIME].includes(type)) {
+    // link_formula result is an array, but can't pass the value directly as an array here
+    if (Array.isArray(value)) value = value[0];
+    filter['value'] = value;
+    return filter;
+  }
+
+  // value may contains spaces
+  if (typeof value === 'string') {
+    value = value.trim();
+  }
+  filter['filter_term'] = value;
+
+  // link_formula use has_any_of
+  if (columnType === CellType.LINK_FORMULA) {
+    filter['filter_predicate'] = filterPredicateMap[columnType];
+  } else {
+    filter['filter_predicate'] = filterPredicateMap[type];
+  }
+  return filter;
+};
+export const getFilterConditions = (statisticRecord, chart, table) => {
+  const columns = table.columns || [];
   const {
-    original_name = '',
     name = '',
-    group_name = '',
-    groupby = '',
     rows,
     isPivot
   } = statisticRecord || {};
@@ -568,12 +602,17 @@ export const getFilterConditions = function (statisticRecord, chart) {
   const filters = [];
   const columnKey = xAxisMap[type];
   const groupColumnKey = groupAxisMap[type];
+  const chartSQLMap = chartColumn2SqlColumn(chart, table);
+  const {
+    sqlColumnGroupbyColumnKey,
+    sqlGroupbyColumnKey
+  } = chartSQLMap;
   if (isPivot && rows.length) {
     const xValueList = [];
     const yValueList = [];
     rows.forEach(r => {
-      const xValue = r[config[columnKey]];
-      const yValue = r[config[groupColumnKey]];
+      const xValue = r[sqlGroupbyColumnKey];
+      const yValue = r[sqlColumnGroupbyColumnKey];
       if (!xValueList.some(v => isEqual(v, xValue))) {
         xValueList.push(xValue);
       }
@@ -581,29 +620,24 @@ export const getFilterConditions = function (statisticRecord, chart) {
         yValueList.push(yValue);
       }
     });
-    if (xValueList.length === 1) {
-      const columnFilter = getFilterByColumnType(config[columnKey], columns, xValueList[0], rows);
+    xValueList.forEach(xValue => {
+      const columnFilter = getFilterByColumnTypeForPivot(config[columnKey], columns, xValue, rows);
       filters.push(columnFilter);
-    }
-    if (yValueList.length === 1) {
-      const columnFilter = getFilterByColumnType(config[groupColumnKey], columns, yValueList[0], rows);
+    });
+    yValueList.forEach(yValue => {
+      const columnFilter = getFilterByColumnTypeForPivot(config[groupColumnKey], columns, yValue, rows);
       filters.push(columnFilter);
-    }
+    });
   } else {
-    // pie and ring chart
     if (name === '_Others') {
-      const columnFilters = rows.map(r => getFilterByColumnType(config[columnKey], columns, name, [r]));
+      const columnFilters = rows.map(row => getFilterByColumnType(config[columnKey], columns, [row], sqlGroupbyColumnKey));
       filters.push(...columnFilters);
     } else {
-      const columnFilter = getFilterByColumnType(config[columnKey], columns, original_name || name, rows);
+      const columnFilter = getFilterByColumnType(config[columnKey], columns, rows, sqlGroupbyColumnKey);
       filters.push(columnFilter);
     }
-    if (groupColumnKey && config[groupColumnKey]) {
-      let groupNameFiled = group_name || groupby;
-      if (COMPLTETELESS_CHART_TYPES.includes(type)) {
-        groupNameFiled = groupby;
-      }
-      const groupColumnFilter = getFilterByColumnType(config[groupColumnKey], columns, groupNameFiled);
+    if (sqlColumnGroupbyColumnKey) {
+      const groupColumnFilter = getFilterByColumnType(config[groupColumnKey], columns, rows, sqlColumnGroupbyColumnKey);
       filters.push(groupColumnFilter);
     }
   }

package/package.json

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