From 67899fc9637cb189aafb2d1c0363e3305a7b9235 Mon Sep 17 00:00:00 2001 From: Grog Date: Fri, 6 Nov 2026 08:52:33 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/layouts/ConsolidationReportPage.tsx | 2 +- .../ConsolidationChessContent/ConsolidatedChessContent.tsx | 2 +- .../ConsolidationGoodwillContent.tsx | 2 +- .../ConsolidationGoodwillTable/ConsolidationGoodwillTable.tsx | 2 +- web/src/widgets/CorrectionTable/CorrectionContent.tsx | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/src/layouts/ConsolidationReportPage.tsx b/web/src/layouts/ConsolidationReportPage.tsx index 156c097..96cc894 100644 --- a/web/src/layouts/ConsolidationReportPage.tsx +++ b/web/src/layouts/ConsolidationReportPage.tsx @@ -16,8 +16,8 @@ import { statusColorMapping } from '../widgets/ConsoleTable/consts'; import { OsvTabs } from '../widgets/ConsolidatedOsv/OsvTabs'; import { OsvContent } from '../widgets/ConsolidatedOsvContent/ConsolidatedOsvContent'; import { ChessContent } from '../widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent'; -import { CorrectionContent } from '../widgets/CorrectionTable/CorrectionContent'; import { GoodwillContent } from '../widgets/ConsolidationGoodwill/ConsolidationGoodwillContent/ConsolidationGoodwillContent'; +import { CorrectionContent } from '../widgets/CorrectionTable/CorrectionContent'; import ChangeStatusModal from '../widgets/StatusChangeModal/ChangeStatusModal'; function ReportContent() { diff --git a/web/src/widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent.tsx b/web/src/widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent.tsx index c4bc6a4..62cb4b3 100644 --- a/web/src/widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent.tsx +++ b/web/src/widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent.tsx @@ -4,6 +4,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { useParams } from 'react-router-dom'; import { ApiError } from '../../../api/client'; import { ConsolidationFormatTableFilter } from '../../../components/ConsolidationFormatTableFilter/ConsolidationFormatTableFilter'; +import { useFullscreen } from '../../../hooks/useFullScreen'; import { exportChessConsolidationsResult, exportChessTableAll, @@ -20,7 +21,6 @@ import { useNotificationApi } from '../../../utils/useNotification'; import { ConsolidationChessResTable } from '../ConsolidationChessResTable/ConsolidationChessResTable'; import { ConsolidationChessTable } from '../ConsolidationChessTable/ConsolidationChessTable'; import { ConsolidationChessTableFilter } from '../ConsolidationChessTableFilter/ConsolidationChessTableFilter'; -import { useFullscreen } from '../../../hooks/useFullScreen'; export const ChessContent = ({ card }: { card: VersionCard | null }) => { const { version_id } = useParams<{ version_id: string }>(); diff --git a/web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillContent/ConsolidationGoodwillContent.tsx b/web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillContent/ConsolidationGoodwillContent.tsx index 9424918..4660644 100644 --- a/web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillContent/ConsolidationGoodwillContent.tsx +++ b/web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillContent/ConsolidationGoodwillContent.tsx @@ -4,6 +4,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { useParams } from 'react-router-dom'; import { ConsolidationFormatTableFilter } from '../../../components/ConsolidationFormatTableFilter/ConsolidationFormatTableFilter'; import { type ColumnDef, ColumnSettings, useVisibleColumns } from '../../../components/GenericTable'; +import { useFullscreen } from '../../../hooks/useFullScreen'; import { exportGoodwillTable, fetchGoodwillTable, saveGoodwillRow } from '../../../services/api/goodwill'; import type { VersionCard } from '../../../types/consolidations/version_members'; import type { GoodwillRow, GoodwillRowPayload, GoodwillTableResponse, GoodwillTreeRow } from '../../../types/goodwill/goodwill'; @@ -11,7 +12,6 @@ import { saveBlob, xlsxFilename } from '../../../utils/download'; import { useNotificationApi } from '../../../utils/useNotification'; import { ConsolidationGoodwillTable } from '../ConsolidationGoodwillTable/ConsolidationGoodwillTable'; import { getGoodwillColumns } from '../ConsolidationGoodwillTable/config'; -import { useFullscreen } from '../../../hooks/useFullScreen'; // #TODO --- ТЕСТОВЫЕ ДАННЫЕ --- // const MOCK_DATA: GoodwillTableResponse = { diff --git a/web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillTable/ConsolidationGoodwillTable.tsx b/web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillTable/ConsolidationGoodwillTable.tsx index 230b68f..7631f8e 100644 --- a/web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillTable/ConsolidationGoodwillTable.tsx +++ b/web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillTable/ConsolidationGoodwillTable.tsx @@ -5,8 +5,8 @@ import { useMemo } from 'react'; import type { GoodwillRow, GoodwillTableResponse, GoodwillTreeRow } from '../../../types/goodwill/goodwill'; import './ConsolidationGoodwillTable.css'; import { chessTableCellFormatValue } from '../../../utils/chessTableCellFormatValue'; -import { getGoodwillColumns } from './config'; import { sumAmounts } from '../../../utils/money'; +import { getGoodwillColumns } from './config'; const { Text } = Typography; diff --git a/web/src/widgets/CorrectionTable/CorrectionContent.tsx b/web/src/widgets/CorrectionTable/CorrectionContent.tsx index 4aa77ab..d10f2b1 100644 --- a/web/src/widgets/CorrectionTable/CorrectionContent.tsx +++ b/web/src/widgets/CorrectionTable/CorrectionContent.tsx @@ -4,6 +4,7 @@ import { Button, ConfigProvider, Spin, notification as antdNotification } from ' import { type ReactNode, useEffect, useMemo, useRef, useState } from 'react'; import { ApiError } from '../../api/client'; import { useVisibleColumns } from '../../components/GenericTable/useVisibleColumns'; +import { useFullscreen } from '../../hooks/useFullScreen'; import { allocate, exportCorrectionTable } from '../../services/api/corrections'; import type { VersionCard } from '../../types/consolidations/version_members'; import type { AllocationIn } from '../../types/corrections'; @@ -16,7 +17,6 @@ import { COLUMN_DEFS, type ColKey, type ColShape } from './columns'; import { errorOutcome, readOnlyHint } from './readOnly'; import { EMPTY_FILTERS, type TableFilters, aggregateKey, buildRows, filterTable, lineOptions, visibleTotals } from './tableModel'; import { useCorrectionTable } from './useCorrectionTable'; -import { useFullscreen } from '../../hooks/useFullScreen'; const LOAD_ERROR_KEY = 'corrections-load-error'; @@ -70,7 +70,7 @@ export function CorrectionContent({ versionId, card = null }: Props) { // ушли с вкладки — уведомление об ошибке закрываем, оно относится к этому экрану useEffect(() => () => notification.destroy(LOAD_ERROR_KEY), [notification]); - const { ref: tableRef, isFullscreen: isFullscreen, toggle: toggleFullscreen } = useFullscreen(); + const { ref: tableRef, isFullscreen, toggle: toggleFullscreen } = useFullscreen(); const download = async () => { setExporting(true);