@arim-aisdc/public-components 2.2.6 → 2.2.8-alpha.0

package/dist/assets/iconfont/table/iconfont.css

@@ -1,61 +1,81 @@
-@font-face {
-  font-family: "iconfont-table"; /* Project id 4453758 */
-  src: url('./iconfont.ttf?t=1730099737796') format('truetype');
-}
-
-.iconfont-table {
-  font-family: "iconfont-table" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-table-a-xinzeng21:before {
-  content: "\e62e";
-}
-
-.icon-table-a-download11:before {
-  content: "\e62f";
-}
-
-.icon-table-tight:before {
-  content: "\e87e";
-}
-
-.icon-table-normal:before {
-  content: "\e87f";
-}
-
-.icon-table-shenglvehao:before {
-  content: "\e62d";
-}
-
-.icon-table-delete:before {
-  content: "\e87c";
-}
-
-.icon-table-shuaxin:before {
-  content: "\e87b";
-}
-
-.icon-table-upload:before {
-  content: "\e878";
-}
-
-.icon-table-download:before {
-  content: "\e87a";
-}
-
-.icon-table-shezhi:before {
-  content: "\e643";
-}
-
-.icon-table-zhexian:before {
-  content: "\e644";
-}
-
-.icon-table-biaoge:before {
-  content: "\e645";
-}
-
+@font-face {
+  font-family: "iconfont-table"; /* Project id 4453758 */
+  src: url('iconfont.ttf?t=1740568199599') format('truetype');
+}
+
+.iconfont-table {
+  font-family: "iconfont-table" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-table-sort:before {
+  content: "\e890";
+}
+
+.icon-table-filter:before {
+  content: "\e88e";
+}
+
+.icon-table-shengji:before {
+  content: "\e64a";
+}
+
+.icon-table-calendar:before {
+  content: "\e888";
+}
+
+.icon-table-edit:before {
+  content: "\e887";
+}
+
+.icon-table-pin:before {
+  content: "\e889";
+}
+
+.icon-table-drag:before {
+  content: "\e88d";
+}
+
+.icon-table-down:before {
+  content: "\e88f";
+}
+
+.icon-table-tight:before {
+  content: "\e87e";
+}
+
+.icon-table-normal:before {
+  content: "\e87f";
+}
+
+.icon-table-delete:before {
+  content: "\e87c";
+}
+
+.icon-table-shuaxin:before {
+  content: "\e87b";
+}
+
+.icon-table-upload:before {
+  content: "\e878";
+}
+
+.icon-table-download:before {
+  content: "\e87a";
+}
+
+.icon-table-shezhi:before {
+  content: "\e643";
+}
+
+.icon-table-zhexian:before {
+  content: "\e644";
+}
+
+.icon-table-biaoge:before {
+  content: "\e645";
+}
+

package/dist/components/SplitterPane/SplitterPane.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -74,7 +80,26 @@ var SplitterPane = function SplitterPane(_ref) {
         style: {
           overflow: 'hidden'
         },
-        children: pane.children
+        children: /*#__PURE__*/_jsx("div", {
+          style: _objectSpread({}, layout === 'horizontal' ? index == 0 ? {
+            width: 'var(--global-splitter-panel-left-width, 100%)',
+            height: 'var(--global-splitter-panel-bottom-height, 100%)',
+            marginRight: 'var(--global-splitter-panel-margin, 0)'
+          } : {
+            width: 'var(--global-splitter-panel-right-width, 100%)',
+            height: 'var(--global-splitter-panel-bottom-height, 100%)',
+            marginLeft: 'var(--global-splitter-panel-margin, 0)'
+          } : index == 0 ? {
+            width: 'var(--global-splitter-panel-right-width, 100%)',
+            height: 'var(--global-splitter-panel-top-height, 100%)',
+            marginBottom: 'var(--global-splitter-panel-margin, 0)'
+          } : {
+            width: 'var(--global-splitter-panel-right-width, 100%)',
+            height: 'var(--global-splitter-panel-bottom-height, 100%)',
+            marginTop: 'var(--global-splitter-panel-margin, 0)'
+          }),
+          children: pane.children
+        })
       }, index);
     })
   });

package/dist/components/TableMax/TableBody/Row.js

@@ -360,9 +360,7 @@ var Row = function Row(_ref) {
         },
         children: !!(tableBodyRef !== null && tableBodyRef !== void 0 && (_tableBodyRef$current = tableBodyRef.current) !== null && _tableBodyRef$current !== void 0 && _tableBodyRef$current.clientWidth) && /*#__PURE__*/_jsx("div", {
           id: "".concat(tableId, "_expand-table"),
-          className: "subRowWrapper"
-          // 减去10，避免被父表滚动条覆盖
-          ,
+          className: "subRowWrapper",
           style: {
             width: "".concat(tableBodyRef === null || tableBodyRef === void 0 || (_tableBodyRef$current2 = tableBodyRef.current) === null || _tableBodyRef$current2 === void 0 ? void 0 : _tableBodyRef$current2.clientWidth, "px")
           },

package/dist/components/TableMax/TableHeader/Cell.d.ts

@@ -12,6 +12,7 @@ type ICellType = {
     columnResizeMode: ColumnResizeMode;
     disableColumnDrag?: boolean;
     headerRowNum: number;
+    canFilter?: boolean;
 };
-declare const Cell: ({ tableContentRef, header, table, hasGroup, canSorting, getHeaderCellProps, disableColumnDrag, headerRowNum, }: ICellType) => import("react/jsx-runtime").JSX.Element;
+declare const Cell: ({ tableContentRef, header, table, hasGroup, canSorting, getHeaderCellProps, disableColumnDrag, headerRowNum, canFilter, }: ICellType) => import("react/jsx-runtime").JSX.Element;
 export default Cell;

package/dist/components/TableMax/TableHeader/Cell.js

@@ -22,6 +22,7 @@ import { useDrag, useDrop } from 'react-dnd';
 import { createPortal } from 'react-dom';
 import { useConfig } from "../../ConfigProvider";
 import { ColumnType } from "../TableMax";
+import { ColumnFilter } from "../components/ColumnFilterV2";
 import Sort from "../components/ColumnSort";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -39,7 +40,8 @@ var Cell = function Cell(_ref) {
     canSorting = _ref.canSorting,
     getHeaderCellProps = _ref.getHeaderCellProps,
     disableColumnDrag = _ref.disableColumnDrag,
-    headerRowNum = _ref.headerRowNum;
+    headerRowNum = _ref.headerRowNum,
+    canFilter = _ref.canFilter;
   var _useConfig = useConfig(),
     root = _useConfig.root;
   var cannotDragColumn = [ColumnType.Darg, ColumnType.Selection, ColumnType.Expander, ColumnType.PlaceHolder];
@@ -86,7 +88,10 @@ var Cell = function Cell(_ref) {
     initPosition = _useState2[0],
     setInitPosition = _useState2[1];
   return /*#__PURE__*/_jsxs("div", {
-    ref: dropRef,
+    ref: function ref(node) {
+      dropRef(node);
+      dragRef(disableColumnDrag || cannotDragColumn.includes(header.column.id) || header.column.getIsPinned() ? null : node);
+    },
     children: [/*#__PURE__*/_jsxs("div", {
       className: "cell-wapper ".concat(columns ? 'wapper-top-parent' : '', " table-max-header-cell-wrapper"),
       ref: previewRef,
@@ -102,13 +107,13 @@ var Cell = function Cell(_ref) {
           y: y
         });
       },
-      children: [/*#__PURE__*/_jsxs("div", {
+      children: [/*#__PURE__*/_jsx("div", {
         className: "cell-left",
         onClick: header.column.getToggleSortingHandler(),
         style: {
           textAlign: columns ? 'center' : 'left'
         },
-        children: [!cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsx(Tooltip, {
+        children: !cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsx(Tooltip, {
           placement: "topLeft"
           // @ts-ignore
           ,
@@ -125,17 +130,15 @@ var Cell = function Cell(_ref) {
           })
         }) :
         // @ts-ignore
-        flexRender(columnDef.header, header.getContext()), canSorting ? /*#__PURE__*/_jsx(Sort, {
+        flexRender(columnDef.header, header.getContext())
+      }), !cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsxs("div", {
+        className: "cell-right",
+        children: [canSorting && header.column.getCanSort() ? /*#__PURE__*/_jsx(Sort, {
           sort: header.column.getIsSorted()
+        }) : null, canFilter && columnDef.enableColumnFilter !== false ? /*#__PURE__*/_jsx(ColumnFilter, {
+          column: header.column
         }) : null]
-      }), /*#__PURE__*/_jsx("div", {
-        className: "cell-right",
-        onClick: header.column.getToggleSortingHandler(),
-        children: disableColumnDrag || cannotDragColumn.includes(header.column.id) || header.column.getIsPinned() ? null : /*#__PURE__*/_jsx("i", {
-          ref: dragRef,
-          className: "icon iconfont-other icon-other-drag drag-handler"
-        })
-      }), /*#__PURE__*/_jsx("div", {
+      }) : null, /*#__PURE__*/_jsx("div", {
         className: "cell-resize-handler ".concat(header.column.getIsResizing() ? 'column-is-resizing' : ''),
         onMouseDown: header.getResizeHandler(),
         onTouchStart: header.getResizeHandler()
@@ -148,9 +151,7 @@ var Cell = function Cell(_ref) {
         height: (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight,
         transform: "translateX(".concat(table.getState().columnSizingInfo.deltaOffset || 0, "px)")
       }
-    }),
-    // document.body,
-    root ? document.querySelector(root) : document.body) : null]
+    }), root ? document.querySelector(root) : document.body) : null]
   });
 };
 export default Cell;

package/dist/components/TableMax/TableHeader/index.js

@@ -7,14 +7,15 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 // import { Column, flexRender } from '@tanstack/react-table';
 // import { useDrag, useDrop } from 'ahooks';
 
-import { Filter } from "../components/ColumnFilter";
+// import { Filter } from '../components/ColumnFilter';
+
 import Cell from "./Cell";
 import "./index.less";
 import { getPinningStyle } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var TableHeader = function TableHeader(_ref) {
-  var _headerGroups, _headerGroups2;
+  var _headerGroups;
   var tableContentRef = _ref.tableContentRef,
     table = _ref.table,
     canFilter = _ref.canFilter,
@@ -40,8 +41,8 @@ var TableHeader = function TableHeader(_ref) {
           width: size
         }, header.id);
       })
-    }), /*#__PURE__*/_jsxs("thead", {
-      children: [headerGroups === null || headerGroups === void 0 ? void 0 : headerGroups.map(function (headerGroup) {
+    }), /*#__PURE__*/_jsx("thead", {
+      children: headerGroups === null || headerGroups === void 0 ? void 0 : headerGroups.map(function (headerGroup) {
         return /*#__PURE__*/_jsx("tr", {
           className: "table-thead-tr cus-table-thead-tr",
           style: {
@@ -62,25 +63,13 @@ var TableHeader = function TableHeader(_ref) {
                 getHeaderCellProps: getHeaderCellProps,
                 columnResizeMode: columnResizeMode,
                 disableColumnDrag: disableColumnDrag,
-                headerRowNum: headerRowNum
+                headerRowNum: headerRowNum,
+                canFilter: canFilter
               }, header.id)
             }, header.id);
           })
         }, headerGroup.id);
-      }), canFilter && enableFilters ? /*#__PURE__*/_jsx("tr", {
-        className: "table-filter-tr",
-        children: headerGroups === null || headerGroups === void 0 || (_headerGroups2 = headerGroups[headerGroups.length - 1]) === null || _headerGroups2 === void 0 || (_headerGroups2 = _headerGroups2.headers) === null || _headerGroups2 === void 0 ? void 0 : _headerGroups2.map(function (header) {
-          return /*#__PURE__*/_jsx("th", {
-            style: _objectSpread({}, getPinningStyle(header, table)),
-            className: "table-filter-th ".concat(header.id === leftLastColumnId ? 'thead-tr-th-cell-fix-left-last' : '', " ").concat(header.id === rightFirstColumnId ? 'thead-tr-th-cell-fix-right-first' : ''),
-            children: header.column.getCanFilter() ? /*#__PURE__*/_jsx("div", {
-              children: /*#__PURE__*/_jsx(Filter, {
-                column: header.column
-              })
-            }) : null
-          }, header.id + '1');
-        })
-      }, "table-filter-tr") : null]
+      })
     })]
   });
 };

package/dist/components/TableMax/TableHeader/index.less

@@ -41,6 +41,7 @@ table {
     white-space: nowrap;
     display: flex;
     align-items: center;
+    justify-content: space-between;
 
     .cell-left-header {
       display: -webkit-box;
@@ -56,6 +57,12 @@ table {
     }
   }
 
+  .cell-right {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+  }
+
   .drag-handler {
     color: @tableColor3;
     display: none;

package/dist/components/TableMax/TableMax.js

@@ -29,14 +29,14 @@ import { useConfig } from "../ConfigProvider";
 import TableBody from "./TableBody";
 import TableHeader from "./TableHeader";
 import { InputType } from "./components/ColumnEdit";
-import { setDefaultFilterFn } from "./components/ColumnFilter";
-import customFilterFns from "./components/ColumnFilter/customFilterFns";
+import { setDefaultFilterFn } from "./components/ColumnFilterV2";
+import customFilterFns from "./components/ColumnFilterV2/customFilterFns";
 import ColumnSetting from "./components/ColumnSetting";
 import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customSortFns";
 import PaginationV2 from "./components/PaginationV2";
 import { useColumnWidth } from "./hooks/useColumnWidth";
 import "./tableMax.less";
-import { downloadExcel, getFormatFilters, getFormatSorting, operationColumnNoTooltips } from "./utils";
+import { downloadExcel, getFormatFilters, getFormatFiltersV2, getFormatSorting, operationColumnNoTooltips } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
@@ -646,6 +646,7 @@ var TableMax = function TableMax(_ref) {
 
   // 筛选回调
   useEffect(function () {
+    console.log('columnFilters :>> ', tableId, columnFilters);
     var filteredRowModel = table.getRowModel();
     var filteredData = filteredRowModel.rows.map(function (item) {
       return item.original;
@@ -660,7 +661,8 @@ var TableMax = function TableMax(_ref) {
         filteredData: filteredData,
         filteredRowModel: filteredRowModel,
         filters: columnFilters,
-        formatFilters: getFormatFilters(columns, columnFilters)
+        formatFilters: getFormatFilters(columns, columnFilters),
+        formatFiltersV2: getFormatFiltersV2(columns, columnFilters) // 动态化查询格式：https://arim-jyzx.coding.net/p/infra/wiki/3252
       });
     }
   }, [JSON.stringify(columnFilters), manualFiltering, tableId]);

package/dist/components/TableMax/components/{ColumnFilter/FilterDateRange → ColumnFilterV2/DateRange}/index.d.ts

@@ -11,6 +11,6 @@ interface IProps {
     } | undefined;
     columnDef: TableMaxColumnType;
 }
-export declare const FilterDateRange: ({ onChange, value, columnDef }: IProps) => import("react/jsx-runtime").JSX.Element;
+export declare const DateRange: ({ onChange, value, columnDef }: IProps) => import("react/jsx-runtime").JSX.Element;
 export declare const timeRangeFilter: (row: any, columnId: any, filterValue: any) => boolean;
 export {};

package/dist/components/TableMax/components/ColumnFilterV2/DateRange/index.js

@@ -0,0 +1,85 @@
+import { DatePicker } from 'antd';
+import dayjs from 'dayjs';
+import { useContext } from 'react';
+import { TableContext } from "../../../TableMax";
+import { defaultDateFormat } from "../index";
+import "./index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+var defaultRangePresets = [{
+  label: '最近7天',
+  value: [dayjs().add(-7, 'd'), dayjs()]
+}, {
+  label: '最近一个月',
+  value: [dayjs().add(-1, 'M'), dayjs()]
+}, {
+  label: '最近三个月',
+  value: [dayjs().add(-3, 'M'), dayjs()]
+}, {
+  label: '最近半年',
+  value: [dayjs().add(-6, 'M'), dayjs()]
+}, {
+  label: '最近一年',
+  value: [dayjs().add(-1, 'y'), dayjs()]
+}];
+export var DateRange = function DateRange(_ref) {
+  var _columnDef$filterComP, _columnDef$filterComP2, _columnDef$filterComP3, _columnDef$filterComP4;
+  var onChange = _ref.onChange,
+    value = _ref.value,
+    columnDef = _ref.columnDef;
+  var _useContext = useContext(TableContext),
+    manualFiltering = _useContext.manualFiltering;
+  var format = ((_columnDef$filterComP = columnDef.filterComProps) === null || _columnDef$filterComP === void 0 ? void 0 : _columnDef$filterComP.format) || defaultDateFormat;
+  var rangePresets = ((_columnDef$filterComP2 = columnDef.filterComProps) === null || _columnDef$filterComP2 === void 0 ? void 0 : _columnDef$filterComP2.rangePresets) || defaultRangePresets;
+
+  // 计算结束时间，精确度时间后的时间取结束时间，比如精确到小时，那么分钟取59分，秒取59秒，毫秒取999毫秒
+  var calEndTime = function calEndTime(endTime) {
+    if (format.endsWith('MM')) {
+      return endTime.endOf('month');
+    } else if (format.endsWith('DD')) {
+      return endTime.endOf('day');
+    } else if (format.endsWith('HH')) {
+      return endTime.endOf('hour');
+    } else if (format.endsWith('mm')) {
+      return endTime.endOf('minute');
+    } else if (format.endsWith('ss')) {
+      return endTime.endOf('second');
+    }
+  };
+  var onChangeDateRange = function onChangeDateRange(dates, dateStrings) {
+    console.log('dates :>> ', dates, dateStrings);
+    var newRange = {
+      startDate: dates && dates[0] ? manualFiltering ? dateStrings[0] // 后端筛选时，向外传递字符串格式的时间
+      : dayjs(dateStrings[0]).valueOf() // 去掉精确度后面的时间：把字符串转为dayjs、再转为时间戳，
+      : null,
+      endDate: dates && dates[1] ? manualFiltering ? dateStrings[1] // 后端筛选时，向外传递字符串格式的时间
+      : calEndTime(dates[1]).valueOf() : null
+    };
+    if (newRange.startDate === null && newRange.endDate === null) {
+      onChange(undefined);
+    } else {
+      onChange(newRange);
+    }
+  };
+  return /*#__PURE__*/_jsx("div", {
+    className: "date-range-filter-wrapper",
+    children: /*#__PURE__*/_jsx(DatePicker.RangePicker, {
+      presets: rangePresets && rangePresets.length > 0 ? rangePresets : undefined,
+      defaultValue: [value !== null && value !== void 0 && value.startDate ? dayjs(value === null || value === void 0 ? void 0 : value.startDate) : undefined, value !== null && value !== void 0 && value.endDate ? dayjs(value === null || value === void 0 ? void 0 : value.endDate) : undefined],
+      showTime: (_columnDef$filterComP3 = columnDef.filterComProps) === null || _columnDef$filterComP3 === void 0 ? void 0 : _columnDef$filterComP3.showTime,
+      format: format,
+      placeholder: ['开始时间', '结束时间'],
+      picker: ((_columnDef$filterComP4 = columnDef.filterComProps) === null || _columnDef$filterComP4 === void 0 ? void 0 : _columnDef$filterComP4.picker) || 'date',
+      onChange: onChangeDateRange,
+      allowEmpty: [true, true],
+      style: {
+        width: 320
+      }
+    })
+  });
+};
+
+// 前端筛选时的过滤函数
+export var timeRangeFilter = function timeRangeFilter(row, columnId, filterValue) {
+  var timeMs = new Date(row.getValue(columnId)).getTime() || 0;
+  return !(filterValue.startDate && timeMs < filterValue.startDate || filterValue.endDate && timeMs > filterValue.endDate);
+};

package/dist/components/TableMax/components/{ColumnFilter/FilterDateRange → ColumnFilterV2/DateRange}/index.less

@@ -1,4 +1,5 @@
-.date-range-filter-wapper {
+.date-range-filter-wrapper {
+  padding: 8px 12px;
   .split-wapper {
     margin: 5px 0px 0px;
     height: 2px;
@@ -17,8 +18,7 @@
     margin: 5px 0px 0px;
   }
 
-  >div {
-    width: 100%
+  > div {
+    width: 100%;
   }
-
-}
+}

package/dist/components/TableMax/components/ColumnFilterV2/Filter.d.ts

@@ -0,0 +1,8 @@
+import { Column } from '@tanstack/react-table';
+import React from 'react';
+type IProps = {
+    column: Column<any, unknown>;
+    onCloseFilterPanel: () => void;
+};
+declare const Filter: React.FC<IProps>;
+export default Filter;