From 02ffff68613af2f5315828dd36f95a930f7d6cb5 Mon Sep 17 00:00:00 2001 From: PotapovaA Date: Wed, 16 Sep 2026 12:57:34 +0300 Subject: [PATCH] fix --- web/src/components/RealtimeTable/Cell/Cell/Cell.jsx | 8 +++++--- .../components/RealtimeTable/constants/FORM_1/SMETA.js | 2 +- .../components/RealtimeTable/constants/FORM_2/SMETA.js | 2 +- .../components/RealtimeTable/constants/FORM_4/SMETA.js | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx b/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx index da3704c..1c180ba 100644 --- a/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx +++ b/web/src/components/RealtimeTable/Cell/Cell/Cell.jsx @@ -94,7 +94,6 @@ const getColorBrightness = (hexColor) => { }; const formatNumber = (value, asInteger = false) => { - if (value === null || value === undefined || value === '') return String(value || ''); const num = Number(value); if (Number.isNaN(num)) return String(value); if (num === 0) return '-'; @@ -146,7 +145,10 @@ const CellComponent = ({ cell, row, column, onClick, globalFilter, columnFilter, const { rawValue, displayValue, isNumeric } = useMemo(() => { const value = cell.getValue(); const isNum = value !== null && value !== undefined && value !== '' && !Number.isNaN(Number(value)) && !TEXT_COLUMN_IDS.has(column.id); - const display = String(value || ''); + let display = String(value || ''); + if (isNum) { + display = formatNumber(display, false); + } if (isVspDropdown && value != null) { const vsp = vspOptions?.find((v) => v.id === Number(value)); @@ -154,7 +156,7 @@ const CellComponent = ({ cell, row, column, onClick, globalFilter, columnFilter, return { rawValue: value, displayValue: vsp.registration_number, isNumeric: false }; } } - + return { rawValue: value, displayValue: display, isNumeric: isNum }; }, [cell, column.id, isVspDropdown, vspOptions]); diff --git a/web/src/components/RealtimeTable/constants/FORM_1/SMETA.js b/web/src/components/RealtimeTable/constants/FORM_1/SMETA.js index 7f3afeb..0462912 100644 --- a/web/src/components/RealtimeTable/constants/FORM_1/SMETA.js +++ b/web/src/components/RealtimeTable/constants/FORM_1/SMETA.js @@ -50,7 +50,7 @@ export const config = { header: "", accessorKey: "data.name", columnLetter: "C", - size: 300, + size: 500, filterFn: "contains", }, ], diff --git a/web/src/components/RealtimeTable/constants/FORM_2/SMETA.js b/web/src/components/RealtimeTable/constants/FORM_2/SMETA.js index 9a81bb6..50befa9 100644 --- a/web/src/components/RealtimeTable/constants/FORM_2/SMETA.js +++ b/web/src/components/RealtimeTable/constants/FORM_2/SMETA.js @@ -44,7 +44,7 @@ export const config = { header: "", accessorKey: "data.name", columnLetter: "C", - size: 300, + size: 500, filterFn: "contains", }, ], diff --git a/web/src/components/RealtimeTable/constants/FORM_4/SMETA.js b/web/src/components/RealtimeTable/constants/FORM_4/SMETA.js index d0a3886..88e9b3c 100644 --- a/web/src/components/RealtimeTable/constants/FORM_4/SMETA.js +++ b/web/src/components/RealtimeTable/constants/FORM_4/SMETA.js @@ -52,7 +52,7 @@ export const config = { header: "", accessorKey: "data.name", columnLetter: "C", - size: 300, + size: 500, filterFn: "contains", muiTableHeadCellProps: { sx: { -- 2.47.2