diff --git a/web/src/components/RealtimeTable/RealtimeTable.jsx b/web/src/components/RealtimeTable/RealtimeTable.jsx index 6f294c1..ae29595 100644 --- a/web/src/components/RealtimeTable/RealtimeTable.jsx +++ b/web/src/components/RealtimeTable/RealtimeTable.jsx @@ -619,6 +619,10 @@ const RealtimeTable = ({ formType, formId, sheetName, direction, year }) => { ); const table = useMaterialReactTable(tableConfig); + const handleChangeShowColumnFilters = useCallback((showFilters) => { + if (!showFilters) table.setColumnFilters([]); + setShowColumnFilters(showFilters); + }, [table]); const isLoadingData = columns.length > 0; const handleNavigateToColumn = useCallback( @@ -1093,7 +1097,7 @@ const RealtimeTable = ({ formType, formId, sheetName, direction, year }) => { searchMatchCount={searchMatches.length} searchMatchIndex={searchMatchIndex} sizeMult={sizeMult} - onChangeShowColumnFilters={setShowColumnFilters} + onChangeShowColumnFilters={handleChangeShowColumnFilters} showColumnFilters={showColumnFilters} onAddRow={addRow} onAddProgram={addProgram} diff --git a/web/src/components/RealtimeTable/TableHead/TableHead.jsx b/web/src/components/RealtimeTable/TableHead/TableHead.jsx index af59797..7c9a1b4 100644 --- a/web/src/components/RealtimeTable/TableHead/TableHead.jsx +++ b/web/src/components/RealtimeTable/TableHead/TableHead.jsx @@ -1,3 +1,5 @@ +import CloseIcon from '@mui/icons-material/Close'; +import { IconButton } from '@mui/material'; import React, { useMemo } from 'react'; import { getOrderedVisibleColumns } from '../utils/columnLayoutUtils'; import { formatDeadline } from '../utils/deadlineFormat'; @@ -302,20 +304,41 @@ const FilterCell = ({ column }) => { default: // 'text' return ( - handleFilterChange(e.target.value)} - placeholder='Поиск...' - style={{ - width: '100%', - padding: '0.25rem 0.375rem', - fontSize: '0.6875rem', - border: '1px solid #ddd', - borderRadius: '0.25rem', - boxSizing: 'border-box', - }} - /> +