From 580d9db31153880c778776da914932382458ff40 Mon Sep 17 00:00:00 2001 From: PotapovaA Date: Tue, 14 Jul 2026 14:51:51 +0300 Subject: [PATCH] AURORA-865 --- .../RealtimeTable/Cell/Cell/Cell.jsx | 44 ++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx b/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx index 50a7c4a..0dc770e 100644 --- a/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx +++ b/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx @@ -37,7 +37,7 @@ const highlightText = (text, searchQueries) => { if (cleanSearchQueries.length == 0) return text; const escapedQueries = cleanSearchQueries.map(query => query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); - const regex = new RegExp(`(${ escapedQueries.join('|')})`, 'gi'); + const regex = new RegExp(`(${escapedQueries.join('|')})`, 'gi'); const parts = text.split(regex); return parts.map((part, index) => @@ -60,6 +60,35 @@ const highlightText = (text, searchQueries) => { ); }; +const highlightWithFormatting = (originalValue, formattedValue, searchQueries) => { + if (!originalValue && originalValue !== 0) return formattedValue; + + const cleanSearchQueries = searchQueries.filter(q => (q !== undefined && q !== '')); + if (cleanSearchQueries.length == 0) return formattedValue; + + const originalString = String(originalValue); + const escapedQueries = cleanSearchQueries.map(query => query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); + const regex = new RegExp(`(${escapedQueries.join('|')})`, 'gi'); + + if (!regex.test(originalString)) { + return formattedValue; + } + + return ( + + {formattedValue} + + ); +}; + const INTEGER_COLUMN_IDS = new Set([ 'data.header.num_group', 'data.nomenclature_group_id', @@ -97,18 +126,21 @@ const Cell = React.memo(({ cell, row, column, onClick, globalFilter, columnFilte const isLocked = lockedCells.includes(cellKey); const cellValue = cell.getValue(); - let textValue = String(cellValue || ''); + let originalValue = cellValue; + let displayValue = String(cellValue || ''); const isNumeric = !isNaN(Number(cellValue)) && cellValue !== null && cellValue !== undefined && cellValue !== ''; if (isNumeric) { const asInteger = INTEGER_COLUMN_IDS.has(column.id); - textValue = formatNumber(cellValue, asInteger); + displayValue = formatNumber(cellValue, asInteger); } const highlightedContent = useMemo(() => { - return highlightText(textValue, [globalFilter, columnFilter]); - }, [textValue, globalFilter]); - + if (!isNumeric) { + return highlightText(displayValue, [globalFilter, columnFilter]); + } + return highlightWithFormatting(originalValue, displayValue, [globalFilter, columnFilter]); + }, [originalValue, displayValue, globalFilter, columnFilter, isNumeric]); // Базовые стили для заблокированной ячейки const lockedStyles = isLocked ? {