sea-chart 0.0.76-alpha.1 → 0.0.76-alpha.3

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

@@ -45,7 +45,7 @@ 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.renderedColumns)
+            filters: getFilterConditions(statisticRecord, chart, this.table.columns)
           };
           context.api.customQueryRows(detailFilterConditions).then(res => {
             const {

package/dist/constants/index.js

@@ -285,4 +285,16 @@ export const xAxisMap = {
   [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/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 } from '../constants';
+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 {
@@ -480,10 +480,24 @@ const createColumnFormatter = (columnType, formatterProps) => {
   }
   return /*#__PURE__*/React.createElement(SimpleCellFormatter, formatterProps);
 };
+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'] = 'is';
+  filter['filter_term'] = value;
+  return filter;
+};
 export const getFilterConditions = function (statisticRecord, chart) {
   let columns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   const {
-    name = ''
+    name = '',
+    group_name = ''
   } = statisticRecord || {};
   const {
     config
@@ -491,19 +505,14 @@ export const getFilterConditions = function (statisticRecord, chart) {
   const {
     type
   } = config;
-  const newFilters = [];
+  const filters = [];
   const columnKey = xAxisMap[type];
-  const filter = {
-    column_key: config[columnKey] || ''
-  };
-  const column = getColumnByKey(columnKey, columns);
-  if (isDateColumn(column) || (column === null || column === void 0 ? void 0 : column.type) === CellType.GEOLOCATION) {
-    filter['value'] = name;
-    newFilters.push(filter);
-    return newFilters;
+  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);
   }
-  filter['filter_predicate'] = 'is';
-  filter['filter_term'] = name;
-  newFilters.push(filter);
-  return newFilters;
+  return filters;
 };

package/package.json

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