fix(boards): keep card order inside a column and show activity priority
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -0,0 +1,3 @@
|
|||||||
|
ALTER TABLE "Activity" ADD COLUMN "boardPosition" INTEGER NOT NULL DEFAULT 0;
|
||||||
|
|
||||||
|
CREATE INDEX "Activity_stageId_boardPosition_idx" ON "Activity"("stageId", "boardPosition");
|
||||||
@@ -896,6 +896,8 @@ model Activity {
|
|||||||
/// مرحله (ستون کانبان)؛ null یا مرحلهٔ ناهمنوع با status → اولین مرحلهٔ همنوع
|
/// مرحله (ستون کانبان)؛ null یا مرحلهٔ ناهمنوع با status → اولین مرحلهٔ همنوع
|
||||||
stageId String?
|
stageId String?
|
||||||
stage ActivityStage? @relation(fields: [stageId], references: [id], onDelete: SetNull)
|
stage ActivityStage? @relation(fields: [stageId], references: [id], onDelete: SetNull)
|
||||||
|
/// ترتیب کارت داخل همان ستون کانبان
|
||||||
|
boardPosition Int @default(0)
|
||||||
/// نوع سفارشی؛ null → نوع اصلیِ همان type
|
/// نوع سفارشی؛ null → نوع اصلیِ همان type
|
||||||
typeDefId String?
|
typeDefId String?
|
||||||
typeDef ActivityTypeDef? @relation(fields: [typeDefId], references: [id], onDelete: SetNull)
|
typeDef ActivityTypeDef? @relation(fields: [typeDefId], references: [id], onDelete: SetNull)
|
||||||
@@ -911,6 +913,7 @@ model Activity {
|
|||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
|
|
||||||
@@index([stageId])
|
@@index([stageId])
|
||||||
|
@@index([stageId, boardPosition])
|
||||||
@@index([boardId])
|
@@index([boardId])
|
||||||
@@index([typeDefId])
|
@@index([typeDefId])
|
||||||
@@index([leadId])
|
@@index([leadId])
|
||||||
|
|||||||
@@ -428,7 +428,13 @@ export class ActivitiesController {
|
|||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@Body() dto: MoveActivityStageDto,
|
@Body() dto: MoveActivityStageDto,
|
||||||
) {
|
) {
|
||||||
return this.activitiesService.moveToStage(user.organizationId, id, user, dto.stageId);
|
return this.activitiesService.moveToStage(
|
||||||
|
user.organizationId,
|
||||||
|
id,
|
||||||
|
user,
|
||||||
|
dto.stageId,
|
||||||
|
dto.position,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch(':id/complete')
|
@Patch(':id/complete')
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import {
|
|||||||
ownerWhere,
|
ownerWhere,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
import { assertAssigneeSet } from '../common/assign-access';
|
import { assertAssigneeSet } from '../common/assign-access';
|
||||||
|
import { placeId, sameIds, writePositions } from '../common/column-order';
|
||||||
import { normalizeTags } from '../common/tags';
|
import { normalizeTags } from '../common/tags';
|
||||||
import { GamificationService } from '../gamification/gamification.service';
|
import { GamificationService } from '../gamification/gamification.service';
|
||||||
import { tehranDayKey } from '../routines/routine-dates';
|
import { tehranDayKey } from '../routines/routine-dates';
|
||||||
@@ -329,9 +330,7 @@ export class ActivitiesService {
|
|||||||
where,
|
where,
|
||||||
include,
|
include,
|
||||||
// روی پروندهٔ لید، تازهترین (از جمله پیگیری آینده) اول بیاید تا از سقف صفحه نیفتد
|
// روی پروندهٔ لید، تازهترین (از جمله پیگیری آینده) اول بیاید تا از سقف صفحه نیفتد
|
||||||
orderBy: entity?.leadId
|
orderBy: this.listOrder(entity, stageScope),
|
||||||
? [{ createdAt: 'desc' }]
|
|
||||||
: [{ dueAt: 'asc' }, { createdAt: 'desc' }],
|
|
||||||
skip: (page - 1) * take,
|
skip: (page - 1) * take,
|
||||||
take,
|
take,
|
||||||
}),
|
}),
|
||||||
@@ -385,7 +384,7 @@ export class ActivitiesService {
|
|||||||
this.prisma.activity.findMany({
|
this.prisma.activity.findMany({
|
||||||
where,
|
where,
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
orderBy: [{ dueAt: 'asc' }, { createdAt: 'desc' }],
|
orderBy: this.listOrder(entity, stageScope),
|
||||||
take: cap,
|
take: cap,
|
||||||
}),
|
}),
|
||||||
this.prisma.activity.count({ where }),
|
this.prisma.activity.count({ where }),
|
||||||
@@ -490,11 +489,46 @@ export class ActivitiesService {
|
|||||||
return { counts, total };
|
return { counts, total };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private listOrder(
|
||||||
|
entity?: { leadId?: string },
|
||||||
|
stageScope?: StageScope,
|
||||||
|
): Prisma.ActivityOrderByWithRelationInput[] {
|
||||||
|
if (entity?.leadId) return [{ createdAt: 'desc' }];
|
||||||
|
if (stageScope && stageScope.stageId !== 'all') {
|
||||||
|
return [{ boardPosition: 'asc' }, { dueAt: 'asc' }, { createdAt: 'desc' }];
|
||||||
|
}
|
||||||
|
return [{ dueAt: 'asc' }, { createdAt: 'desc' }];
|
||||||
|
}
|
||||||
|
|
||||||
|
private async reorderStage(
|
||||||
|
organizationId: string,
|
||||||
|
stageId: string,
|
||||||
|
activityId: string,
|
||||||
|
index: number,
|
||||||
|
) {
|
||||||
|
const where = await this.stages.whereForStage(organizationId, stageId);
|
||||||
|
const rows = await this.prisma.activity.findMany({
|
||||||
|
where,
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: [{ boardPosition: 'asc' }, { dueAt: 'asc' }, { createdAt: 'desc' }],
|
||||||
|
});
|
||||||
|
const currentIds = rows.map((row) => row.id);
|
||||||
|
const placed = placeId(currentIds, activityId, index);
|
||||||
|
if (sameIds(currentIds, placed)) return;
|
||||||
|
await writePositions(
|
||||||
|
(ops) => this.prisma.$transaction(ops),
|
||||||
|
placed,
|
||||||
|
(id, boardPosition) =>
|
||||||
|
this.prisma.activity.update({ where: { id }, data: { boardPosition } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
async moveToStage(
|
async moveToStage(
|
||||||
organizationId: string,
|
organizationId: string,
|
||||||
id: string,
|
id: string,
|
||||||
actor: ActivityActor,
|
actor: ActivityActor,
|
||||||
stageId: string,
|
stageId: string,
|
||||||
|
position?: number,
|
||||||
): Promise<ActivityDto> {
|
): Promise<ActivityDto> {
|
||||||
await this.ensureExists(organizationId, id, actor);
|
await this.ensureExists(organizationId, id, actor);
|
||||||
const stage = await this.stages.get(organizationId, stageId);
|
const stage = await this.stages.get(organizationId, stageId);
|
||||||
@@ -519,6 +553,7 @@ export class ActivitiesService {
|
|||||||
},
|
},
|
||||||
include,
|
include,
|
||||||
});
|
});
|
||||||
|
if (position != null) await this.reorderStage(organizationId, stage.id, id, position);
|
||||||
if (stage.kind === 'done' && existing?.status !== 'done') {
|
if (stage.kind === 'done' && existing?.status !== 'done') {
|
||||||
await this.fireDone(organizationId, row);
|
await this.fireDone(organizationId, row);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -219,6 +219,12 @@ export class ReorderActivityStagesDto {
|
|||||||
export class MoveActivityStageDto {
|
export class MoveActivityStageDto {
|
||||||
@IsString()
|
@IsString()
|
||||||
stageId!: string;
|
stageId!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@Type(() => Number)
|
||||||
|
@IsInt()
|
||||||
|
@Min(0)
|
||||||
|
position?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** محتوای fields در سرویس بر اساس تعریف نوع اعتبارسنجی میشود */
|
/** محتوای fields در سرویس بر اساس تعریف نوع اعتبارسنجی میشود */
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import type { Prisma } from '@prisma/client';
|
||||||
|
|
||||||
|
type PositionUpdate = Prisma.PrismaPromise<unknown>;
|
||||||
|
|
||||||
|
/** کارت را در ایندکس خواستهشده میگذارد. ایندکس نسبت به فهرست بدون خود کارت است. */
|
||||||
|
export function placeId(ids: string[], movingId: string, index: number): string[] {
|
||||||
|
const next = ids.filter((id) => id !== movingId);
|
||||||
|
const at = Math.max(0, Math.min(Math.trunc(index), next.length));
|
||||||
|
next.splice(at, 0, movingId);
|
||||||
|
return next;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function sameIds(left: string[], right: string[]): boolean {
|
||||||
|
return left.length === right.length && left.every((id, index) => id === right[index]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** ترتیب ستون را ۰ تا n ذخیره میکند. */
|
||||||
|
export async function writePositions(
|
||||||
|
transaction: (ops: PositionUpdate[]) => Promise<unknown>,
|
||||||
|
ids: string[],
|
||||||
|
update: (id: string, position: number) => PositionUpdate,
|
||||||
|
) {
|
||||||
|
const size = 60;
|
||||||
|
for (let start = 0; start < ids.length; start += size) {
|
||||||
|
const slice = ids.slice(start, start + size);
|
||||||
|
await transaction(slice.map((id, offset) => update(id, start + offset)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -32,6 +32,7 @@ import {
|
|||||||
forScope,
|
forScope,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
|
import { placeId, sameIds, writePositions } from '../common/column-order';
|
||||||
import {
|
import {
|
||||||
asAddresses,
|
asAddresses,
|
||||||
collectAddresses,
|
collectAddresses,
|
||||||
@@ -613,24 +614,43 @@ export class LeadsService {
|
|||||||
});
|
});
|
||||||
if (!stage) throw new NotFoundException('مرحله پیدا نشد');
|
if (!stage) throw new NotFoundException('مرحله پیدا نشد');
|
||||||
|
|
||||||
|
let placedIds: string[] | null = null;
|
||||||
|
let nextPosition = position ?? 0;
|
||||||
|
if (position != null) {
|
||||||
|
const rows = await this.prisma.lead.findMany({
|
||||||
|
where: { organizationId: actor.organizationId, stageId, archivedAt: null },
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: [{ position: 'asc' }, { updatedAt: 'desc' }],
|
||||||
|
});
|
||||||
|
const currentIds = rows.map((row) => row.id);
|
||||||
|
placedIds = placeId(currentIds, id, position);
|
||||||
|
nextPosition = Math.max(0, placedIds.indexOf(id));
|
||||||
|
if (sameIds(currentIds, placedIds)) placedIds = null;
|
||||||
|
}
|
||||||
|
|
||||||
const row = await this.prisma.lead.update({
|
const row = await this.prisma.lead.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: {
|
data: {
|
||||||
stageId,
|
stageId,
|
||||||
position: position ?? 0,
|
position: nextPosition,
|
||||||
...(stage.isConverted
|
|
||||||
? {}
|
|
||||||
: {}),
|
|
||||||
},
|
},
|
||||||
include: leadInclude,
|
include: leadInclude,
|
||||||
});
|
});
|
||||||
await this.addEvent(
|
if (placedIds) {
|
||||||
actor,
|
await writePositions(
|
||||||
id,
|
(ops) => this.prisma.$transaction(ops),
|
||||||
'stage_changed',
|
placedIds,
|
||||||
`به مرحله «${stage.name}» منتقل شد`,
|
(leadId, leadPosition) =>
|
||||||
);
|
this.prisma.lead.update({ where: { id: leadId }, data: { position: leadPosition } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
if (before.stageId !== stageId) {
|
if (before.stageId !== stageId) {
|
||||||
|
await this.addEvent(
|
||||||
|
actor,
|
||||||
|
id,
|
||||||
|
'stage_changed',
|
||||||
|
`به مرحله «${stage.name}» منتقل شد`,
|
||||||
|
);
|
||||||
this.gameEvent(actor, 'LEAD_STAGE_CHANGED', row, {
|
this.gameEvent(actor, 'LEAD_STAGE_CHANGED', row, {
|
||||||
eventKey: `${id}:${stageId}`,
|
eventKey: `${id}:${stageId}`,
|
||||||
facts: { stageName: stage.name, source: row.source },
|
facts: { stageName: stage.name, source: row.source },
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import {
|
|||||||
resolveOwnerId,
|
resolveOwnerId,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
|
import { placeId, sameIds, writePositions } from '../common/column-order';
|
||||||
|
|
||||||
const dealInclude = {
|
const dealInclude = {
|
||||||
person: { select: { id: true, firstName: true, lastName: true } },
|
person: { select: { id: true, firstName: true, lastName: true } },
|
||||||
@@ -379,7 +380,8 @@ export class DealsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const status = stage.isWon ? 'won' : stage.isLost ? 'lost' : 'open';
|
const status = stage.isWon ? 'won' : stage.isLost ? 'lost' : 'open';
|
||||||
const position =
|
let placedIds: string[] | null = null;
|
||||||
|
let position =
|
||||||
dto.position ??
|
dto.position ??
|
||||||
((
|
((
|
||||||
await this.prisma.deal.aggregate({
|
await this.prisma.deal.aggregate({
|
||||||
@@ -387,6 +389,17 @@ export class DealsService {
|
|||||||
_max: { position: true },
|
_max: { position: true },
|
||||||
})
|
})
|
||||||
)._max.position ?? -1) + 1;
|
)._max.position ?? -1) + 1;
|
||||||
|
if (dto.position != null) {
|
||||||
|
const rows = await this.prisma.deal.findMany({
|
||||||
|
where: { organizationId, stageId: stage.id },
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: [{ position: 'asc' }, { updatedAt: 'desc' }],
|
||||||
|
});
|
||||||
|
const currentIds = rows.map((row) => row.id);
|
||||||
|
placedIds = placeId(currentIds, deal.id, dto.position);
|
||||||
|
position = Math.max(0, placedIds.indexOf(deal.id));
|
||||||
|
if (sameIds(currentIds, placedIds)) placedIds = null;
|
||||||
|
}
|
||||||
|
|
||||||
const row = await this.prisma.deal.update({
|
const row = await this.prisma.deal.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
@@ -402,6 +415,15 @@ export class DealsService {
|
|||||||
include: dealInclude,
|
include: dealInclude,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (placedIds) {
|
||||||
|
await writePositions(
|
||||||
|
(ops) => this.prisma.$transaction(ops),
|
||||||
|
placedIds,
|
||||||
|
(dealId, nextPosition) =>
|
||||||
|
this.prisma.deal.update({ where: { id: dealId }, data: { position: nextPosition } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (deal.ownerId && deal.stageId !== stage.id) {
|
if (deal.ownerId && deal.stageId !== stage.id) {
|
||||||
await this.notifications.create({
|
await this.notifications.create({
|
||||||
organizationId,
|
organizationId,
|
||||||
|
|||||||
@@ -120,6 +120,7 @@ function toCard(item: ActivityDto, stageId: string): PipelineDeal {
|
|||||||
assigneeNames,
|
assigneeNames,
|
||||||
ownerId: item.assignee?.id ?? null,
|
ownerId: item.assignee?.id ?? null,
|
||||||
assigneeIds: (item.assignees ?? []).map((a) => a.id),
|
assigneeIds: (item.assignees ?? []).map((a) => a.id),
|
||||||
|
priority: item.priority,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -253,40 +254,54 @@ function onDragOver(stageId: string, event: DragEvent) {
|
|||||||
|
|
||||||
async function moveCard(activityId: string, toStageId: string, index?: number) {
|
async function moveCard(activityId: string, toStageId: string, index?: number) {
|
||||||
const fromStageId = findStageOf(activityId);
|
const fromStageId = findStageOf(activityId);
|
||||||
if (!fromStageId || fromStageId === toStageId) return;
|
if (!fromStageId) return;
|
||||||
const from = columns.value[fromStageId]!;
|
const from = columns.value[fromStageId]!;
|
||||||
const to = columns.value[toStageId];
|
const to = columns.value[toStageId];
|
||||||
if (!to) return;
|
if (!to) return;
|
||||||
const item = from.items.find((i) => i.id === activityId)!;
|
const fromIndex = from.items.findIndex((i) => i.id === activityId);
|
||||||
|
const item = from.items[fromIndex];
|
||||||
|
if (!item) return;
|
||||||
const toStage = props.stages.find((s) => s.id === toStageId)!;
|
const toStage = props.stages.find((s) => s.id === toStageId)!;
|
||||||
|
const same = fromStageId === toStageId;
|
||||||
|
const without = (same ? from.items : to.items).filter((i) => i.id !== activityId);
|
||||||
|
if (same && index == null) return;
|
||||||
|
let insertAt = index == null || index < 0 ? 0 : index;
|
||||||
|
if (same && index != null && index > fromIndex) insertAt -= 1;
|
||||||
|
insertAt = Math.max(0, Math.min(insertAt, without.length));
|
||||||
|
if (same && insertAt === fromIndex) return;
|
||||||
|
|
||||||
const snapshot = {
|
const prevFrom = from.items;
|
||||||
fromItems: from.items,
|
const prevTo = to.items;
|
||||||
fromTotal: from.total,
|
const prevFromTotal = from.total;
|
||||||
toItems: to.items,
|
const prevToTotal = to.total;
|
||||||
toTotal: to.total,
|
|
||||||
};
|
|
||||||
const optimistic: ActivityDto = { ...item, status: toStage.kind, stageId: toStageId };
|
const optimistic: ActivityDto = { ...item, status: toStage.kind, stageId: toStageId };
|
||||||
from.items = from.items.filter((i) => i.id !== activityId);
|
const nextTo = [...without];
|
||||||
from.total = Math.max(0, from.total - 1);
|
nextTo.splice(insertAt, 0, optimistic);
|
||||||
const nextTo = [...to.items];
|
if (same) {
|
||||||
const at = index == null || index < 0 || index > nextTo.length ? 0 : index;
|
from.items = nextTo;
|
||||||
nextTo.splice(at, 0, optimistic);
|
} else {
|
||||||
to.items = nextTo;
|
from.items = from.items.filter((i) => i.id !== activityId);
|
||||||
to.total += 1;
|
from.total = Math.max(0, from.total - 1);
|
||||||
|
to.items = nextTo;
|
||||||
|
to.total += 1;
|
||||||
|
}
|
||||||
|
|
||||||
moving.value = true;
|
moving.value = true;
|
||||||
try {
|
try {
|
||||||
const { data } = await api.patch<ActivityDto>(`/activities/${activityId}/stage`, {
|
const { data } = await api.patch<ActivityDto>(`/activities/${activityId}/stage`, {
|
||||||
stageId: toStageId,
|
stageId: toStageId,
|
||||||
|
position: insertAt,
|
||||||
});
|
});
|
||||||
to.items = to.items.map((i) => (i.id === activityId ? data : i));
|
const column = same ? from : to;
|
||||||
|
column.items = column.items.map((i) => (i.id === activityId ? data : i));
|
||||||
emit('changed');
|
emit('changed');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
from.items = snapshot.fromItems;
|
from.items = prevFrom;
|
||||||
from.total = snapshot.fromTotal;
|
from.total = prevFromTotal;
|
||||||
to.items = snapshot.toItems;
|
if (!same) {
|
||||||
to.total = snapshot.toTotal;
|
to.items = prevTo;
|
||||||
|
to.total = prevToTotal;
|
||||||
|
}
|
||||||
emit('error', apiMessage(e, 'جابهجایی فعالیت ناموفق بود.'));
|
emit('error', apiMessage(e, 'جابهجایی فعالیت ناموفق بود.'));
|
||||||
} finally {
|
} finally {
|
||||||
moving.value = false;
|
moving.value = false;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
CalendarOutlined,
|
CalendarOutlined,
|
||||||
CheckOutlined,
|
CheckOutlined,
|
||||||
DeleteOutlined,
|
DeleteOutlined,
|
||||||
|
FlagFilled,
|
||||||
MoreOutlined,
|
MoreOutlined,
|
||||||
} from '@ant-design/icons-vue';
|
} from '@ant-design/icons-vue';
|
||||||
import {
|
import {
|
||||||
@@ -13,10 +14,12 @@ import {
|
|||||||
Flex as AFlex,
|
Flex as AFlex,
|
||||||
Space as ASpace,
|
Space as ASpace,
|
||||||
Tag as ATag,
|
Tag as ATag,
|
||||||
|
Tooltip as ATooltip,
|
||||||
Typography,
|
Typography,
|
||||||
theme,
|
theme,
|
||||||
} from 'ant-design-vue';
|
} from 'ant-design-vue';
|
||||||
import { userAvatarSrc } from '@/lib/userAvatars';
|
import { userAvatarSrc } from '@/lib/userAvatars';
|
||||||
|
import type { ActivityPriority } from '@mento/shared';
|
||||||
import type { PipelineAccent, PipelineDeal, PipelineUiCopy } from '@/lib/pipeline-board';
|
import type { PipelineAccent, PipelineDeal, PipelineUiCopy } from '@/lib/pipeline-board';
|
||||||
import { DEAL_BOARD_COPY, formatCurrencyParts } from '@/lib/pipeline-board';
|
import { DEAL_BOARD_COPY, formatCurrencyParts } from '@/lib/pipeline-board';
|
||||||
|
|
||||||
@@ -60,6 +63,16 @@ const extraAssignees = computed(() =>
|
|||||||
Math.max(0, (props.deal.assigneeNames?.length ?? 0) - 1),
|
Math.max(0, (props.deal.assigneeNames?.length ?? 0) - 1),
|
||||||
);
|
);
|
||||||
const showTrash = computed(() => props.selectMode && props.selected);
|
const showTrash = computed(() => props.selectMode && props.selected);
|
||||||
|
const PRIORITY_FLAG: Record<ActivityPriority, { label: string; color: string }> = {
|
||||||
|
very_high: { label: 'خیلی زیاد', color: '#dc2626' },
|
||||||
|
high: { label: 'زیاد', color: '#ea580c' },
|
||||||
|
medium: { label: 'متوسط', color: '#0d9488' },
|
||||||
|
low: { label: 'کم', color: '#2563eb' },
|
||||||
|
very_low: { label: 'خیلی کم', color: '#94a3b8' },
|
||||||
|
};
|
||||||
|
const priorityFlag = computed(() =>
|
||||||
|
props.deal.priority ? PRIORITY_FLAG[props.deal.priority] : null,
|
||||||
|
);
|
||||||
|
|
||||||
const cardStyle = computed(() => ({
|
const cardStyle = computed(() => ({
|
||||||
cursor: props.selectMode ? 'pointer' : 'grab',
|
cursor: props.selectMode ? 'pointer' : 'grab',
|
||||||
@@ -140,6 +153,11 @@ const cardStyle = computed(() => ({
|
|||||||
</a-typography-text>
|
</a-typography-text>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<a-tooltip v-if="priorityFlag" :title="`اولویت: ${priorityFlag.label}`">
|
||||||
|
<span :style="{ display: 'inline-flex', flexShrink: 0, lineHeight: 1 }">
|
||||||
|
<FlagFilled :style="{ color: priorityFlag.color, fontSize: '16px' }" />
|
||||||
|
</span>
|
||||||
|
</a-tooltip>
|
||||||
<span :data-card-id="deal.id">
|
<span :data-card-id="deal.id">
|
||||||
<a-button
|
<a-button
|
||||||
v-if="showTrash"
|
v-if="showTrash"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import {
|
|||||||
import AddDealButton from './AddDealButton.vue';
|
import AddDealButton from './AddDealButton.vue';
|
||||||
import DealCard from './DealCard.vue';
|
import DealCard from './DealCard.vue';
|
||||||
import type { PipelineDeal, PipelineStage, PipelineUiCopy } from '@/lib/pipeline-board';
|
import type { PipelineDeal, PipelineStage, PipelineUiCopy } from '@/lib/pipeline-board';
|
||||||
import { DEAL_BOARD_COPY, PIPELINE_ACCENT } from '@/lib/pipeline-board';
|
import { DEAL_BOARD_COPY, PIPELINE_ACCENT, pointerDropIndex } from '@/lib/pipeline-board';
|
||||||
|
|
||||||
const props = withDefaults(
|
const props = withDefaults(
|
||||||
defineProps<{
|
defineProps<{
|
||||||
@@ -115,7 +115,7 @@ function onCardDragOver(stageId: string, event: DragEvent) {
|
|||||||
function onCardDrop(stageId: string, index: number, event: DragEvent) {
|
function onCardDrop(stageId: string, index: number, event: DragEvent) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
emit('drop', stageId, event, index);
|
emit('drop', stageId, event, pointerDropIndex(index, event));
|
||||||
}
|
}
|
||||||
|
|
||||||
function startRename() {
|
function startRename() {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { currencySuffix } from '@/lib/money';
|
import { currencySuffix } from '@/lib/money';
|
||||||
import { matchesSearch } from '@/lib/search';
|
import { matchesSearch } from '@/lib/search';
|
||||||
|
import type { ActivityPriority } from '@mento/shared';
|
||||||
|
|
||||||
export type PipelineAccent = 'green' | 'orange' | 'purple' | 'blue' | 'rose' | 'slate';
|
export type PipelineAccent = 'green' | 'orange' | 'purple' | 'blue' | 'rose' | 'slate';
|
||||||
|
|
||||||
@@ -21,6 +22,8 @@ export type PipelineDeal = {
|
|||||||
assigneeIds?: string[];
|
assigneeIds?: string[];
|
||||||
/** متنهای قابل جستجو (مشتری، شرکت، یادداشت، مسئولان …) */
|
/** متنهای قابل جستجو (مشتری، شرکت، یادداشت، مسئولان …) */
|
||||||
searchFields?: Array<string | null | undefined>;
|
searchFields?: Array<string | null | undefined>;
|
||||||
|
/** اولویت فعالیت؛ فقط روی کارت فعالیت نشان داده میشود */
|
||||||
|
priority?: ActivityPriority;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PipelineUiCopy = {
|
export type PipelineUiCopy = {
|
||||||
@@ -344,18 +347,16 @@ export function updateDealStage(
|
|||||||
return without.map((stage) => {
|
return without.map((stage) => {
|
||||||
if (stage.id !== stageId) return stage;
|
if (stage.id !== stageId) return stage;
|
||||||
const next = [...stage.deals];
|
const next = [...stage.deals];
|
||||||
let insertAt =
|
let insertAt = toIndex == null || toIndex < 0 ? next.length : toIndex;
|
||||||
toIndex == null || toIndex < 0 || toIndex > next.length
|
|
||||||
? next.length
|
|
||||||
: toIndex;
|
|
||||||
if (
|
if (
|
||||||
fromStageId === stageId &&
|
fromStageId === stageId &&
|
||||||
fromIndex >= 0 &&
|
fromIndex >= 0 &&
|
||||||
toIndex != null &&
|
toIndex != null &&
|
||||||
toIndex > fromIndex
|
toIndex > fromIndex
|
||||||
) {
|
) {
|
||||||
insertAt = Math.max(0, insertAt - 1);
|
insertAt -= 1;
|
||||||
}
|
}
|
||||||
|
insertAt = Math.max(0, Math.min(insertAt, next.length));
|
||||||
next.splice(insertAt, 0, { ...moving!, stageId });
|
next.splice(insertAt, 0, { ...moving!, stageId });
|
||||||
return { ...stage, deals: next };
|
return { ...stage, deals: next };
|
||||||
});
|
});
|
||||||
@@ -422,6 +423,14 @@ export function toFaDealCount(n: number): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** جابهجایی یک ستون به ایندکس جدید */
|
/** جابهجایی یک ستون به ایندکس جدید */
|
||||||
|
/** نیمهٔ پایین کارت یعنی «بعد از این کارت». ایندکس نسبت به فهرست فعلی ستون است. */
|
||||||
|
export function pointerDropIndex(index: number, event: DragEvent): number {
|
||||||
|
const el = event.currentTarget as HTMLElement | null;
|
||||||
|
const rect = el?.getBoundingClientRect();
|
||||||
|
if (!rect || rect.height <= 0) return index;
|
||||||
|
return index + (event.clientY >= rect.top + rect.height / 2 ? 1 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
export function moveStageToIndex(
|
export function moveStageToIndex(
|
||||||
stages: PipelineStage[],
|
stages: PipelineStage[],
|
||||||
stageId: string,
|
stageId: string,
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ import {
|
|||||||
import { api } from '@/lib/api';
|
import { api } from '@/lib/api';
|
||||||
import { formatJalaliNumeric, toFaDigits } from '@/lib/jalali';
|
import { formatJalaliNumeric, toFaDigits } from '@/lib/jalali';
|
||||||
import { canManageSettings } from '@/lib/roles';
|
import { canManageSettings } from '@/lib/roles';
|
||||||
|
import { pointerDropIndex } from '@/lib/pipeline-board';
|
||||||
import { useAuthStore } from '@/stores/auth';
|
import { useAuthStore } from '@/stores/auth';
|
||||||
import type { LeadBoardColumnDto, LeadDto, LeadStageDto } from '@mento/shared';
|
import type { LeadBoardColumnDto, LeadDto, LeadStageDto } from '@mento/shared';
|
||||||
|
|
||||||
@@ -481,28 +482,41 @@ function onDragOver(stageId: string, event: DragEvent) {
|
|||||||
if (event.dataTransfer) event.dataTransfer.dropEffect = 'move';
|
if (event.dataTransfer) event.dataTransfer.dropEffect = 'move';
|
||||||
}
|
}
|
||||||
|
|
||||||
async function onDrop(stageId: string, event: DragEvent) {
|
async function onDrop(stageId: string, event: DragEvent, index?: number) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
const leadId =
|
const leadId =
|
||||||
event.dataTransfer?.getData('text/plain') || draggingId.value || '';
|
event.dataTransfer?.getData('text/plain') || draggingId.value || '';
|
||||||
draggingId.value = null;
|
draggingId.value = null;
|
||||||
dropStageId.value = null;
|
dropStageId.value = null;
|
||||||
if (!leadId) return;
|
if (!leadId || moving.value) return;
|
||||||
|
|
||||||
const fromCol = columns.value.find((c) =>
|
const fromCol = columns.value.find((c) =>
|
||||||
c.leads.some((l) => l.id === leadId),
|
c.leads.some((l) => l.id === leadId),
|
||||||
);
|
);
|
||||||
if (!fromCol || fromCol.stage.id === stageId) return;
|
const target = columns.value.find((c) => c.stage.id === stageId);
|
||||||
|
if (!fromCol || !target) return;
|
||||||
const lead = fromCol.leads.find((l) => l.id === leadId);
|
const fromIndex = fromCol.leads.findIndex((l) => l.id === leadId);
|
||||||
|
const lead = fromCol.leads[fromIndex];
|
||||||
if (!lead) return;
|
if (!lead) return;
|
||||||
|
|
||||||
|
const same = fromCol.stage.id === stageId;
|
||||||
|
if (same && index == null) return;
|
||||||
|
const without = (same ? fromCol.leads : target.leads).filter((l) => l.id !== leadId);
|
||||||
|
let insertAt = index == null || index < 0 ? 0 : index;
|
||||||
|
if (same && index != null && index > fromIndex) insertAt -= 1;
|
||||||
|
insertAt = Math.max(0, Math.min(insertAt, without.length));
|
||||||
|
if (same && insertAt === fromIndex) return;
|
||||||
|
const nextLeads = [...without];
|
||||||
|
nextLeads.splice(insertAt, 0, { ...lead, stageId, stageName: target.stage.name });
|
||||||
|
|
||||||
const prev = columns.value.map((c) => ({
|
const prev = columns.value.map((c) => ({
|
||||||
...c,
|
...c,
|
||||||
leads: [...c.leads],
|
leads: [...c.leads],
|
||||||
}));
|
}));
|
||||||
|
|
||||||
columns.value = columns.value.map((c) => {
|
columns.value = columns.value.map((c) => {
|
||||||
|
if (same && c.stage.id === stageId) return { ...c, leads: nextLeads };
|
||||||
if (c.stage.id === fromCol.stage.id) {
|
if (c.stage.id === fromCol.stage.id) {
|
||||||
return {
|
return {
|
||||||
...c,
|
...c,
|
||||||
@@ -511,11 +525,7 @@ async function onDrop(stageId: string, event: DragEvent) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (c.stage.id === stageId) {
|
if (c.stage.id === stageId) {
|
||||||
return {
|
return { ...c, total: c.total + 1, leads: nextLeads };
|
||||||
...c,
|
|
||||||
total: c.total + 1,
|
|
||||||
leads: [{ ...lead, stageId, stageName: c.stage.name }, ...c.leads],
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
return c;
|
return c;
|
||||||
});
|
});
|
||||||
@@ -523,7 +533,7 @@ async function onDrop(stageId: string, event: DragEvent) {
|
|||||||
moving.value = true;
|
moving.value = true;
|
||||||
error.value = '';
|
error.value = '';
|
||||||
try {
|
try {
|
||||||
await api.patch(`/leads/${leadId}/move`, { stageId });
|
await api.patch(`/leads/${leadId}/move`, { stageId, position: insertAt });
|
||||||
} catch {
|
} catch {
|
||||||
columns.value = prev;
|
columns.value = prev;
|
||||||
error.value = 'جابهجایی لید ناموفق بود.';
|
error.value = 'جابهجایی لید ناموفق بود.';
|
||||||
@@ -543,7 +553,7 @@ onMounted(load);
|
|||||||
مسیر لیدها
|
مسیر لیدها
|
||||||
</a-typography-title>
|
</a-typography-title>
|
||||||
<a-typography-text type="secondary">
|
<a-typography-text type="secondary">
|
||||||
کشیدن کارت برای تغییر وضعیت. از منوی هر ستون میتوانید نام، ترتیب و حذف را عوض کنید.
|
کشیدن کارت برای تغییر ستون یا جابهجایی داخل همان ستون. از منوی هر ستون میتوانید نام، ترتیب و حذف را عوض کنید.
|
||||||
</a-typography-text>
|
</a-typography-text>
|
||||||
</div>
|
</div>
|
||||||
<a-space :size="GAP">
|
<a-space :size="GAP">
|
||||||
@@ -647,9 +657,13 @@ onMounted(load);
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div :style="columnBodyStyle">
|
<div :style="columnBodyStyle">
|
||||||
<a-card
|
<div
|
||||||
v-for="lead in col.leads"
|
v-for="(lead, index) in col.leads"
|
||||||
:key="lead.id"
|
:key="lead.id"
|
||||||
|
@dragover.prevent="onDragOver(col.stage.id, $event)"
|
||||||
|
@drop.stop="onDrop(col.stage.id, $event, pointerDropIndex(index, $event))"
|
||||||
|
>
|
||||||
|
<a-card
|
||||||
hoverable
|
hoverable
|
||||||
:bordered="true"
|
:bordered="true"
|
||||||
:body-style="cardBodyStyle"
|
:body-style="cardBodyStyle"
|
||||||
@@ -789,6 +803,7 @@ onMounted(load);
|
|||||||
</a-flex>
|
</a-flex>
|
||||||
</a-flex>
|
</a-flex>
|
||||||
</a-card>
|
</a-card>
|
||||||
|
</div>
|
||||||
|
|
||||||
<a-typography-text
|
<a-typography-text
|
||||||
v-if="!col.leads.length"
|
v-if="!col.leads.length"
|
||||||
|
|||||||
@@ -312,11 +312,18 @@ async function onDrop(stageId: string, event: DragEvent, index?: number) {
|
|||||||
const dealId = raw;
|
const dealId = raw;
|
||||||
if (!dealId || moving.value) return;
|
if (!dealId || moving.value) return;
|
||||||
|
|
||||||
const current = stages.value.find((s) => s.deals.some((d) => d.id === dealId));
|
const current = stages.value.find((stage) => stage.deals.some((deal) => deal.id === dealId));
|
||||||
const currentIndex = current?.deals.findIndex((d) => d.id === dealId) ?? -1;
|
if (current?.id === stageId && index == null) return;
|
||||||
if (current?.id === stageId && (index == null || index === currentIndex)) {
|
|
||||||
return;
|
const next = updateDealStage(stages.value, dealId, stageId, index);
|
||||||
}
|
const unchanged = next.every((stage, stageIndex) => {
|
||||||
|
const prev = stages.value[stageIndex];
|
||||||
|
return (
|
||||||
|
stage.deals.length === (prev?.deals.length ?? -1) &&
|
||||||
|
stage.deals.every((deal, dealIndex) => deal.id === prev?.deals[dealIndex]?.id)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
if (unchanged) return;
|
||||||
|
|
||||||
await applyUpdateDealStage(dealId, stageId, index);
|
await applyUpdateDealStage(dealId, stageId, index);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user