From 573ab61563dab7d419ccba07db3ee89f383c45ef Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Thu, 25 Jun 2026 14:22:53 +0300 Subject: [PATCH] update hierarchy page --- src/pages/hierarchies/HierarchiesPage.tsx | 17 +- .../components/ChainVisualization.tsx | 178 +++++++++++++----- .../components/HierarchyEditModal.tsx | 3 +- 3 files changed, 146 insertions(+), 52 deletions(-) diff --git a/src/pages/hierarchies/HierarchiesPage.tsx b/src/pages/hierarchies/HierarchiesPage.tsx index 1d8a9f6..1a443aa 100644 --- a/src/pages/hierarchies/HierarchiesPage.tsx +++ b/src/pages/hierarchies/HierarchiesPage.tsx @@ -25,6 +25,7 @@ import { IconPlus, IconInfoCircle, IconCheck, + IconCopy, } from '@tabler/icons-react' import { modals } from '@mantine/modals' import { notifications } from '@mantine/notifications' @@ -68,6 +69,15 @@ export default function HierarchiesPage() { const [createModalOpened, setCreateModalOpened] = useState(false) const [presetGroup, setPresetGroup] = useState(null) + // Добавляем состояние для дублирования + const [duplicateGroup, setDuplicateGroup] = useState(null) + + // Обработчик дублирования + const handleDuplicateChain = (group: ChainGroup) => { + setDuplicateGroup(group) + setCreateModalOpened(true) + } + // Загружаем темы только для выбранной категории (если она выбрана) const { data: categoryTopics } = useTopics({ limit: 1000, @@ -226,6 +236,7 @@ export default function HierarchiesPage() { setEditHierarchy(null) setCreateModalOpened(false) setPresetGroup(null) + setDuplicateGroup(null) // 🆕 } const isAllSelected = (data?.data?.length ?? 0) > 0 && selectedIds.length === (data?.data?.length ?? 0) @@ -349,6 +360,7 @@ export default function HierarchiesPage() { onEditStep={handleEditStep} onDeleteStep={handleDelete} onAddStep={handleAddStep} + onDuplicateChain={handleDuplicateChain} /> )) )} @@ -536,8 +548,9 @@ export default function HierarchiesPage() { {/* Модальные окна */} diff --git a/src/pages/hierarchies/components/ChainVisualization.tsx b/src/pages/hierarchies/components/ChainVisualization.tsx index fcebcc7..249cf81 100644 --- a/src/pages/hierarchies/components/ChainVisualization.tsx +++ b/src/pages/hierarchies/components/ChainVisualization.tsx @@ -9,6 +9,7 @@ import { Box, ThemeIcon, Tooltip, + Divider, } from '@mantine/core' import { IconArrowRight, @@ -18,6 +19,9 @@ import { IconWorld, IconCategory, IconFileText, + IconCopy, + IconShield, + IconCheck, } from '@tabler/icons-react' import type { ChainGroup } from '@/features/hierarchies/utils' import { SCOPE_COLORS, SCOPE_LABELS } from '@/features/hierarchies/utils' @@ -27,6 +31,7 @@ interface ChainVisualizationProps { onEditStep: (hierarchyId: number) => void onDeleteStep: (hierarchyId: number) => void onAddStep: (group: ChainGroup) => void + onDuplicateChain: (group: ChainGroup) => void } const ScopeIcon = ({ type }: { type: string }) => { @@ -43,56 +48,107 @@ export default function ChainVisualization({ onEditStep, onDeleteStep, onAddStep, + onDuplicateChain, }: ChainVisualizationProps) { return ( - + {/* Заголовок группы */} - + {group.subordinateName.charAt(0)} - - {group.subordinateName} + + {group.subordinateName} {group.departmentName} + + } + size="lg" > {SCOPE_LABELS[group.scopeType]}: {group.scopeObjectName} - - onAddStep(group)} - > - - - + + + onAddStep(group)} + > + + + + + onDuplicateChain(group)} + > + + + + - - + + + + + {/* Карточка инициатора */} - - ИНИЦИАТОР - + + } + > + ИНИЦИАТОР + + {group.subordinateName.charAt(0)} - + {group.subordinateName} @@ -100,36 +156,58 @@ export default function ChainVisualization({ {/* Шаги согласования */} {group.steps.map((step, index) => ( - - {/* Стрелка */} - + + {/* Стрелка с номером */} + + + + {index + 1} + + {/* Карточка согласующего */} onEditStep(step.id!)} - className="hover-shadow" + className="approver-card" > - + - + } + > ШАГ {index + 1} - - + + #{step.priority} - + {step.approver?.full_name?.charAt(0) || '?'} - + {step.approver?.full_name || '—'} @@ -137,28 +215,28 @@ export default function ChainVisualization({ { e.stopPropagation() onEditStep(step.id!) }} > - + { e.stopPropagation() onDeleteStep(step.id!) }} > - + @@ -170,11 +248,15 @@ export default function ChainVisualization({ + .chain-card:hover { + transform: translateY(-2px); + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); + } + .approver-card:hover { + transform: translateY(-3px); + box-shadow: 0 4px 12px rgba(76, 175, 80, 0.3); + } + `} ) } \ No newline at end of file diff --git a/src/pages/hierarchies/components/HierarchyEditModal.tsx b/src/pages/hierarchies/components/HierarchyEditModal.tsx index 47321b4..73685dc 100644 --- a/src/pages/hierarchies/components/HierarchyEditModal.tsx +++ b/src/pages/hierarchies/components/HierarchyEditModal.tsx @@ -189,7 +189,6 @@ export default function HierarchyEditModal({ >
- {/* Подчинённый */}