diff --git a/web/src/components/RealtimeTable/RealtimeTable.jsx b/web/src/components/RealtimeTable/RealtimeTable.jsx index fed81fe..8a0e1c3 100644 --- a/web/src/components/RealtimeTable/RealtimeTable.jsx +++ b/web/src/components/RealtimeTable/RealtimeTable.jsx @@ -143,7 +143,7 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => { } }, columnVirtualizerOptions: ({ table }) => ({ - overscan: 1, + overscan: 10, measureElement: (el) => { if (!el) return 150; const index = Number(el?.getAttribute?.('data-index')); @@ -152,7 +152,6 @@ const RealtimeTable = ({ formType, formId, sheetName, direction }) => { const colId = table.getState().columnPinning.left[index]; const column = table.getColumn(colId); return column.columnDef.size; - } const allCols = [...table.getLeftVisibleLeafColumns(), ...table.getCenterVisibleLeafColumns()] return allCols[index]?.getSize() ?? 150; diff --git a/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx b/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx index 014ab61..6644329 100644 --- a/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx +++ b/web/src/components/RealtimeTable/SettingPanel/SettingPanel.jsx @@ -168,7 +168,7 @@ const SettingPanel = ({ diff --git a/web/src/components/Stages/AddStagesModal.jsx b/web/src/components/Stages/AddStagesModal.jsx index ea75b6d..f4ac2ca 100644 --- a/web/src/components/Stages/AddStagesModal.jsx +++ b/web/src/components/Stages/AddStagesModal.jsx @@ -38,13 +38,12 @@ export const AddStagesModal = ({ sheetOptions = [], // [{ value: 'sheet1', label: 'Лист 1' }] formType = '', defaultSheet = '', - defaultRole, }) => { const [startDate, setStartDate] = useState(null); const [endDate, setEndDate] = useState(null); const [stageName, setStageName] = useState(''); const [selectedSheet, setSelectedSheet] = useState(defaultSheet); - const [selectedRole, setSelectedRole] = useState(defaultRole); + const [selectedRole, setSelectedRole] = useState(); const [columnsConfig, setColumnsConfig] = useState({ columns: [], colors: {} }); const [selectedColumns, setSelectedColumns] = useState([]); @@ -89,10 +88,10 @@ export const AddStagesModal = ({ setEndDate(null); setStageName(''); setSelectedSheet(defaultSheet); - setSelectedRole(defaultRole); + setSelectedRole(); setSelectedColumns([]); } - }, [stage, isOpen, defaultSheet, defaultRole]); + }, [stage, isOpen, defaultSheet]); const handleSave = () => { const opensAt = formatDateForApi(startDate); @@ -129,7 +128,7 @@ export const AddStagesModal = ({ setEndDate(null); setStageName(''); setSelectedSheet(defaultSheet); - setSelectedRole(defaultRole); + setSelectedRole(); setSelectedColumns([]); onClose(); }; @@ -238,6 +237,7 @@ export const AddStagesModal = ({ placeholderSelect="Выбрано столбцов: " selectedIds={selectedColumns} onSelectNode={handleColumnsSelect} + forStage={true} /> @@ -247,7 +247,7 @@ export const AddStagesModal = ({ Роль