web/src/components/RealtimeTable/Cell/Cell/Cell.jsx

@@ -149,34 +149,24 @@ const CellComponent = ({
 	isUpdating,
 	onCellNumberClick,
 	isInvalid,
-	vspOptions,
 }) => {
 	const { lockedCells } = useRealtime();
 	const cellKey = `${row.id}_${column.id}`;
 	const isLocked = lockedCells.includes(cellKey);
 
-	const isVspDropdown = column?.columnDef?.editType === 'vsp_dropdown';
-
 	// Мемоизация значения
 	const { rawValue, displayValue, isNumeric } = useMemo(() => {
 		const value = cell.getValue();
 		const isNum = value !== null && value !== undefined && value !== '' && !Number.isNaN(Number(value));
 		let display = String(value || '');
 
-		if (isVspDropdown && value != null) {
-			const vsp = vspOptions?.find(v => v.id === Number(value));
-			if (vsp) {
-				return { rawValue: value, displayValue: vsp.registration_number, isNumeric: false };
-			}
-		}
-
 		if (isNum) {
 			const asInteger = INTEGER_COLUMN_IDS.has(column.id);
 			display = formatNumber(value, asInteger);
 		}
 
 		return { rawValue: value, displayValue: display, isNumeric: isNum };
-	}, [cell, column.id, isVspDropdown, vspOptions]);
+	}, [cell, column.id]);
 
 	const highlightedContent = useMemo(() => {
 		const searchQueries = [globalFilter, columnFilter];
@@ -233,8 +223,7 @@ const Cell = React.memo(CellComponent, (prevProps, nextProps) => {
 		prevProps.isInvalid === nextProps.isInvalid &&
 		prevProps.isEditable === nextProps.isEditable &&
 		prevProps.isUpdating === nextProps.isUpdating &&
-		prevProps.onCellNumberClick === nextProps.onCellNumberClick &&
-		prevProps.vspOptions === nextProps.vspOptions
+		prevProps.onCellNumberClick === nextProps.onCellNumberClick
 	);
 });
 

web/src/components/RealtimeTable/Cell/EditCell/VspDropdownEditCell.jsx

@@ -1,113 +0,0 @@
-import React, { memo, useEffect, useRef, useLayoutEffect, useState, useCallback, useMemo } from 'react';
-import { FormControl, Select, MenuItem } from '@mui/material';
-import { useRealtime } from '../../contexts/RealtimeContext';
-
-const EDITOR_STYLES = {
-  position: 'absolute',
-  zIndex: 12,
-  top: 0,
-};
-
-const VspDropdownEditCell = memo(({ refCell, onChange, disabled, value, table }) => {
-  const { endEditing: contextEndEditing, vspOptions } = useRealtime();
-
-  const [selectedValue, setSelectedValue] = useState(() => value ?? '');
-  const [position, setPosition] = useState();
-  const [open, setOpen] = useState(false);
-
-  const refFinished = useRef(false);
-
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      setOpen(true);
-    }, 80);
-    return () => clearTimeout(timer);
-  }, []);
-
-  useLayoutEffect(() => {
-    if (!refCell?.current) return;
-
-    const td = refCell.current.offsetParent;
-    const tr = td?.offsetParent;
-
-    if (td && tr) {
-      setPosition({
-        left: td.offsetLeft,
-        width: td.offsetWidth,
-        translateY: tr.style.transform || '',
-      });
-    }
-  }, [refCell]);
-
-  const finishEditing = useCallback(() => {
-    if (refFinished.current) return;
-    refFinished.current = true;
-    table.setEditingCell(null);
-    const editingCell = table.getState().editingCell;
-    if (editingCell) {
-      contextEndEditing?.(editingCell.row, editingCell.column);
-    }
-  }, [table, contextEndEditing]);
-
-  const handleSelectChange = useCallback((e) => {
-    const val = e.target.value;
-    if (val == null || val === '') return;
-    refFinished.current = true;
-    setSelectedValue(val);
-    onChange?.(val);
-    const editingCell = table.getState().editingCell;
-    if (editingCell) {
-      contextEndEditing?.(editingCell.row, editingCell.column);
-    }
-  }, [onChange, table, contextEndEditing]);
-
-  const handleSelectClose = useCallback((_event, reason) => {
-    if (reason === 'selectOption') return;
-    finishEditing();
-  }, [finishEditing]);
-
-  const editorStyles = useMemo(() => ({
-    ...EDITOR_STYLES,
-    left: position?.left || 0,
-    width: position?.width || 0,
-    transform: position?.translateY || 0,
-  }), [position]);
-
-  return (
-    <tr>
-      <td>
-        {position &&
-          <div style={editorStyles}>
-            <FormControl fullWidth size="small">
-              <Select
-                value={selectedValue}
-                onChange={handleSelectChange}
-                open={open}
-                onClose={handleSelectClose}
-                displayEmpty
-                disabled={disabled}
-                MenuProps={{
-                  anchorOrigin: { vertical: 'bottom', horizontal: 'left' },
-                  transformOrigin: { vertical: 'top', horizontal: 'left' },
-                }}
-              >
-                <MenuItem value="" disabled>
-                  Выберите ВСП
-                </MenuItem>
-                {vspOptions.map((option) => (
-                  <MenuItem key={option.id} value={option.id}>
-                    {option.registration_number}
-                  </MenuItem>
-                ))}
-              </Select>
-            </FormControl>
-          </div>
-        }
-      </td>
-    </tr>
-  );
-});
-
-VspDropdownEditCell.displayName = 'VspDropdownEditCell';
-
-export default VspDropdownEditCell;

web/src/components/RealtimeTable/RealtimeTable.jsx

@@ -32,9 +32,7 @@ import { getRowId } from './utils/rowUtils';
 import { FORM_TYPE_OPTIONS } from '../../constants/constants';
 import { debounce } from '@mui/material';
 import { CreateProgramModal } from './Modals/CreateProgramProjectModal';
-
 import { FormsNoCanAddRow } from './constants/formConfig';
-import { DictVspApi } from '../../api/dict-vsp';
 
 const RealtimeTable = ({ formType, formId, sheetName, direction, year }) => {
 	const { data, setData, columnsCurStage, isLoading: isTableLoading, editingCells: dataEditingCells } = useRealtimeData(formId, sheetName, direction, formType, year);
@@ -97,7 +95,6 @@ const RealtimeTable = ({ formType, formId, sheetName, direction, year }) => {
 		startEditing: contextStartEditing,
 		addProgram: contextAddProgram,
 		addProject: contextAddProject,
-		setVspOptions,
 	} = useRealtime();
 
 	const {
@@ -147,27 +144,6 @@ const RealtimeTable = ({ formType, formId, sheetName, direction, year }) => {
 		loadConfig();
 	}, [formType, sheetName]);
 
-	useEffect(() => {
-		if (!formId || !columnsConfig?.columns) return;
-
-		const hasVspDropdown = (cols) => {
-			for (const col of cols) {
-				if (col.editType === 'vsp_dropdown') return true;
-				if (col.columns && hasVspDropdown(col.columns)) return true;
-			}
-			return false;
-		};
-
-		if (!hasVspDropdown(columnsConfig.columns)) return;
-
-		DictVspApi.getDropdownVsp({ form_id: formId }).then(data => {
-			if (data.success) {
-				setVspOptions(data.result);
-			}
-		});
-	}, [formId, columnsConfig, setVspOptions]);
-
-
 	const handleUpdateCell = useCallback(async (row, column, value) => {
 		return await contextUpdateCell(row, column, value);
 	}, [contextUpdateCell]);

web/src/components/RealtimeTable/contexts/RealtimeContext.js

@@ -43,8 +43,6 @@ export const RealtimeProvider = ({
 
 	//для ячеек которые редактируются другими пользователями
 	const [lockedCells, setLockedCells] = useState([]);
-	const [vspOptions, setVspOptions] = useState([]);
-
 	const handleMessage = useCallback((data) => {
 		// Обработка ошибок
 		if (data.error) {
@@ -447,8 +445,6 @@ export const RealtimeProvider = ({
 				retryLogin,
 				lockedCells,
 				setLockedCells,
-				vspOptions,
-				setVspOptions,
 				releaseAllLocks: () => releaseAllLocks(userId),
 			}}
 		>

web/src/components/RealtimeTable/tableColumns.jsx

@@ -2,14 +2,11 @@ import React, { useEffect, useRef, useState, useMemo, useCallback } from 'react'
 import { createPortal } from 'react-dom';
 import { useParams } from 'react-router';
 import { useRealtime } from './contexts/RealtimeContext';
-
 import { sectionCodeColor } from './constants/columnConfig';
 import { blueColumn, greenColumn } from './constants/columnColors';
 import { useAuth } from '../../app/context/AuthProvider';
 import { ROLES_NAME_ID } from '../../constants/constants';
 
-import VspDropdownEditCell from './Cell/EditCell/VspDropdownEditCell';
-
 const EditCellPortal = React.memo(({
 	cell,
 	table,
@@ -67,23 +64,13 @@ const EditCellPortal = React.memo(({
 		cellId: `${cell.row.id}_${cell.column.id}`,
 	}), [cell, isEditable, handleChange, tableKey, table]);
 
-	const editType = cell.column.columnDef?.editType;
-
 	const portalContent = useMemo(() => {
 		if (!refTbody || isSaving) return null;
-
-		if (editType === 'vsp_dropdown') {
-			return createPortal(
-				<VspDropdownEditCell {...editCellProps} />,
-				refTbody
-			);
-		}
-
 		return createPortal(
 			<EditCell {...editCellProps} />,
 			refTbody
 		);
-	}, [refTbody, isSaving, editCellProps, EditCell, editType]);
+	}, [refTbody, isSaving, editCellProps, EditCell]);
 
 	return (
 		<>
@@ -191,16 +178,14 @@ export const getTableColumns = ({
 	const processColumns = (columns) => {
 		for (const col of columns) {
 			col.Cell = ({ cell, table, column, row }) => {
-				const { vspOptions } = useRealtime();
 				const props = getCachedCellProps(row, column, table);
 
 				const cellProps = useMemo(() => ({
 					row,
 					column,
 					cell,
-					vspOptions,
 					...props,
-				}), [row, column, cell, props, vspOptions,]);
+				}), [row, column, cell, props]);
 
 				return <Cell {...cellProps} />;
 			};
@@ -221,16 +206,11 @@ export const getTableColumns = ({
 				return editComponent;
 			};
 
-			if (col.editType === 'vsp_dropdown') {
-				col.enableEditing = (row) => row?.original?.row_type === 'INPUT';
-			}
-
 			if (col.columns?.length) {
 				processColumns(col.columns);
 			}
 		}
-	}
-
+	};
 
 	processColumns(columns);