sea-chart 1.1.114 → 1.1.115-beta.2

package/dist/settings/table-element-settings/components/data-filter.js

@@ -5,10 +5,9 @@ import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
 import context from '../../../context';
 import { DepartmentsContext, FirstDayOfWeekContext } from '../../../utils/contexts';
-import { CHART_TYPE } from '../../../constants';
 import './data-filter.css';
 const DataFilter = _ref => {
-  var _availableFilters, _window$dtable;
+  var _window$dtable;
   let {
     chart,
     tables,
@@ -25,38 +24,18 @@ const DataFilter = _ref => {
     config
   } = chart;
   const {
-    type,
     table_id,
-    shown_column_keys,
     filters,
     filter_conjunction
   } = config;
-  const shownColumns = useMemo(() => {
+  const columns = useMemo(() => {
     const table = getTableById(tables, table_id);
     if (!table || !table.columns) return [];
-    if (!shown_column_keys) {
-      return table.columns;
-    } else {
-      return table.columns.filter(column => shown_column_keys.includes(column.key));
-    }
-  }, [shown_column_keys, table_id, tables]);
+    return table.columns;
+  }, [table_id, tables]);
   const validFilters = useMemo(() => {
-    return getValidFilters(filters, shownColumns);
-  }, [filters, shownColumns]);
-  let availableFilters = [];
-  // some of the filters of TABLE_ELEMENT maybe one of the hidden columns, so we need to filter them out
-  if (shown_column_keys && type === CHART_TYPE.TABLE_ELEMENT) {
-    availableFilters = validFilters === null || validFilters === void 0 ? void 0 : validFilters.filter(filter => {
-      // For filter groups, check if any sub-filter references shown columns
-      if (filter.filters) {
-        return filter.filters.some(subFilter => shown_column_keys.includes(subFilter.column_key));
-      }
-      // For regular filters, check directly
-      return shown_column_keys.includes(filter.column_key);
-    });
-  } else {
-    availableFilters = validFilters;
-  }
+    return getValidFilters(filters, columns);
+  }, [filters, columns]);
   const toggleFilterPopover = useCallback(event => {
     eventStopPropagation(event);
     setIsFilterSetterShow(!isFilterSetterShow);
@@ -67,7 +46,7 @@ const DataFilter = _ref => {
   const id = useMemo(() => {
     return 'sea-chart-data-filter-' + generatorKey();
   }, []);
-  const filterLength = ((_availableFilters = availableFilters) === null || _availableFilters === void 0 ? void 0 : _availableFilters.length) || 0;
+  const filterLength = (validFilters === null || validFilters === void 0 ? void 0 : validFilters.length) || 0;
   const filterMessage = useMemo(() => {
     let filterMessage = intl.get('Filter');
     if (filterLength === 1) {
@@ -96,9 +75,9 @@ const DataFilter = _ref => {
     userDepartmentIdsMap: userDepartmentIdsMap,
     departments: departments,
     target: id,
-    columns: shownColumns,
+    columns: columns,
     filterConjunction: filterConjunction,
-    filters: availableFilters,
+    filters: validFilters,
     collaborators: collaborators,
     hidePopover: toggleFilterPopover,
     update: updateFilters,

package/package.json

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