sea-chart 0.0.77 → 0.0.78-alpha.0

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

@@ -8,6 +8,7 @@ import DtableSearchInput from '../dtable-search-input';
 import Loading from '../loading';
 import { searchRows } from '../../utils/search';
 import ChartDataSQL from '../../utils/sql/chart-data-sql';
+import { getFilterConditions } from '../../utils/row-record-utils';
 import RowCard from '../row-card/row-card';
 import { CommonEventTypes } from '../../constants/common-constants';
 import './index.css';
@@ -31,8 +32,7 @@ class StatisticRecordDialog extends React.Component {
       } = statisticRecord || {};
       const {
         table_id,
-        view_id,
-        filters
+        view_id
       } = chart.config;
       this.table = getTableById(tables, table_id);
       if (view_id) {
@@ -44,15 +44,8 @@ class StatisticRecordDialog extends React.Component {
       if (this.isArchiveView || !isCalculateByView || statisticRecord.isQueryBySql) {
         var _context$api, _context$api2;
         if ((_context$api = context.api) === null || _context$api === void 0 ? void 0 : _context$api.customQueryRows) {
-          const newFilters = (filters === null || filters === void 0 ? void 0 : filters.map(item => {
-            return {
-              ...item,
-              column_key: (item === null || item === void 0 ? void 0 : item.column_key) || '',
-              value: (item === null || item === void 0 ? void 0 : item.filter_term) || ''
-            };
-          })) || [];
           const detailFilterConditions = {
-            filters: newFilters
+            filters: getFilterConditions(statisticRecord, chart, this.table.columns)
           };
           context.api.customQueryRows(detailFilterConditions).then(res => {
             const {

package/dist/constants/index.js

@@ -256,4 +256,47 @@ export const MONTH_MIRROR = {
   '10': 'Nov',
   '11': 'Dec'
 };
+export const xAxisMap = {
+  [CHART_TYPE.BAR_CUSTOM]: 'x_axis_column_key',
+  [CHART_TYPE.BAR_GROUP]: 'x_axis_column_key',
+  [CHART_TYPE.BAR_STACK]: 'x_axis_column_key',
+  [CHART_TYPE.BAR]: 'x_axis_column_key',
+  [CHART_TYPE.AREA_GROUP]: 'x_axis_column_key',
+  [CHART_TYPE.AREA]: 'x_axis_column_key',
+  [CHART_TYPE.BASIC_NUMBER_CARD]: 'numeric_column_key',
+  [CHART_TYPE.COMBINATION]: 'x_axis_column_key',
+  [CHART_TYPE.COMPARE_BAR]: 'x_axis_column_key',
+  [CHART_TYPE.COMPLETENESS_GROUP]: 'groupby_column_key',
+  [CHART_TYPE.COMPLETENESS]: 'groupby_column_key',
+  [CHART_TYPE.DASHBOARD]: 'target_value_column_key',
+  [CHART_TYPE.HEAT_MAP]: 'time_column_key',
+  [CHART_TYPE.HORIZONTAL_BAR]: 'vertical_axis_column_key',
+  [CHART_TYPE.HORIZONTAL_GROUP_BAR]: 'vertical_axis_column_key',
+  [CHART_TYPE.STACKED_HORIZONTAL_BAR]: 'vertical_axis_column_key',
+  [CHART_TYPE.LINE_GROUP]: 'x_axis_column_key',
+  [CHART_TYPE.LINE]: 'x_axis_column_key',
+  [CHART_TYPE.MAP_BUBBLE]: 'geo_column_key',
+  [CHART_TYPE.MAP]: 'geo_column_key',
+  [CHART_TYPE.WORLD_MAP_BUBBLE]: 'geo_column_key',
+  [CHART_TYPE.WORLD_MAP]: 'geo_column_key',
+  [CHART_TYPE.MIRROR]: 'column_key',
+  [CHART_TYPE.PIE]: 'groupby_column_key',
+  [CHART_TYPE.RING]: 'groupby_column_key',
+  [CHART_TYPE.SCATTER]: 'x_axis_column_key',
+  [CHART_TYPE.TABLE]: 'groupby_column_key',
+  [CHART_TYPE.TREE_MAP]: 'groupby_column_key',
+  [CHART_TYPE.TREND]: 'date_column_key'
+};
+export const groupAxisMap = {
+  [CHART_TYPE.BAR_GROUP]: 'column_groupby_column_key',
+  [CHART_TYPE.BAR_STACK]: 'column_groupby_column_key',
+  [CHART_TYPE.AREA_GROUP]: 'column_groupby_column_key',
+  [CHART_TYPE.COMPLETENESS_GROUP]: 'column_groupby_column_key',
+  [CHART_TYPE.HORIZONTAL_GROUP_BAR]: 'column_groupby_column_key',
+  [CHART_TYPE.STACKED_HORIZONTAL_BAR]: 'column_groupby_column_key',
+  [CHART_TYPE.LINE_GROUP]: 'column_groupby_column_key',
+  [CHART_TYPE.SCATTER]: 'column_groupby_column_key',
+  [CHART_TYPE.MIRROR]: 'group_column_key',
+  [CHART_TYPE.TABLE]: 'groupby_column_key'
+};
 export { GEOLOCATION_FORMAT_CITY, GEOLOCATION_FORMAT_MAP, CHART_KEY, GENERIC_KEY, GENERIC_KEY_2_SIMILAR_KEYS, STYLE_COLORS, HORIZONTAL_ALIGN, HORIZONTAL_ALIGNS, HORIZONTAL_ALIGN_SHOW, CHART_TYPE, CHART_TYPE_SHOW, CHART_TYPES, CHART_TYPE_IMAGE, GEOLOCATION_GRANULARITY, GEOLOCATION_GRANULARITY_LIST, MAP_LEVEL, MUNICIPALITIES, regions, TABLE_DIMENSIONS };

package/dist/settings/index.js

@@ -2,7 +2,7 @@ import React, { useCallback, useMemo, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import intl from '../intl';
-import { settingsContext, DepartmentsContext } from '../utils/contexts';
+import { settingsContext } from '../utils/contexts';
 import { eventStopPropagation } from '../utils';
 import { BaseUtils } from '../utils';
 import { CHART_SETTINGS_TYPE, CHART_SETTINGS } from '../constants';
@@ -18,8 +18,7 @@ const Settings = _ref => {
     hideTitleStyleSetting,
     tables,
     onChange,
-    children,
-    departments
+    children
   } = _ref;
   const [type, setType] = useState(CHART_SETTINGS_TYPE.DATA);
   const [labelColorConfigs, setLabelColorConfigs] = useState([]);
@@ -84,16 +83,12 @@ const Settings = _ref => {
   }, /*#__PURE__*/React.createElement("div", {
     id: "sea-chart-settings-content",
     className: "chart-settings-content"
-  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(DepartmentsContext.Provider, {
-    value: {
-      departments
-    }
-  }, /*#__PURE__*/React.createElement(DataSettings, {
+  }, type === CHART_SETTINGS_TYPE.DATA && /*#__PURE__*/React.createElement(DataSettings, {
     dataSources: dataSources,
     chart: chart,
     tables: tables,
     onChange: modifyStatistic
-  })), type === CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
+  }), type === CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
     chart: chart,
     labelColorConfigs: labelColorConfigs,
     onChange: modifyStyle

package/dist/settings/widgets/data-filter/index.js

@@ -1,11 +1,10 @@
 import _DTableFiltersPopover from "dtable-ui-component/lib/DTableFiltersPopover";
-import React, { useCallback, useContext, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { Label, FormGroup } from 'reactstrap';
 import { getTableById } from 'dtable-utils';
 import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
 import context from '../../../context';
-import { DepartmentsContext } from '../../../utils/contexts';
 import './index.css';
 const DataFilter = _ref => {
   let {
@@ -14,9 +13,6 @@ const DataFilter = _ref => {
     onChange
   } = _ref;
   const [isFilterSetterShow, setIsFilterSetterShow] = useState(false);
-  const {
-    departments
-  } = useContext(DepartmentsContext);
   const toggleFilterPopover = useCallback(event => {
     eventStopPropagation(event);
     setIsFilterSetterShow(!isFilterSetterShow);
@@ -82,7 +78,6 @@ const DataFilter = _ref => {
     filterConjunction: filterConjunction,
     columns: table.columns,
     collaborators: collaborators,
-    departments: departments,
     hidePopover: toggleFilterPopover,
     update: updateFilters
   }))) : /*#__PURE__*/React.createElement("div", {

package/dist/utils/contexts.js

@@ -1,3 +1,2 @@
 import React from 'react';
-export const settingsContext = React.createContext('');
-export const DepartmentsContext = React.createContext([]);
+export const settingsContext = React.createContext('');

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 } from 'dtable-utils';
+import { CellType, FORMULA_RESULT_TYPE, getNumberDisplayString, getDateDisplayString, getCellValueStringResult, isNumber, isDateColumn } from 'dtable-utils';
 import { LinksUtils } from 'dtable-store';
 import dayjs from 'dayjs';
 import cellFormatterFactory from '../components/cell-factory/cell-formatter-factory';
@@ -10,7 +10,9 @@ import SingleSelectOption from '../components/cell-factory/SingleSelectOption';
 import { isFunction, getFileIconUrl, getImageThumbnailUrl, isArchiveViewRowData } from '../utils/common-utils';
 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';
 export const UNSHOW_COLUMN_TYPE = [CellType.LINK, CellType.LONG_TEXT, CellType.FORMULA, CellType.LINK_FORMULA];
 export const getCellRecordWidth = column => {
   let {
@@ -479,4 +481,59 @@ const createColumnFormatter = (columnType, formatterProps) => {
     return /*#__PURE__*/React.createElement(Formatter, formatterProps);
   }
   return /*#__PURE__*/React.createElement(SimpleCellFormatter, formatterProps);
+};
+const filterPredicateMap = {
+  [CellType.TEXT]: 'is',
+  [CellType.NUMBER]: 'equal',
+  [CellType.CHECKBOX]: 'is',
+  [CellType.DATE]: 'is',
+  [CellType.CTIME]: 'is',
+  [CellType.MTIME]: 'is',
+  [CellType.SINGLE_SELECT]: 'is',
+  [CellType.MULTIPLE_SELECT]: 'has_all_of',
+  [CellType.DEPARTMENT_SINGLE_SELECT]: 'is',
+  [CellType.COLLABORATOR]: 'has_all_of',
+  [CellType.CREATOR]: 'is',
+  [CellType.LAST_MODIFIER]: 'is',
+  [CellType.AUTO_NUMBER]: 'is',
+  [CellType.EMAIL]: 'is',
+  [CellType.URL]: 'is',
+  [CellType.STRING]: 'is',
+  [CellType.BOOL]: 'is'
+};
+const getFilterByColumnType = (columnKey, columns, value) => {
+  const filter = {
+    column_key: columnKey || ''
+  };
+  const column = getColumnByKey(columnKey, columns);
+  if (isDateColumn(column) || (column === null || column === void 0 ? void 0 : column.type) === CellType.GEOLOCATION) {
+    filter['value'] = value;
+    return filter;
+  }
+  filter['filter_predicate'] = filterPredicateMap[column === null || column === void 0 ? void 0 : column.type];
+  filter['filter_term'] = value;
+  return filter;
+};
+export const getFilterConditions = function (statisticRecord, chart) {
+  let columns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  const {
+    name = '',
+    group_name = ''
+  } = statisticRecord || {};
+  const {
+    config
+  } = chart;
+  const {
+    type
+  } = config;
+  const filters = [];
+  const columnKey = xAxisMap[type];
+  const groupColumnKey = groupAxisMap[type];
+  const columnFilter = getFilterByColumnType(config[columnKey], columns, name);
+  filters.push(columnFilter);
+  if (config[groupColumnKey]) {
+    const groupColumnFilter = getFilterByColumnType(config[groupColumnKey], columns, group_name);
+    filters.push(groupColumnFilter);
+  }
+  return filters;
 };

package/package.json

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