From 580d9db31153880c778776da914932382458ff40 Mon Sep 17 00:00:00 2001
From: PotapovaA <a.m.d.s@mail.ru>
Date: Tue, 14 Jul 2026 14:51:51 +0300
Subject: [PATCH 1/3] 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 (
+    <mark
+      style={{
+        backgroundColor: '#ffeb3b',
+        color: '#000',
+        fontWeight: 'bold',
+        padding: '0 2px',
+        borderRadius: '2px',
+      }}
+    >
+      {formattedValue}
+    </mark>
+  );
+};
+
 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 ? {
-- 
2.47.2


From 2f505c70518e125631d81763bda6c4e482549e2f Mon Sep 17 00:00:00 2001
From: PotapovaA <a.m.d.s@mail.ru>
Date: Tue, 14 Jul 2026 15:26:30 +0300
Subject: [PATCH 2/3] AURORA-1173

---
 web/src/pages/DictVspPage/components/Modals/ModalEditAddVsp.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/pages/DictVspPage/components/Modals/ModalEditAddVsp.jsx b/web/src/pages/DictVspPage/components/Modals/ModalEditAddVsp.jsx
index 1b56ad9..674778b 100644
--- a/web/src/pages/DictVspPage/components/Modals/ModalEditAddVsp.jsx
+++ b/web/src/pages/DictVspPage/components/Modals/ModalEditAddVsp.jsx
@@ -360,7 +360,7 @@ const ModalEditAddVsp = ({
               Региональный филиал <span style={{ color: 'red' }}>*</span>
             </FieldLabel>
             <Autocomplete
-              options={ssps}
+              options={ssps.filter(s => s.is_active)}
               getOptionLabel={(option) => option.title || option.name || ''}
               value={selectedSsp}
               onChange={handleSspChange}
-- 
2.47.2


From e06b2dc4d4f14f1ec3f6a92adc32b08c124b9dc4 Mon Sep 17 00:00:00 2001
From: PotapovaA <a.m.d.s@mail.ru>
Date: Tue, 14 Jul 2026 17:27:29 +0300
Subject: [PATCH 3/3] aurora-1194

---
 .../RealtimeTable/Cell/Cell/Cell.jsx          | 44 +++++++++++++++----
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx b/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx
index 0dc770e..3392699 100644
--- a/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx
+++ b/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx
@@ -30,6 +30,28 @@ const LockBadge = styled.div`
   border: 1px solid rgba(255, 255, 255, 0.1);
 `;
 
+// Функция для определения яркости цвета
+const getColorBrightness = (hexColor) => {
+  if (!hexColor) return 255;
+
+  const color = hexColor.replace('#', '');
+
+  let r, g, b;
+  if (color.length === 3) {
+    r = parseInt(color[0] + color[0], 16);
+    g = parseInt(color[1] + color[1], 16);
+    b = parseInt(color[2] + color[2], 16);
+  } else if (color.length === 6) {
+    r = parseInt(color.substring(0, 2), 16);
+    g = parseInt(color.substring(2, 4), 16);
+    b = parseInt(color.substring(4, 6), 16);
+  } else {
+    return 255;
+  }
+
+  return (0.299 * r + 0.587 * g + 0.114 * b);
+};
+
 // Функция для подсветки текста
 const highlightText = (text, searchQueries) => {
   if (!text) return text;
@@ -142,21 +164,26 @@ const Cell = React.memo(({ cell, row, column, onClick, globalFilter, columnFilte
     return highlightWithFormatting(originalValue, displayValue, [globalFilter, columnFilter]);
   }, [originalValue, displayValue, globalFilter, columnFilter, isNumeric]);
 
+  // Определяем цвет текста на основе яркости фона
+  const getTextColor = () => {
+    const brightness = getColorBrightness(backgroundColor);
+
+    // Если яркость меньше 128 (темный фон) - используем белый текст, иначе черный
+    return brightness < 128 ? '#ffffff' : '#000000';
+  };
+
   // Базовые стили для заблокированной ячейки
   const lockedStyles = isLocked ? {
     border: '2px solid #e0e0e0',
     backgroundColor: '#f5f5f5',
-    color: '#999999',
     cursor: 'not-allowed',
     opacity: 0.85,
   } : {};
 
-  // Если isEditable false, добавляем дополнительные стили
-  const editableStyles = !isEditable ? {
-    border: '2px solid #d3d3d3',
-    color: backgroundColor?.toLowerCase() === '#933634' ? '#ffffff' : '#525252',
-    cursor: 'not-allowed',
-  } : {};
+
+
+  // Определяем финальный цвет текста
+  const finalTextColor = isLocked ? '#999999' : getTextColor();
 
   return (
     <div
@@ -176,9 +203,8 @@ const Cell = React.memo(({ cell, row, column, onClick, globalFilter, columnFilte
         border: '2px solid transparent',
         padding: '8px',
         backgroundColor: isLocked ? '#f5f5f5' : backgroundColor,
-        color: isLocked ? '#999999' : color,
+        color: finalTextColor,
         ...lockedStyles,
-        ...editableStyles,
       }}
       onClick={isLocked ? undefined : onClick}
     >
-- 
2.47.2