feat(开发任务): 状态流转接入单条工作流

This commit is contained in:
Script Generator
2026-06-25 14:04:45 +08:00
parent 168c748835
commit 52833d81ac
6 changed files with 187 additions and 109 deletions

View File

@@ -57,6 +57,7 @@ export function DevTaskCreateModal({ versionId, requirementIds, versionDeadline,
const [predecessorIds, setPredecessorIds] = useState<string[]>([]); const [predecessorIds, setPredecessorIds] = useState<string[]>([]);
const [description, setDescription] = useState(''); const [description, setDescription] = useState('');
const [overdueVersionReason, setOverdueVersionReason] = useState(''); const [overdueVersionReason, setOverdueVersionReason] = useState('');
const [prototypeNotes, setPrototypeNotes] = useState('');
useEffect(() => { useEffect(() => {
if (categories[0] && !categoryId) setCategoryId(categories[0].id); if (categories[0] && !categoryId) setCategoryId(categories[0].id);
@@ -95,6 +96,15 @@ export function DevTaskCreateModal({ versionId, requirementIds, versionDeadline,
const handleSubmit = () => { const handleSubmit = () => {
if (!canSubmit) return; if (!canSubmit) return;
const reqRef = versionReqs.find((r) => r.id === requirementId);
const references = [
...(reqRef ? [{ type: 'requirement' as const, id: reqRef.code, label: `${reqRef.code} ${reqRef.title}` }] : []),
...prototypeNotes.split(/[,\s]+/).map((s) => s.trim()).filter(Boolean).map((note) => ({
type: 'prototype_note' as const,
id: note,
label: note,
})),
];
createTask({ createTask({
requirementId, requirementId,
title: title.trim(), title: title.trim(),
@@ -105,6 +115,7 @@ export function DevTaskCreateModal({ versionId, requirementIds, versionDeadline,
priority: effectivePriority, priority: effectivePriority,
expectedStartAt: expectedStartISO, expectedStartAt: expectedStartISO,
expectedEndAt: expectedEndISO, expectedEndAt: expectedEndISO,
estimateHours,
actualStartAt: undefined, actualStartAt: undefined,
actualEndAt: undefined, actualEndAt: undefined,
status: 'todo', status: 'todo',
@@ -114,6 +125,7 @@ export function DevTaskCreateModal({ versionId, requirementIds, versionDeadline,
riskLevel: undefined, riskLevel: undefined,
delayReason: undefined, delayReason: undefined,
overdueVersionReason: isOverdueVersion ? overdueVersionReason.trim() : undefined, overdueVersionReason: isOverdueVersion ? overdueVersionReason.trim() : undefined,
references: references.length > 0 ? references : undefined,
createdBy: user?.name || '系统', createdBy: user?.name || '系统',
}); });
onCreated?.(); onCreated?.();
@@ -212,6 +224,11 @@ export function DevTaskCreateModal({ versionId, requirementIds, versionDeadline,
<label className="block text-[12px] text-[var(--ink-soft)] mb-1"></label> <label className="block text-[12px] text-[var(--ink-soft)] mb-1"></label>
<textarea rows={3} value={description} onChange={(e) => setDescription(e.target.value)} className="w-full rounded-lg border border-[var(--line)] bg-[var(--bg)] px-3 py-2 text-[13px] focus:border-[var(--accent)] focus:outline-none resize-none" placeholder="任务描述(可选)" /> <textarea rows={3} value={description} onChange={(e) => setDescription(e.target.value)} className="w-full rounded-lg border border-[var(--line)] bg-[var(--bg)] px-3 py-2 text-[13px] focus:border-[var(--accent)] focus:outline-none resize-none" placeholder="任务描述(可选)" />
</div> </div>
<div>
<label className="block text-[12px] text-[var(--ink-soft)] mb-1"></label>
<input value={prototypeNotes} onChange={(e) => setPrototypeNotes(e.target.value)} className="h-8 w-full rounded-lg border border-[var(--line)] bg-[var(--bg)] px-3 text-[13px] focus:border-[var(--accent)] focus:outline-none" placeholder="如 QY0007, QY0023" />
<p className="mt-1 text-[11px] text-[var(--ink-muted)]"></p>
</div>
</div> </div>
<div className="flex justify-end gap-2 pt-4 border-t border-[var(--line)] mt-4"> <div className="flex justify-end gap-2 pt-4 border-t border-[var(--line)] mt-4">
<button onClick={onClose} className="h-8 px-3 rounded-lg text-[12px] font-medium border border-[var(--line)] text-[var(--ink-soft)] hover:bg-[var(--bg-subtle)]"></button> <button onClick={onClose} className="h-8 px-3 rounded-lg text-[12px] font-medium border border-[var(--line)] text-[var(--ink-soft)] hover:bg-[var(--bg-subtle)]"></button>

View File

@@ -1,62 +1,6 @@
import type { DevTask } from './dev-task'; import type { DevTask } from './dev-task';
/**
* 是否可以"手动"切到 in_progress
* - 仅当 todo 且未到 expectedStartAt 时返回 true
* - 已到点自动机制接管UI 不应再显示手动按钮
* - 已超期:返回 falseUI 应要求填 delayReason
*/
export function canManualStart(task: DevTask, now: Date = new Date()): boolean {
if (task.status !== 'todo') return false;
if (!task.expectedStartAt) return true;
return now.getTime() < new Date(task.expectedStartAt).getTime();
}
/**
* 自动切换扫描:返回所有需要从 todo 切到 in_progress 的任务
* - status === 'todo'
* - now >= expectedStartAt且未超期超过 0 秒就自动切——超期未切的可单独走 needsDelayReason 流程)
*
* 注意:超期任务也包含在内,由调用方决定要不要扫;当前策略是 fetchTasks 调用时只扫"刚好到点"
* 超期任务保留在 todo 等用户填 delayReason。所以这里加 maxOverdueMs 参数,默认 24h 内的算到点。
*/
export function findTasksToAutoStart(
tasks: DevTask[],
now: Date = new Date(),
maxOverdueMs: number = 24 * 60 * 60 * 1000,
): Array<{ taskId: string; actualStartAt: string }> {
const result: Array<{ taskId: string; actualStartAt: string }> = [];
for (const t of tasks) {
if (t.status !== 'todo' || !t.expectedStartAt || t.actualStartAt) continue;
const expected = new Date(t.expectedStartAt).getTime();
if (isNaN(expected)) continue;
const diff = now.getTime() - expected;
if (diff >= 0 && diff <= maxOverdueMs) {
result.push({ taskId: t.id, actualStartAt: t.expectedStartAt });
}
}
return result;
}
/**
* 是否处于"超期手动开干需填延后原因"状态
* - todo 且 now > expectedStartAt
*/
export function needsDelayReason(task: DevTask, now: Date = new Date()): boolean { export function needsDelayReason(task: DevTask, now: Date = new Date()): boolean {
if (task.status !== 'todo' || !task.expectedStartAt) return false; if (task.status !== 'todo' || !task.expectedStartAt) return false;
return now.getTime() > new Date(task.expectedStartAt).getTime(); return now.getTime() > new Date(task.expectedStartAt).getTime();
} }
/**
* 进入 in_progress 时计算 actualStartAt
* - auto: 等于 expectedStartAt
* - manual: 等于 now
*/
export function deriveActualStartAt(
task: DevTask,
trigger: 'auto' | 'manual',
now: Date = new Date(),
): string {
if (trigger === 'auto' && task.expectedStartAt) return task.expectedStartAt;
return now.toISOString();
}

View File

@@ -0,0 +1,81 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import type { DevTask } from './dev-task';
import { applyDevTaskTransition, normalizeDevTaskOnCreate } from './dev-task-workflow';
function task(patch: Partial<DevTask> = {}): DevTask {
return {
id: 'task-1',
taskNo: 'DEV-001',
requirementId: 'req-1',
title: '实现拖拽排序',
categoryId: 'cat-frontend-interaction',
assigneeId: 'Alice',
priority: 'P2',
expectedStartAt: '2026-06-25T01:00:00.000Z',
expectedEndAt: '2026-06-25T02:00:00.000Z',
status: 'todo',
isBlocked: false,
createdBy: 'PM',
createdAt: '2026-06-25T00:00:00.000Z',
updatedAt: '2026-06-25T00:00:00.000Z',
...patch,
};
}
test('normalizeDevTaskOnCreate forces todo and clears actual timestamps for AI drafts', () => {
const normalized = normalizeDevTaskOnCreate(task({
status: 'in_progress',
actualStartAt: '2026-06-25T01:00:00.000Z',
actualEndAt: '2026-06-25T02:00:00.000Z',
aiDraft: true,
}));
assert.equal(normalized.status, 'todo');
assert.equal(normalized.actualStartAt, undefined);
assert.equal(normalized.actualEndAt, undefined);
});
test('todo to in_progress writes actualStartAt from manual click time', () => {
const result = applyDevTaskTransition(task(), 'in_progress', {
now: new Date('2026-06-25T03:30:00.000Z'),
});
assert.equal(result.ok, true);
assert.equal(result.patch?.status, 'in_progress');
assert.equal(result.patch?.actualStartAt, '2026-06-25T03:30:00.000Z');
});
test('in_progress to testing does not write actualEndAt', () => {
const result = applyDevTaskTransition(task({
status: 'in_progress',
actualStartAt: '2026-06-25T03:30:00.000Z',
}), 'testing', {
now: new Date('2026-06-25T04:00:00.000Z'),
});
assert.equal(result.ok, true);
assert.equal(result.patch?.actualEndAt, undefined);
});
test('testing to submitted writes actualEndAt', () => {
const result = applyDevTaskTransition(task({
status: 'testing',
actualStartAt: '2026-06-25T03:30:00.000Z',
}), 'submitted', {
now: new Date('2026-06-25T05:00:00.000Z'),
});
assert.equal(result.ok, true);
assert.equal(result.patch?.actualEndAt, '2026-06-25T05:00:00.000Z');
});
test('invalid transition is rejected', () => {
const result = applyDevTaskTransition(task(), 'submitted', {
now: new Date('2026-06-25T05:00:00.000Z'),
});
assert.equal(result.ok, false);
assert.match(result.message || '', /不允许/);
});

View File

@@ -0,0 +1,49 @@
import type { DevTask, DevTaskStatus } from './dev-task';
import { canTransition } from './dev-task';
export interface DevTaskWorkflowResult {
ok: boolean;
patch?: Partial<DevTask>;
message?: string;
}
export interface DevTaskTransitionOptions {
now?: Date;
delayReason?: string;
}
export function normalizeDevTaskOnCreate(task: DevTask): DevTask {
return {
...task,
status: 'todo',
actualStartAt: undefined,
actualEndAt: undefined,
};
}
export function applyDevTaskTransition(
task: DevTask,
to: DevTaskStatus,
options: DevTaskTransitionOptions = {},
): DevTaskWorkflowResult {
if (!canTransition(task.status, to)) {
return { ok: false, message: `不允许从「${task.status}」流转到「${to}` };
}
const nowIso = (options.now ?? new Date()).toISOString();
const patch: Partial<DevTask> = {
status: to,
aiDraft: false,
};
if (to === 'in_progress' && !task.actualStartAt) {
patch.actualStartAt = nowIso;
if (options.delayReason?.trim()) patch.delayReason = options.delayReason.trim();
}
if (to === 'submitted') {
patch.actualEndAt = nowIso;
}
return { ok: true, patch };
}

View File

@@ -3,6 +3,15 @@ import { calcWorkHours, formatWorkHours, type TimeInterval } from './work-hours'
export type DevTaskStatus = 'todo' | 'in_progress' | 'testing' | 'submitted'; export type DevTaskStatus = 'todo' | 'in_progress' | 'testing' | 'submitted';
export type ReferenceType = 'requirement' | 'prototype_note' | 'external';
export interface Reference {
type: ReferenceType;
id: string;
label: string;
url?: string;
}
export interface DevTask { export interface DevTask {
id: string; id: string;
taskNo: string; taskNo: string;
@@ -16,6 +25,7 @@ export interface DevTask {
expectedStartAt: string; expectedStartAt: string;
expectedEndAt: string; expectedEndAt: string;
estimateHours?: number;
actualStartAt?: string; actualStartAt?: string;
actualEndAt?: string; actualEndAt?: string;
@@ -27,6 +37,9 @@ export interface DevTask {
riskLevel?: 'low' | 'medium' | 'high'; riskLevel?: 'low' | 'medium' | 'high';
delayReason?: string; delayReason?: string;
overdueVersionReason?: string; overdueVersionReason?: string;
references?: Reference[];
aiDraft?: boolean;
aiDraftAt?: string;
createdBy: string; createdBy: string;
createdAt: string; createdAt: string;
updatedAt: string; updatedAt: string;
@@ -84,6 +97,9 @@ export function formatHours(hours: number): string {
} }
export function getEstimateHours(task: DevTask): number { export function getEstimateHours(task: DevTask): number {
if (typeof task.estimateHours === 'number' && task.estimateHours > 0) {
return Math.round(task.estimateHours * 2) / 2;
}
if (!task.expectedStartAt || !task.expectedEndAt) return 0; if (!task.expectedStartAt || !task.expectedEndAt) return 0;
return calcWorkHours(task.expectedStartAt, task.expectedEndAt); return calcWorkHours(task.expectedStartAt, task.expectedEndAt);
} }
@@ -162,7 +178,6 @@ export function isLegacyTask(t: any): boolean {
'startDate' in t || 'startDate' in t ||
'dueDate' in t || 'dueDate' in t ||
'completedAt' in t || 'completedAt' in t ||
'estimateHours' in t ||
'actualHours' in t || 'actualHours' in t ||
'overdueReason' in t 'overdueReason' in t
); );

View File

@@ -1,37 +1,30 @@
'use client'; 'use client';
import { create } from 'zustand'; import { create } from 'zustand';
import type { DevTask, DevTaskStatus } from '@/lib/dev-task'; import type { DevTask, DevTaskStatus } from '@/lib/dev-task';
import { canTransition, generateTaskNo, isLegacyTask } from '@/lib/dev-task'; import { generateTaskNo, isLegacyTask } from '@/lib/dev-task';
import { findTasksToAutoStart, deriveActualStartAt } from '@/lib/dev-task-transitions'; import { applyDevTaskTransition, normalizeDevTaskOnCreate } from '@/lib/dev-task-workflow';
import { loadServerData, saveServerData } from '@/lib/server-data';
const STORAGE_KEY = 'ftb_dev_tasks_v2'; function saveStored(items: DevTask[]) {
const LEGACY_KEY = 'ftb_dev_tasks_v1'; saveServerData('dev-tasks', items).catch(() => {});
function saveLocal(items: DevTask[]) {
try { localStorage.setItem(STORAGE_KEY, JSON.stringify(items)); } catch {}
} }
function loadLocal(): DevTask[] | null { async function loadStored(): Promise<DevTask[] | null> {
try { try {
const raw = localStorage.getItem(STORAGE_KEY); const parsed = await loadServerData<DevTask[]>('dev-tasks');
if (raw) { if (parsed) {
const parsed = JSON.parse(raw);
if (Array.isArray(parsed) && parsed.some(isLegacyTask)) { if (Array.isArray(parsed) && parsed.some(isLegacyTask)) {
localStorage.removeItem(STORAGE_KEY);
return null; return null;
} }
return parsed; return parsed;
} }
if (localStorage.getItem(LEGACY_KEY)) {
localStorage.removeItem(LEGACY_KEY);
}
} catch {} } catch {}
return null; return null;
} }
interface DevTaskState { interface DevTaskState {
tasks: DevTask[]; tasks: DevTask[];
fetchTasks: () => void; fetchTasks: () => Promise<void>;
createTask: (data: Omit<DevTask, 'id' | 'taskNo' | 'createdAt' | 'updatedAt' | 'isBlocked'>) => DevTask; createTask: (data: Omit<DevTask, 'id' | 'taskNo' | 'createdAt' | 'updatedAt' | 'isBlocked'>) => DevTask;
updateTask: (id: string, data: Partial<DevTask>) => void; updateTask: (id: string, data: Partial<DevTask>) => void;
deleteTask: (id: string) => void; deleteTask: (id: string) => void;
@@ -45,72 +38,51 @@ interface DevTaskState {
export const useDevTaskStore = create<DevTaskState>((set, get) => ({ export const useDevTaskStore = create<DevTaskState>((set, get) => ({
tasks: [], tasks: [],
fetchTasks: () => { fetchTasks: async () => {
const cached = loadLocal(); const cached = await loadStored();
const list = cached ?? []; set({ tasks: cached ?? [] });
const now = new Date();
const autoStarts = findTasksToAutoStart(list, now);
if (autoStarts.length > 0) {
const map = new Map(autoStarts.map((a) => [a.taskId, a.actualStartAt]));
const updated = list.map((t) =>
map.has(t.id)
? { ...t, status: 'in_progress' as DevTaskStatus, actualStartAt: map.get(t.id)!, updatedAt: now.toISOString() }
: t,
);
set({ tasks: updated });
saveLocal(updated);
} else {
set({ tasks: list });
}
}, },
createTask: (data) => { createTask: (data) => {
const list = get().tasks; const list = get().tasks;
const now = new Date().toISOString(); const now = new Date().toISOString();
const task: DevTask = { const task: DevTask = normalizeDevTaskOnCreate({
...data, ...data,
id: `task-${Date.now()}`, id: `task-${Date.now()}`,
taskNo: generateTaskNo(list), taskNo: generateTaskNo(list),
isBlocked: false, isBlocked: false,
createdAt: now, createdAt: now,
updatedAt: now, updatedAt: now,
}; } as DevTask);
const updated = [...list, task]; const updated = [...list, task];
set({ tasks: updated }); set({ tasks: updated });
saveLocal(updated); saveStored(updated);
return task; return task;
}, },
updateTask: (id, data) => { updateTask: (id, data) => {
const updated = get().tasks.map((t) => const updated = get().tasks.map((t) =>
t.id === id ? { ...t, ...data, updatedAt: new Date().toISOString() } : t, t.id === id ? { ...t, ...data, aiDraft: false, updatedAt: new Date().toISOString() } : t,
); );
set({ tasks: updated }); set({ tasks: updated });
saveLocal(updated); saveStored(updated);
}, },
deleteTask: (id) => { deleteTask: (id) => {
const updated = get().tasks.filter((t) => t.id !== id); const updated = get().tasks.filter((t) => t.id !== id);
set({ tasks: updated }); set({ tasks: updated });
saveLocal(updated); saveStored(updated);
}, },
changeStatus: (id, to, opts) => { changeStatus: (id, to, opts) => {
const task = get().tasks.find((t) => t.id === id); const task = get().tasks.find((t) => t.id === id);
if (!task) return { ok: false, message: '任务不存在' }; if (!task) return { ok: false, message: '任务不存在' };
if (!canTransition(task.status, to)) { const result = applyDevTaskTransition(task, to, {
return { ok: false, message: `不允许从「${task.status}」流转到「${to}` }; now: new Date(),
} delayReason: opts?.delayReason,
const now = new Date(); });
const patch: Partial<DevTask> = { status: to }; if (!result.ok || !result.patch) return { ok: false, message: result.message };
if (to === 'in_progress' && !task.actualStartAt) { get().updateTask(id, result.patch);
patch.actualStartAt = deriveActualStartAt(task, 'manual', now);
if (opts?.delayReason) patch.delayReason = opts.delayReason;
}
if (to === 'submitted') {
patch.actualEndAt = now.toISOString();
}
get().updateTask(id, patch);
return { ok: true }; return { ok: true };
}, },