From a47d2e58d0123030fe79b2a6e41785107dfc5cd0 Mon Sep 17 00:00:00 2001 From: Veronika Tsygankova Date: Fri, 5 Jun 2026 10:34:34 +0300 Subject: [PATCH] =?UTF-8?q?[AURORA-1060]=20-=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BB=D0=BE=D0=B0=D0=B4=D0=B5=D1=80?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RealtimeTable/RealtimeTable.jsx | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/web/src/components/RealtimeTable/RealtimeTable.jsx b/web/src/components/RealtimeTable/RealtimeTable.jsx index b67bcc2..884aa77 100644 --- a/web/src/components/RealtimeTable/RealtimeTable.jsx +++ b/web/src/components/RealtimeTable/RealtimeTable.jsx @@ -22,9 +22,10 @@ import { } from './constants/tableConfig'; import { useRealtime } from './contexts/RealtimeContext'; import { toast } from 'react-toastify'; +import { CircularProgress } from '@mui/material'; const RealtimeTable = ({ formType, formId, sheetName, direction }) => { - const { data, setData } = useRealtimeData(formId, sheetName, direction); + const { data, setData, isLoading: isTableLoading } = useRealtimeData(formId, sheetName, direction); const [globalFilter, setGlobalFilter] = useState(''); const [showColumnFilters, setShowColumnFilters] = useState(false); const [selectedColumn, setSelectedColumn] = useState(); @@ -149,7 +150,8 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => { columnVisibility, globalFilter, showColumnFilters, - rowSelection + rowSelection, + isLoading: isTableLoading, }, initialState: { expanded: true @@ -196,6 +198,7 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => { containerRef, tableMeta, rowSelection, + isTableLoading, ], ); @@ -234,10 +237,6 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => { setRowSelection({}); }, [rowSelection, table]) - if (!data) { - return
Загрузка...
; - } - return ( <> { > + {isTableLoading && ( +
+ +
+ )} + {headerPortalRef.current && createPortal(