RSHB/DFiP_Budget_planing
9
0
Fork 0
Code Issues 36 Pull Requests 36 Actions Packages Projects Releases Wiki Activity

fix(svod2): grid-no-grow и enableColumnPinning для виртуализации колонок

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Andrey Epifancev 2026-10-29 12:07:38 +04:00
parent 399234a827
commit b834f1008d
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/src/pages/Svod2Page/Svod2Page.jsx
View File

@ -12,7 +12,7 @@ import DenominationSelect from '../../components/common/DenominationSelect';
import useDenomination from '../../components/common/useDenomination'; import useDenomination from '../../components/common/useDenomination';
import { useSvod } from '../SvodPage/SvodContext'; import { useSvod } from '../SvodPage/SvodContext';
import { SvodFilters } from '../SvodPage/SvodFilters'; import { SvodFilters } from '../SvodPage/SvodFilters';
import { SVOD2_TABLE_CONTAINER_SX, createColumnClassMap, getEstimateTypeClassName } from './svod2Styles'; import { SVOD2_LAYOUT_OPTIONS, SVOD2_TABLE_CONTAINER_SX, createColumnClassMap, getEstimateTypeClassName } from './svod2Styles';
const SHEETS = [ const SHEETS = [
{ value: 'GO', label: 'ССП' }, { value: 'GO', label: 'ССП' },
@ -273,12 +273,13 @@ const getColumnConfig = (sheet) => {
return COLUMN_CONFIG_CACHE.get(sheet); return COLUMN_CONFIG_CACHE.get(sheet);
}; };
const scaleNumericColumns = (columns, divisor) => columns.map((column) => { const scaleNumericColumns = (columns, divisor) =>
const isText = ['name', 'org_name', 'smeta_type', 'smeta_direction', 'section_code', 'contract_number'].includes(column.id); columns.map((column) => {
const children = column.columns ? scaleNumericColumns(column.columns, divisor) : undefined; const isText = ['name', 'org_name', 'smeta_type', 'smeta_direction', 'section_code', 'contract_number'].includes(column.id);
if (isText || children) return { ...column, ...(children ? { columns: children } : {}) }; const children = column.columns ? scaleNumericColumns(column.columns, divisor) : undefined;
return { ...column, Cell: ({ cell }) => formatValue(cell.getValue(), divisor) }; if (isText || children) return { ...column, ...(children ? { columns: children } : {}) };
}); return { ...column, Cell: ({ cell }) => formatValue(cell.getValue(), divisor) };
});
const matchesSearch = (row, query) => { const matchesSearch = (row, query) => {
const searchableData = { const searchableData = {
@ -405,6 +406,7 @@ export default function Svod2Page() {
enablePagination: false, enablePagination: false,
enableRowVirtualization: true, enableRowVirtualization: true,
enableColumnVirtualization: true, enableColumnVirtualization: true,
...SVOD2_LAYOUT_OPTIONS,
columnVirtualizerOptions: getSvod2ColumnVirtualizerOptions, columnVirtualizerOptions: getSvod2ColumnVirtualizerOptions,
enableTopToolbar: false, enableTopToolbar: false,
enableBottomToolbar: false, enableBottomToolbar: false,
@ -487,7 +489,12 @@ export default function Svod2Page() {
onChange={(_event, value) => setSheet(value)} onChange={(_event, value) => setSheet(value)}
sx={{ px: '1rem', minHeight: '3rem', borderBottom: '0.0625rem solid #edf0f2' }}> sx={{ px: '1rem', minHeight: '3rem', borderBottom: '0.0625rem solid #edf0f2' }}>
{SHEETS.map((item) => ( {SHEETS.map((item) => (
<Tab key={item.value} value={item.value} label={item.label} sx={{ textTransform: 'none', alignItems: 'flex-start', textAlign: 'left', minHeight: '3rem' }} /> <Tab
key={item.value}
value={item.value}
label={item.label}
sx={{ textTransform: 'none', alignItems: 'flex-start', textAlign: 'left', minHeight: '3rem' }}
/>
))} ))}
</Tabs> </Tabs>
<SvodFilters <SvodFilters

7
web/src/pages/Svod2Page/svod2Styles.js
View File

@ -115,3 +115,10 @@ export const SVOD2_TABLE_CONTAINER_SX = {
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
}, },
}; };
// Виртуализация колонок требует grid-no-grow (без растяжения ячеек) и enableColumnPinning
// (иначе MRT не учитывает закреплённые колонки в левом отступе виртуализатора).
export const SVOD2_LAYOUT_OPTIONS = {
layoutMode: 'grid-no-grow',
enableColumnPinning: true,
};

6
web/src/pages/Svod2Page/svod2Styles.test.js
View File

@ -1,6 +1,7 @@
import assert from 'node:assert/strict'; import assert from 'node:assert/strict';
import test from 'node:test'; import test from 'node:test';
import { import {
SVOD2_LAYOUT_OPTIONS,
SVOD2_TABLE_CONTAINER_SX, SVOD2_TABLE_CONTAINER_SX,
createColumnBandMap, createColumnBandMap,
createColumnClassMap, createColumnClassMap,
@ -65,3 +66,8 @@ test('container styles define cell, band, group-end and pinned rules', () => {
assert.ok(SVOD2_TABLE_CONTAINER_SX[key], key); assert.ok(SVOD2_TABLE_CONTAINER_SX[key], key);
} }
}); });
test('column virtualization layout uses grid-no-grow and column pinning', () => {
assert.equal(SVOD2_LAYOUT_OPTIONS.layoutMode, 'grid-no-grow');
assert.equal(SVOD2_LAYOUT_OPTIONS.enableColumnPinning, true);
});