sea-chart 1.1.91 → 1.1.92

package/dist/components/icon/index.js

@@ -1,24 +1,20 @@
 import React from 'react';
 import './index.css';
-const importAll = requireContext => {
-  requireContext.keys().forEach(requireContext);
-};
-try {
-  importAll(require.context('../../assets/icons', true, /\.svg$/));
-} catch (error) {
-  // eslint-disable-next-line no-console
-  console.log(error);
-}
+const components = {};
+const requireContext = require.context('../../assets/icons', false, /\.svg$/);
+requireContext.keys().forEach(path => {
+  const iconName = path.replace(/^\.\/(.*?)\.svg$/, '$1').toLowerCase();
+  components[iconName] = requireContext(path).default;
+});
 const Icon = props => {
   const {
     className,
     symbol
   } = props;
   const iconClass = `sea-chart-icon sea-chart-icon-${symbol} ${className || ''}`;
-  return /*#__PURE__*/React.createElement("svg", {
+  const IconComponent = components[symbol];
+  return /*#__PURE__*/React.createElement(IconComponent, {
     className: iconClass
-  }, /*#__PURE__*/React.createElement("use", {
-    xlinkHref: `#${symbol}`
-  }));
+  });
 };
 export default Icon;

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

@@ -1,6 +1,6 @@
 import _DTableFiltersPopover from "dtable-ui-component/lib/DTableFiltersPopover";
 import React, { useCallback, useContext, useMemo, useState } from 'react';
-import { getTableById } from 'dtable-utils';
+import { getTableById, getValidFilters } from 'dtable-utils';
 import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
 import context from '../../../context';
@@ -8,7 +8,7 @@ import { DepartmentsContext, FirstDayOfWeekContext } from '../../../utils/contex
 import { CHART_TYPE } from '../../../constants';
 import './data-filter.css';
 const DataFilter = _ref => {
-  var _availableFilters;
+  var _availableFilters, _window$dtable;
   let {
     chart,
     tables,
@@ -31,12 +31,24 @@ const DataFilter = _ref => {
     filters,
     filter_conjunction
   } = config;
+  const shownColumns = 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]);
+  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 = filters === null || filters === void 0 ? void 0 : filters.filter(filter => shown_column_keys.includes(filter.column_key));
+    availableFilters = validFilters === null || validFilters === void 0 ? void 0 : validFilters.filter(filter => shown_column_keys.includes(filter.column_key));
   } else {
-    availableFilters = filters;
+    availableFilters = validFilters;
   }
   const toggleFilterPopover = useCallback(event => {
     eventStopPropagation(event);
@@ -48,15 +60,6 @@ const DataFilter = _ref => {
   const id = useMemo(() => {
     return 'sea-chart-data-filter-' + generatorKey();
   }, []);
-  const shownColumns = 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]);
   const filterLength = ((_availableFilters = availableFilters) === null || _availableFilters === void 0 ? void 0 : _availableFilters.length) || 0;
   const filterMessage = useMemo(() => {
     let filterMessage = intl.get('Filter');
@@ -71,6 +74,10 @@ const DataFilter = _ref => {
     return filter_conjunction || 'And';
   }, [filter_conjunction]);
   const collaborators = context.getCollaboratorsFromCache();
+  const userDepartmentIdsMap = ((_window$dtable = window.dtable) === null || _window$dtable === void 0 ? void 0 : _window$dtable.userDepartmentIdsMap) || {
+    'current_user_department_ids': [],
+    'current_user_department_and_sub_ids': []
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     id: id,
     className: "sea-chart-data-filter mb-1",
@@ -79,15 +86,17 @@ const DataFilter = _ref => {
     className: "dtable-font dtable-icon-filter"
   }), /*#__PURE__*/React.createElement("span", null, filterMessage)), isFilterSetterShow && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_DTableFiltersPopover, {
     isNeedSubmit: true,
+    userDepartmentIdsMap: userDepartmentIdsMap,
+    departments: departments,
     target: id,
-    filters: availableFilters,
-    filterConjunction: filterConjunction,
     columns: shownColumns,
-    departments: departments,
+    filterConjunction: filterConjunction,
+    filters: availableFilters,
     collaborators: collaborators,
     hidePopover: toggleFilterPopover,
     update: updateFilters,
-    firstDayOfWeek: firstDayOfWeek
+    firstDayOfWeek: firstDayOfWeek,
+    isSupportAdvanced: true
   })));
 };
 export default DataFilter;

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

@@ -1,13 +1,14 @@
 import _DTableFiltersPopover from "dtable-ui-component/lib/DTableFiltersPopover";
 import React, { useCallback, useContext, useMemo, useState } from 'react';
 import { Label, FormGroup } from 'reactstrap';
-import { getTableById } from 'dtable-utils';
+import { getTableById, getValidFilters } from 'dtable-utils';
 import { eventStopPropagation, generatorKey } from '../../../utils';
 import intl from '../../../intl';
 import context from '../../../context';
 import { DepartmentsContext, FirstDayOfWeekContext } from '../../../utils/contexts';
 import './index.css';
 const DataFilter = _ref => {
+  var _window$dtable;
   let {
     chart,
     tables,
@@ -64,12 +65,19 @@ const DataFilter = _ref => {
     return filter_conjunction || 'And';
   }, [chart]);
   const collaborators = context.getCollaboratorsFromCache();
+  const userDepartmentIdsMap = ((_window$dtable = window.dtable) === null || _window$dtable === void 0 ? void 0 : _window$dtable.userDepartmentIdsMap) || {
+    'current_user_department_ids': [],
+    'current_user_department_and_sub_ids': []
+  };
   const {
     config
   } = chart;
   const {
     filters
   } = config;
+  const validFilters = useMemo(() => {
+    return getValidFilters(filters, table.columns);
+  }, [filters, table.columns]);
   return /*#__PURE__*/React.createElement(FormGroup, {
     className: "sea-chart-parameter-item"
   }, /*#__PURE__*/React.createElement(Label, null, intl.get('Data_settings')), table ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -78,18 +86,20 @@ const DataFilter = _ref => {
     onClick: toggleFilterPopover
   }, /*#__PURE__*/React.createElement("i", {
     className: "dtable-font dtable-icon-filter"
-  }), /*#__PURE__*/React.createElement("span", null, filterMessage)), isFilterSetterShow && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_DTableFiltersPopover, {
+  }), /*#__PURE__*/React.createElement("span", null, filterMessage)), isFilterSetterShow && /*#__PURE__*/React.createElement(_DTableFiltersPopover, {
     isNeedSubmit: true,
+    userDepartmentIdsMap: userDepartmentIdsMap,
+    departments: departments,
     target: id,
-    filters: filters,
-    filterConjunction: filterConjunction,
     columns: table.columns,
-    departments: departments,
+    filterConjunction: filterConjunction,
+    filters: validFilters,
     collaborators: collaborators,
     hidePopover: toggleFilterPopover,
     update: updateFilters,
-    firstDayOfWeek: firstDayOfWeek
-  }))) : /*#__PURE__*/React.createElement("div", {
+    firstDayOfWeek: firstDayOfWeek,
+    isSupportAdvanced: true
+  })) : /*#__PURE__*/React.createElement("div", {
     id: id,
     className: "sea-chart-data-filter disabled"
   }, /*#__PURE__*/React.createElement("i", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "1.1.91",
+  "version": "1.1.92",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -143,7 +143,6 @@
     "resolve": "1.12.0",
     "resolve-url-loader": "5.0.0",
     "rimraf": "^5.0.7",
-    "svg-sprite-loader": "^6.0.11",
     "svgo-loader": "^3.0.0",
     "sass-loader": "13.3.2",
     "style-loader": "^1.0.1",