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,
|
IconPlus,
|
||||||
IconInfoCircle,
|
IconInfoCircle,
|
||||||
IconCheck,
|
IconCheck,
|
||||||
|
IconCopy,
|
||||||
} from '@tabler/icons-react'
|
} from '@tabler/icons-react'
|
||||||
import { modals } from '@mantine/modals'
|
import { modals } from '@mantine/modals'
|
||||||
import { notifications } from '@mantine/notifications'
|
import { notifications } from '@mantine/notifications'
|
||||||
|
|
@ -68,6 +69,15 @@ export default function HierarchiesPage() {
|
||||||
const [createModalOpened, setCreateModalOpened] = useState(false)
|
const [createModalOpened, setCreateModalOpened] = useState(false)
|
||||||
const [presetGroup, setPresetGroup] = useState<ChainGroup | null>(null)
|
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({
|
const { data: categoryTopics } = useTopics({
|
||||||
limit: 1000,
|
limit: 1000,
|
||||||
|
|
@ -226,6 +236,7 @@ export default function HierarchiesPage() {
|
||||||
setEditHierarchy(null)
|
setEditHierarchy(null)
|
||||||
setCreateModalOpened(false)
|
setCreateModalOpened(false)
|
||||||
setPresetGroup(null)
|
setPresetGroup(null)
|
||||||
|
setDuplicateGroup(null) // 🆕
|
||||||
}
|
}
|
||||||
|
|
||||||
const isAllSelected = (data?.data?.length ?? 0) > 0 && selectedIds.length === (data?.data?.length ?? 0)
|
const isAllSelected = (data?.data?.length ?? 0) > 0 && selectedIds.length === (data?.data?.length ?? 0)
|
||||||
|
|
@ -349,6 +360,7 @@ export default function HierarchiesPage() {
|
||||||
onEditStep={handleEditStep}
|
onEditStep={handleEditStep}
|
||||||
onDeleteStep={handleDelete}
|
onDeleteStep={handleDelete}
|
||||||
onAddStep={handleAddStep}
|
onAddStep={handleAddStep}
|
||||||
|
onDuplicateChain={handleDuplicateChain}
|
||||||
/>
|
/>
|
||||||
))
|
))
|
||||||
)}
|
)}
|
||||||
|
|
@ -536,8 +548,9 @@ export default function HierarchiesPage() {
|
||||||
|
|
||||||
{/* Модальные окна */}
|
{/* Модальные окна */}
|
||||||
<HierarchyEditModal
|
<HierarchyEditModal
|
||||||
hierarchy={editHierarchy}
|
hierarchy={null}
|
||||||
opened={editHierarchy !== null}
|
presetGroup={duplicateGroup || presetGroup}
|
||||||
|
opened={createModalOpened}
|
||||||
onClose={handleCloseModal}
|
onClose={handleCloseModal}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import {
|
||||||
Box,
|
Box,
|
||||||
ThemeIcon,
|
ThemeIcon,
|
||||||
Tooltip,
|
Tooltip,
|
||||||
|
Divider,
|
||||||
} from '@mantine/core'
|
} from '@mantine/core'
|
||||||
import {
|
import {
|
||||||
IconArrowRight,
|
IconArrowRight,
|
||||||
|
|
@ -18,6 +19,9 @@ import {
|
||||||
IconWorld,
|
IconWorld,
|
||||||
IconCategory,
|
IconCategory,
|
||||||
IconFileText,
|
IconFileText,
|
||||||
|
IconCopy,
|
||||||
|
IconShield,
|
||||||
|
IconCheck,
|
||||||
} from '@tabler/icons-react'
|
} from '@tabler/icons-react'
|
||||||
import type { ChainGroup } from '@/features/hierarchies/utils'
|
import type { ChainGroup } from '@/features/hierarchies/utils'
|
||||||
import { SCOPE_COLORS, SCOPE_LABELS } from '@/features/hierarchies/utils'
|
import { SCOPE_COLORS, SCOPE_LABELS } from '@/features/hierarchies/utils'
|
||||||
|
|
@ -27,6 +31,7 @@ interface ChainVisualizationProps {
|
||||||
onEditStep: (hierarchyId: number) => void
|
onEditStep: (hierarchyId: number) => void
|
||||||
onDeleteStep: (hierarchyId: number) => void
|
onDeleteStep: (hierarchyId: number) => void
|
||||||
onAddStep: (group: ChainGroup) => void
|
onAddStep: (group: ChainGroup) => void
|
||||||
|
onDuplicateChain: (group: ChainGroup) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
const ScopeIcon = ({ type }: { type: string }) => {
|
const ScopeIcon = ({ type }: { type: string }) => {
|
||||||
|
|
@ -43,56 +48,107 @@ export default function ChainVisualization({
|
||||||
onEditStep,
|
onEditStep,
|
||||||
onDeleteStep,
|
onDeleteStep,
|
||||||
onAddStep,
|
onAddStep,
|
||||||
|
onDuplicateChain,
|
||||||
}: ChainVisualizationProps) {
|
}: ChainVisualizationProps) {
|
||||||
return (
|
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 justify="space-between" mb="md">
|
||||||
<Group gap="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)}
|
{group.subordinateName.charAt(0)}
|
||||||
</Avatar>
|
</Avatar>
|
||||||
<Stack gap={0}>
|
<Stack gap={2}>
|
||||||
<Text fw={600} size="sm">{group.subordinateName}</Text>
|
<Text fw={700} size="sm">{group.subordinateName}</Text>
|
||||||
<Text size="xs" c="dimmed">{group.departmentName}</Text>
|
<Text size="xs" c="dimmed">{group.departmentName}</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
||||||
|
<Divider orientation="vertical" />
|
||||||
|
|
||||||
<Badge
|
<Badge
|
||||||
variant="light"
|
variant="filled"
|
||||||
color={SCOPE_COLORS[group.scopeType]}
|
color={SCOPE_COLORS[group.scopeType]}
|
||||||
leftSection={<ScopeIcon type={group.scopeType} />}
|
leftSection={<ScopeIcon type={group.scopeType} />}
|
||||||
|
size="lg"
|
||||||
>
|
>
|
||||||
{SCOPE_LABELS[group.scopeType]}: {group.scopeObjectName}
|
{SCOPE_LABELS[group.scopeType]}: {group.scopeObjectName}
|
||||||
</Badge>
|
</Badge>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Tooltip label="Добавить шаг">
|
<Group gap="xs">
|
||||||
<ActionIcon
|
<Tooltip label="Добавить шаг">
|
||||||
variant="light"
|
<ActionIcon
|
||||||
color="green"
|
variant="filled"
|
||||||
onClick={() => onAddStep(group)}
|
color="green"
|
||||||
>
|
size="md"
|
||||||
<IconUser size={16} />
|
onClick={() => onAddStep(group)}
|
||||||
</ActionIcon>
|
>
|
||||||
</Tooltip>
|
<IconUser size={18} />
|
||||||
|
</ActionIcon>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip label="Дублировать цепочку">
|
||||||
|
<ActionIcon
|
||||||
|
variant="filled"
|
||||||
|
color="violet"
|
||||||
|
size="md"
|
||||||
|
onClick={() => onDuplicateChain(group)}
|
||||||
|
>
|
||||||
|
<IconCopy size={18} />
|
||||||
|
</ActionIcon>
|
||||||
|
</Tooltip>
|
||||||
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Box style={{ overflowX: 'auto' }}>
|
<Divider mb="md" />
|
||||||
<Group gap="xs" wrap="nowrap" align="center">
|
|
||||||
|
<Box style={{ overflowX: 'auto', padding: '8px 0' }}>
|
||||||
|
<Group gap="sm" wrap="nowrap" align="center">
|
||||||
|
{/* Карточка инициатора */}
|
||||||
<Paper
|
<Paper
|
||||||
withBorder
|
withBorder
|
||||||
p="sm"
|
p="md"
|
||||||
style={{
|
style={{
|
||||||
minWidth: 140,
|
minWidth: 160,
|
||||||
backgroundColor: 'var(--mantine-color-gray-0)',
|
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">
|
<Stack gap={6} align="center">
|
||||||
<Text size="xs" c="dimmed" fw={600}>ИНИЦИАТОР</Text>
|
<Badge
|
||||||
<Avatar size="md" radius="xl" color="gray">
|
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)}
|
{group.subordinateName.charAt(0)}
|
||||||
</Avatar>
|
</Avatar>
|
||||||
<Text size="xs" fw={500} ta="center" lineClamp={2}>
|
<Text size="sm" fw={600} ta="center" lineClamp={2}>
|
||||||
{group.subordinateName}
|
{group.subordinateName}
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
@ -100,36 +156,58 @@ export default function ChainVisualization({
|
||||||
|
|
||||||
{/* Шаги согласования */}
|
{/* Шаги согласования */}
|
||||||
{group.steps.map((step, index) => (
|
{group.steps.map((step, index) => (
|
||||||
<Group key={step.id} gap="xs" wrap="nowrap" align="center">
|
<Group key={step.id} gap="sm" wrap="nowrap" align="center">
|
||||||
{/* Стрелка */}
|
{/* Стрелка с номером */}
|
||||||
<IconArrowRight size={20} color="var(--mantine-color-gray-5)" />
|
<Stack gap={2} align="center">
|
||||||
|
<IconArrowRight size={24} color="#495057" />
|
||||||
|
<Badge
|
||||||
|
variant="light"
|
||||||
|
color="gray"
|
||||||
|
size="xs"
|
||||||
|
circle
|
||||||
|
>
|
||||||
|
{index + 1}
|
||||||
|
</Badge>
|
||||||
|
</Stack>
|
||||||
|
|
||||||
{/* Карточка согласующего */}
|
{/* Карточка согласующего */}
|
||||||
<Paper
|
<Paper
|
||||||
withBorder
|
withBorder
|
||||||
p="sm"
|
p="md"
|
||||||
style={{
|
style={{
|
||||||
minWidth: 140,
|
minWidth: 160,
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
transition: 'all 0.2s',
|
transition: 'all 0.2s ease',
|
||||||
borderColor: 'var(--mantine-color-blue-4)',
|
borderColor: '#4caf50',
|
||||||
|
background: 'linear-gradient(135deg, #e8f5e9 0%, #c8e6c9 100%)',
|
||||||
|
boxShadow: '0 2px 8px rgba(76, 175, 80, 0.2)',
|
||||||
}}
|
}}
|
||||||
onClick={() => onEditStep(step.id!)}
|
onClick={() => onEditStep(step.id!)}
|
||||||
className="hover-shadow"
|
className="approver-card"
|
||||||
>
|
>
|
||||||
<Stack gap={4} align="center">
|
<Stack gap={6} align="center">
|
||||||
<Group gap={4}>
|
<Group gap={4}>
|
||||||
<Text size="xs" c="dimmed" fw={600}>
|
<Badge
|
||||||
|
variant="filled"
|
||||||
|
color="green"
|
||||||
|
size="sm"
|
||||||
|
leftSection={<IconShield size={12} />}
|
||||||
|
>
|
||||||
ШАГ {index + 1}
|
ШАГ {index + 1}
|
||||||
</Text>
|
</Badge>
|
||||||
<Badge size="xs" variant="light" color="blue">
|
<Badge size="xs" variant="light" color="gray">
|
||||||
#{step.priority}
|
#{step.priority}
|
||||||
</Badge>
|
</Badge>
|
||||||
</Group>
|
</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) || '?'}
|
{step.approver?.full_name?.charAt(0) || '?'}
|
||||||
</Avatar>
|
</Avatar>
|
||||||
<Text size="xs" fw={500} ta="center" lineClamp={2}>
|
<Text size="sm" fw={600} ta="center" lineClamp={2}>
|
||||||
{step.approver?.full_name || '—'}
|
{step.approver?.full_name || '—'}
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
|
|
@ -137,28 +215,28 @@ export default function ChainVisualization({
|
||||||
<Group gap={4} mt={4}>
|
<Group gap={4} mt={4}>
|
||||||
<Tooltip label="Редактировать">
|
<Tooltip label="Редактировать">
|
||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="subtle"
|
variant="filled"
|
||||||
color="blue"
|
color="blue"
|
||||||
size="xs"
|
size="sm"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
onEditStep(step.id!)
|
onEditStep(step.id!)
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<IconPencil size={12} />
|
<IconPencil size={14} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip label="Удалить">
|
<Tooltip label="Удалить">
|
||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="subtle"
|
variant="filled"
|
||||||
color="red"
|
color="red"
|
||||||
size="xs"
|
size="sm"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
onDeleteStep(step.id!)
|
onDeleteStep(step.id!)
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<IconTrash size={12} />
|
<IconTrash size={14} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
@ -170,11 +248,15 @@ export default function ChainVisualization({
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<style>{`
|
<style>{`
|
||||||
.hover-shadow:hover {
|
.chain-card:hover {
|
||||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
transform: translateY(-2px);
|
||||||
transform: translateY(-2px);
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
||||||
}
|
}
|
||||||
`}</style>
|
.approver-card:hover {
|
||||||
|
transform: translateY(-3px);
|
||||||
|
box-shadow: 0 4px 12px rgba(76, 175, 80, 0.3);
|
||||||
|
}
|
||||||
|
`}</style>
|
||||||
</Paper>
|
</Paper>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -189,7 +189,6 @@ export default function HierarchyEditModal({
|
||||||
>
|
>
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
<form onSubmit={form.onSubmit(handleSubmit)}>
|
||||||
<Stack gap="md">
|
<Stack gap="md">
|
||||||
{/* Подчинённый */}
|
|
||||||
<Select
|
<Select
|
||||||
label="Сотрудник (инициатор)"
|
label="Сотрудник (инициатор)"
|
||||||
placeholder="Выберите пользователя"
|
placeholder="Выберите пользователя"
|
||||||
|
|
@ -198,7 +197,7 @@ export default function HierarchyEditModal({
|
||||||
onChange={(v) => form.setFieldValue('subordinate_id', v ? Number(v) : null)}
|
onChange={(v) => form.setFieldValue('subordinate_id', v ? Number(v) : null)}
|
||||||
searchable
|
searchable
|
||||||
required
|
required
|
||||||
disabled={isEditMode || !!presetGroup}
|
disabled={!!presetGroup}
|
||||||
description="Пользователь, для которого настраивается согласование"
|
description="Пользователь, для которого настраивается согласование"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue