update hierarchy page
Deploy Frontend / build-and-deploy (push) Successful in 27s
Details
Deploy Frontend / build-and-deploy (push) Successful in 27s
Details
This commit is contained in:
parent
74bf66554b
commit
573ab61563
|
|
@ -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<ChainGroup | null>(null)
|
||||
|
||||
// Добавляем состояние для дублирования
|
||||
const [duplicateGroup, setDuplicateGroup] = useState<ChainGroup | null>(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() {
|
|||
|
||||
{/* Модальные окна */}
|
||||
<HierarchyEditModal
|
||||
hierarchy={editHierarchy}
|
||||
opened={editHierarchy !== null}
|
||||
hierarchy={null}
|
||||
presetGroup={duplicateGroup || presetGroup}
|
||||
opened={createModalOpened}
|
||||
onClose={handleCloseModal}
|
||||
/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
<Paper withBorder p="md" mb="md">
|
||||
<Paper
|
||||
withBorder
|
||||
p="md"
|
||||
mb="md"
|
||||
style={{
|
||||
background: 'linear-gradient(135deg, #f8f9fa 0%, #ffffff 100%)',
|
||||
transition: 'all 0.2s ease',
|
||||
}}
|
||||
className="chain-card"
|
||||
>
|
||||
{/* Заголовок группы */}
|
||||
<Group justify="space-between" mb="md">
|
||||
<Group gap="md">
|
||||
<Avatar size="sm" radius="xl" color="blue">
|
||||
<Avatar
|
||||
size="lg"
|
||||
radius="xl"
|
||||
color="blue"
|
||||
style={{
|
||||
boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
|
||||
border: '2px solid white'
|
||||
}}
|
||||
>
|
||||
{group.subordinateName.charAt(0)}
|
||||
</Avatar>
|
||||
<Stack gap={0}>
|
||||
<Text fw={600} size="sm">{group.subordinateName}</Text>
|
||||
<Stack gap={2}>
|
||||
<Text fw={700} size="sm">{group.subordinateName}</Text>
|
||||
<Text size="xs" c="dimmed">{group.departmentName}</Text>
|
||||
</Stack>
|
||||
|
||||
<Divider orientation="vertical" />
|
||||
|
||||
<Badge
|
||||
variant="light"
|
||||
variant="filled"
|
||||
color={SCOPE_COLORS[group.scopeType]}
|
||||
leftSection={<ScopeIcon type={group.scopeType} />}
|
||||
size="lg"
|
||||
>
|
||||
{SCOPE_LABELS[group.scopeType]}: {group.scopeObjectName}
|
||||
</Badge>
|
||||
</Group>
|
||||
|
||||
<Tooltip label="Добавить шаг">
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="green"
|
||||
onClick={() => onAddStep(group)}
|
||||
>
|
||||
<IconUser size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Group gap="xs">
|
||||
<Tooltip label="Добавить шаг">
|
||||
<ActionIcon
|
||||
variant="filled"
|
||||
color="green"
|
||||
size="md"
|
||||
onClick={() => onAddStep(group)}
|
||||
>
|
||||
<IconUser size={18} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Tooltip label="Дублировать цепочку">
|
||||
<ActionIcon
|
||||
variant="filled"
|
||||
color="violet"
|
||||
size="md"
|
||||
onClick={() => onDuplicateChain(group)}
|
||||
>
|
||||
<IconCopy size={18} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
</Group>
|
||||
|
||||
<Box style={{ overflowX: 'auto' }}>
|
||||
<Group gap="xs" wrap="nowrap" align="center">
|
||||
<Divider mb="md" />
|
||||
|
||||
<Box style={{ overflowX: 'auto', padding: '8px 0' }}>
|
||||
<Group gap="sm" wrap="nowrap" align="center">
|
||||
{/* Карточка инициатора */}
|
||||
<Paper
|
||||
withBorder
|
||||
p="sm"
|
||||
p="md"
|
||||
style={{
|
||||
minWidth: 140,
|
||||
backgroundColor: 'var(--mantine-color-gray-0)',
|
||||
minWidth: 160,
|
||||
background: 'linear-gradient(135deg, #e3f2fd 0%, #bbdefb 100%)',
|
||||
borderColor: '#2196f3',
|
||||
boxShadow: '0 2px 8px rgba(33, 150, 243, 0.2)',
|
||||
}}
|
||||
>
|
||||
<Stack gap={4} align="center">
|
||||
<Text size="xs" c="dimmed" fw={600}>ИНИЦИАТОР</Text>
|
||||
<Avatar size="md" radius="xl" color="gray">
|
||||
<Stack gap={6} align="center">
|
||||
<Badge
|
||||
variant="filled"
|
||||
color="blue"
|
||||
size="sm"
|
||||
leftSection={<IconUser size={12} />}
|
||||
>
|
||||
ИНИЦИАТОР
|
||||
</Badge>
|
||||
<Avatar
|
||||
size="lg"
|
||||
radius="xl"
|
||||
color="blue"
|
||||
style={{ border: '3px solid white' }}
|
||||
>
|
||||
{group.subordinateName.charAt(0)}
|
||||
</Avatar>
|
||||
<Text size="xs" fw={500} ta="center" lineClamp={2}>
|
||||
<Text size="sm" fw={600} ta="center" lineClamp={2}>
|
||||
{group.subordinateName}
|
||||
</Text>
|
||||
</Stack>
|
||||
|
|
@ -100,36 +156,58 @@ export default function ChainVisualization({
|
|||
|
||||
{/* Шаги согласования */}
|
||||
{group.steps.map((step, index) => (
|
||||
<Group key={step.id} gap="xs" wrap="nowrap" align="center">
|
||||
{/* Стрелка */}
|
||||
<IconArrowRight size={20} color="var(--mantine-color-gray-5)" />
|
||||
<Group key={step.id} gap="sm" wrap="nowrap" align="center">
|
||||
{/* Стрелка с номером */}
|
||||
<Stack gap={2} align="center">
|
||||
<IconArrowRight size={24} color="#495057" />
|
||||
<Badge
|
||||
variant="light"
|
||||
color="gray"
|
||||
size="xs"
|
||||
circle
|
||||
>
|
||||
{index + 1}
|
||||
</Badge>
|
||||
</Stack>
|
||||
|
||||
{/* Карточка согласующего */}
|
||||
<Paper
|
||||
withBorder
|
||||
p="sm"
|
||||
p="md"
|
||||
style={{
|
||||
minWidth: 140,
|
||||
minWidth: 160,
|
||||
cursor: 'pointer',
|
||||
transition: 'all 0.2s',
|
||||
borderColor: 'var(--mantine-color-blue-4)',
|
||||
transition: 'all 0.2s ease',
|
||||
borderColor: '#4caf50',
|
||||
background: 'linear-gradient(135deg, #e8f5e9 0%, #c8e6c9 100%)',
|
||||
boxShadow: '0 2px 8px rgba(76, 175, 80, 0.2)',
|
||||
}}
|
||||
onClick={() => onEditStep(step.id!)}
|
||||
className="hover-shadow"
|
||||
className="approver-card"
|
||||
>
|
||||
<Stack gap={4} align="center">
|
||||
<Stack gap={6} align="center">
|
||||
<Group gap={4}>
|
||||
<Text size="xs" c="dimmed" fw={600}>
|
||||
<Badge
|
||||
variant="filled"
|
||||
color="green"
|
||||
size="sm"
|
||||
leftSection={<IconShield size={12} />}
|
||||
>
|
||||
ШАГ {index + 1}
|
||||
</Text>
|
||||
<Badge size="xs" variant="light" color="blue">
|
||||
</Badge>
|
||||
<Badge size="xs" variant="light" color="gray">
|
||||
#{step.priority}
|
||||
</Badge>
|
||||
</Group>
|
||||
<Avatar size="md" radius="xl" color="blue">
|
||||
<Avatar
|
||||
size="lg"
|
||||
radius="xl"
|
||||
color="green"
|
||||
style={{ border: '3px solid white' }}
|
||||
>
|
||||
{step.approver?.full_name?.charAt(0) || '?'}
|
||||
</Avatar>
|
||||
<Text size="xs" fw={500} ta="center" lineClamp={2}>
|
||||
<Text size="sm" fw={600} ta="center" lineClamp={2}>
|
||||
{step.approver?.full_name || '—'}
|
||||
</Text>
|
||||
|
||||
|
|
@ -137,28 +215,28 @@ export default function ChainVisualization({
|
|||
<Group gap={4} mt={4}>
|
||||
<Tooltip label="Редактировать">
|
||||
<ActionIcon
|
||||
variant="subtle"
|
||||
variant="filled"
|
||||
color="blue"
|
||||
size="xs"
|
||||
size="sm"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation()
|
||||
onEditStep(step.id!)
|
||||
}}
|
||||
>
|
||||
<IconPencil size={12} />
|
||||
<IconPencil size={14} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Tooltip label="Удалить">
|
||||
<ActionIcon
|
||||
variant="subtle"
|
||||
variant="filled"
|
||||
color="red"
|
||||
size="xs"
|
||||
size="sm"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation()
|
||||
onDeleteStep(step.id!)
|
||||
}}
|
||||
>
|
||||
<IconTrash size={12} />
|
||||
<IconTrash size={14} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
|
|
@ -170,11 +248,15 @@ export default function ChainVisualization({
|
|||
</Box>
|
||||
|
||||
<style>{`
|
||||
.hover-shadow:hover {
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
`}</style>
|
||||
.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);
|
||||
}
|
||||
`}</style>
|
||||
</Paper>
|
||||
)
|
||||
}
|
||||
|
|
@ -189,7 +189,6 @@ export default function HierarchyEditModal({
|
|||
>
|
||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
||||
<Stack gap="md">
|
||||
{/* Подчинённый */}
|
||||
<Select
|
||||
label="Сотрудник (инициатор)"
|
||||
placeholder="Выберите пользователя"
|
||||
|
|
@ -198,7 +197,7 @@ export default function HierarchyEditModal({
|
|||
onChange={(v) => form.setFieldValue('subordinate_id', v ? Number(v) : null)}
|
||||
searchable
|
||||
required
|
||||
disabled={isEditMode || !!presetGroup}
|
||||
disabled={!!presetGroup}
|
||||
description="Пользователь, для которого настраивается согласование"
|
||||
/>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue