From 601a125349e9f78e98eacfab6f884e74b07a048f Mon Sep 17 00:00:00 2001 From: Grog Date: Thu, 22 Oct 2026 14:36:18 +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 --- .../TreeFilterDropdown/TreeFilterDropdown.css | 2 +- .../TreeFilterDropdown/TreeFilterDropdown.tsx | 4 ++-- web/src/utils/chessTableCellFormatValue.ts | 10 +++------- .../ConsolidationChessResTable.tsx | 2 +- .../ConsolidationChessTable.tsx | 5 ++--- .../ConsolidationChessTableFilter.tsx | 2 +- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/web/src/components/TreeFilterDropdown/TreeFilterDropdown.css b/web/src/components/TreeFilterDropdown/TreeFilterDropdown.css index 9bc8d7c..adf8ee1 100644 --- a/web/src/components/TreeFilterDropdown/TreeFilterDropdown.css +++ b/web/src/components/TreeFilterDropdown/TreeFilterDropdown.css @@ -1,3 +1,3 @@ .filterTree .ant-tree-switcher-noop { display: none !important; -} \ No newline at end of file +} diff --git a/web/src/components/TreeFilterDropdown/TreeFilterDropdown.tsx b/web/src/components/TreeFilterDropdown/TreeFilterDropdown.tsx index 161893b..76ab446 100644 --- a/web/src/components/TreeFilterDropdown/TreeFilterDropdown.tsx +++ b/web/src/components/TreeFilterDropdown/TreeFilterDropdown.tsx @@ -1,6 +1,6 @@ import { SearchOutlined } from '@ant-design/icons'; import { Button, Input, Space, Tree } from 'antd'; -import { ReactNode, useEffect, useMemo, useState } from 'react'; +import { type ReactNode, useEffect, useMemo, useState } from 'react'; import './TreeFilterDropdown.css'; export type OptionType = { @@ -17,7 +17,7 @@ interface TreeFilterDropdownProps { selectedKeys: string[]; onChange: (keys: string[]) => void; onClose: () => void; - warningBlock?: ReactNode + warningBlock?: ReactNode; } export const TreeFilterDropdown: React.FC = ({ diff --git a/web/src/utils/chessTableCellFormatValue.ts b/web/src/utils/chessTableCellFormatValue.ts index 64f6123..cfa0a78 100644 --- a/web/src/utils/chessTableCellFormatValue.ts +++ b/web/src/utils/chessTableCellFormatValue.ts @@ -1,8 +1,4 @@ -export const chessTableCellFormatValue = ( - val: string | number | null | undefined, - units: string, - decimals: number -) => { +export const chessTableCellFormatValue = (val: string | number | null | undefined, units: string, decimals: number) => { if (val === undefined || val === null || val === '') return ''; let strVal = String(val); @@ -46,10 +42,10 @@ export const chessTableCellFormatValue = ( maximumFractionDigits: decimals, }).format(strVal as any); - const zeroString = `0${decimals > 0 ? ',' + '0'.repeat(decimals) : ''}`; + const zeroString = `0${decimals > 0 ? `,${'0'.repeat(decimals)}` : ''}`; if (formatted === `-${zeroString}`) { return zeroString; } return formatted; -}; \ No newline at end of file +}; diff --git a/web/src/widgets/ConsolidationChessResTable/ConsolidationChessResTable.tsx b/web/src/widgets/ConsolidationChessResTable/ConsolidationChessResTable.tsx index f664909..5f49188 100644 --- a/web/src/widgets/ConsolidationChessResTable/ConsolidationChessResTable.tsx +++ b/web/src/widgets/ConsolidationChessResTable/ConsolidationChessResTable.tsx @@ -122,7 +122,7 @@ export const ConsolidationChessResTable: React.FC = ); })} - + {chessTableCellFormatValue(sumAmounts(data.articles.map((a) => a.group_total)) ?? '0', units, decimals)} diff --git a/web/src/widgets/ConsolidationChessTable/ConsolidationChessTable.tsx b/web/src/widgets/ConsolidationChessTable/ConsolidationChessTable.tsx index 11fbab0..0b5a259 100644 --- a/web/src/widgets/ConsolidationChessTable/ConsolidationChessTable.tsx +++ b/web/src/widgets/ConsolidationChessTable/ConsolidationChessTable.tsx @@ -18,7 +18,6 @@ interface ConsolidationChessTableI { isFullscreen?: boolean; } - type TotalRow = { id: string; name: string; @@ -92,11 +91,11 @@ export const ConsolidationChessTable: React.FC = ({ }; data.companies.forEach((colCompany) => { - const amountsToSum: string[] = []; + const amountsToSum: string[] = []; data.companies.forEach((rowCompany) => { const cell = matrixData[rowCompany.id]?.[colCompany.id]; - if (cell?.amount_a) { + if (cell?.amount_a) { amountsToSum.push(cell.amount_a); } }); diff --git a/web/src/widgets/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx b/web/src/widgets/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx index 513a819..f45ed46 100644 --- a/web/src/widgets/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx +++ b/web/src/widgets/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx @@ -18,7 +18,7 @@ interface ConsolidationChessTableFilterI { } const buildTree = (items: Account[]): OptionType[] => { - const map: Record = {}; + const map: Record = {}; const roots: OptionType[] = []; items.forEach((item) => {