feat(版本详情): 完善流程日志与需求覆盖

2026-06-30 11:00:07 +08:00
parent d754585fe0
commit 1cd595c42e
38 changed files with 4123 additions and 237 deletions
--- a/apps/web/components/dev-task/DevTaskDetailDrawer.tsx
+++ b/apps/web/components/dev-task/DevTaskDetailDrawer.tsx
@@ -4,21 +4,26 @@ import { useState, useMemo } from 'react';
 import { X, AlertTriangle, Link2, ChevronRight, Clock, User, Tag, Play, Trash2, ArrowRightLeft, CalendarRange } from 'lucide-react';
 import { StatusBadge } from './StatusBadge';
 import { CategoryChip } from './CategoryChip';
+import { ActivityLogPanel } from '@/components/ActivityLogPanel';
 import { useDevTaskStore } from '@/stores/useDevTaskStore';
 import { useWorkActivityStore } from '@/stores/useWorkActivityStore';
 import { useTaskCategoryStore } from '@/stores/useTaskCategoryStore';
 import { useRequirementStore } from '@/stores/useRequirementStore';
 import { useMemberStore } from '@/stores/useMemberStore';
+import { useAuthStore } from '@/stores/useAuthStore';
+import { WorkDateTimePicker } from '@/components/WorkDateTimePicker';
 import {
  ALLOWED_TRANSITIONS,
  DEV_TASK_STATUS_LABEL,
  DEV_TASK_STATUS_COLOR,
+  canStartDevTask,
  formatHours,
  getEstimateHours,
  getActualHours,
+  needsDevTaskClaim,
 } from '@/lib/dev-task';
 import { needsDelayReason } from '@/lib/dev-task-transitions';
-import { formatShortTime } from '@/lib/work-hours';
+import { calcWorkHours, formatShortTime, isoToLocal, localToISO } from '@/lib/work-hours';
 import type { DevTaskStatus } from '@/lib/dev-task';

 interface Props {
@@ -28,16 +33,32 @@ interface Props {
  contextLabel?: string;
 }

+function defaultPlanStartLocal(): string {
+  const d = new Date();
+  d.setHours(9, 0, 0, 0);
+  return isoToLocal(d.toISOString());
+}
+
+function defaultPlanEndLocal(): string {
+  const d = new Date();
+  d.setHours(18, 0, 0, 0);
+  return isoToLocal(d.toISOString());
+}
+
 export function DevTaskDetailDrawer({ taskId, allTaskIds, onClose, contextLabel }: Props) {
  const { tasks, changeStatus, setBlocked, deleteTask, updateTask } = useDevTaskStore();
  const addProgressNote = useWorkActivityStore((s) => s.addProgressNote);
  const { categories } = useTaskCategoryStore();
  const { requirements } = useRequirementStore();
  const { members } = useMemberStore();
+  const user = useAuthStore((s) => s.user);
  const [showTransfer, setShowTransfer] = useState(false);
  const [transferTo, setTransferTo] = useState('');
  const [showDelayInput, setShowDelayInput] = useState(false);
  const [delayReason, setDelayReason] = useState('');
+  const [showPlanInput, setShowPlanInput] = useState(false);
+  const [planStartLocal, setPlanStartLocal] = useState('');
+  const [planEndLocal, setPlanEndLocal] = useState('');
  const [progressNote, setProgressNote] = useState('');
  const [progressBlocker, setProgressBlocker] = useState('');
  const [progressHelperId, setProgressHelperId] = useState('');
@@ -61,8 +82,42 @@ export function DevTaskDetailDrawer({ taskId, allTaskIds, onClose, contextLabel
  const actual = useMemo(() => getActualHours(task), [task]);
  const overrun = actual > estimate && estimate > 0;
  const requireDelay = task.status === 'todo' && needsDelayReason(task);
+  const currentUserName = user?.name || '';
+  const needsClaim = needsDevTaskClaim(task);
+  const startReady = canStartDevTask(task);
+  const visibleNextStatuses = nextStatuses.filter((status) => status !== 'in_progress' || startReady);
+  const planStartISO = localToISO(planStartLocal);
+  const planEndISO = localToISO(planEndLocal);
+  const planStartBeforeEnd = Boolean(planStartISO && planEndISO && planStartISO < planEndISO);
+  const planEstimateHours = planStartBeforeEnd ? calcWorkHours(planStartISO, planEndISO) : 0;
+
+  const openPlanInput = () => {
+    setPlanStartLocal(task.expectedStartAt ? isoToLocal(task.expectedStartAt) : defaultPlanStartLocal());
+    setPlanEndLocal(task.expectedEndAt ? isoToLocal(task.expectedEndAt) : defaultPlanEndLocal());
+    setShowPlanInput(true);
+  };
+
+  const handleSavePlan = () => {
+    const assigneeId = task.assigneeId || currentUserName;
+    if (!assigneeId) {
+      alert('领取前需要先登录或选择负责人');
+      return;
+    }
+    if (!planStartBeforeEnd || planEstimateHours <= 0 || !planStartISO || !planEndISO) return;
+    updateTask(task.id, {
+      assigneeId,
+      expectedStartAt: planStartISO,
+      expectedEndAt: planEndISO,
+      estimateHours: planEstimateHours,
+    });
+    setShowPlanInput(false);
+  };

  const handleTransition = (to: DevTaskStatus) => {
+    if (to === 'in_progress' && !startReady) {
+      openPlanInput();
+      return;
+    }
    if (to === 'in_progress' && requireDelay && !showDelayInput) {
      setShowDelayInput(true);
      return;
@@ -179,10 +234,10 @@ export function DevTaskDetailDrawer({ taskId, allTaskIds, onClose, contextLabel
              )}
            </div>

-            {nextStatuses.length > 0 && !showDelayInput && (
+            {visibleNextStatuses.length > 0 && !showDelayInput && (
              <div className="flex items-center gap-2 pt-1 flex-wrap">
                <ChevronRight className="h-3.5 w-3.5 text-[var(--ink-muted)]" />
-                {nextStatuses.map((s) => (
+                {visibleNextStatuses.map((s) => (
                  <button key={s} onClick={() => handleTransition(s)} className="h-8 px-4 rounded-lg text-[12px] font-medium bg-[var(--accent)] text-white hover:bg-[var(--accent-hover)] transition-colors">
                    {DEV_TASK_STATUS_LABEL[s]}
                  </button>
@@ -190,6 +245,61 @@ export function DevTaskDetailDrawer({ taskId, allTaskIds, onClose, contextLabel
              </div>
            )}

+            {task.status === 'todo' && !startReady && !showPlanInput && (
+              <div className="flex items-center gap-2 pt-1">
+                <button
+                  onClick={openPlanInput}
+                  disabled={needsClaim && !currentUserName}
+                  className="h-8 px-4 rounded-lg text-[12px] font-medium bg-orange-500 text-white hover:bg-orange-600 disabled:opacity-50"
+                >
+                  {needsClaim ? '领取并填写计划' : '填写计划'}
+                </button>
+                <span className="text-[11px] text-[var(--ink-muted)]">
+                  {needsClaim ? '领取时必须填写预计开始和预计截止' : '开始开发前需要补齐预计开始和预计截止'}
+                </span>
+              </div>
+            )}
+
+            {showPlanInput && (
+              <div className="rounded-lg border border-orange-200 bg-orange-50 p-3 space-y-3">
+                <div className="text-[11px] font-medium text-orange-700">
+                  {needsClaim ? '领取并填写计划' : '填写计划'}
+                </div>
+                <div className="grid grid-cols-2 gap-2">
+                  <div>
+                    <label className="mb-1 block text-[11px] text-orange-700">预计开始</label>
+                    <WorkDateTimePicker
+                      value={planStartLocal}
+                      onChange={setPlanStartLocal}
+                      placeholder="选择预计开始"
+                      defaultHour={9}
+                      className="bg-white"
+                    />
+                  </div>
+                  <div>
+                    <label className="mb-1 block text-[11px] text-orange-700">预计截止</label>
+                    <WorkDateTimePicker
+                      value={planEndLocal}
+                      onChange={setPlanEndLocal}
+                      placeholder="选择预计截止"
+                      defaultHour={18}
+                      popoverAlign="right"
+                      className="bg-white"
+                    />
+                  </div>
+                </div>
+                <div className="flex items-center justify-between gap-2">
+                  <span className="text-[11px] text-orange-700">
+                    执行预估：{planEstimateHours > 0 ? formatHours(planEstimateHours) : '请选择有效起止时间'}
+                  </span>
+                  <div className="flex gap-2">
+                    <button onClick={handleSavePlan} disabled={!planStartBeforeEnd || planEstimateHours <= 0} className="h-7 px-3 rounded text-[11px] font-medium bg-[var(--accent)] text-white disabled:opacity-50">保存</button>
+                    <button onClick={() => setShowPlanInput(false)} className="h-7 px-2 text-[11px] text-orange-700">取消</button>
+                  </div>
+                </div>
+              </div>
+            )}
+
            {showDelayInput && (
              <div className="rounded-lg border border-orange-200 bg-orange-50 p-3 space-y-2">
                <div className="flex items-center gap-1.5 text-[11px] text-orange-700">
@@ -332,7 +442,7 @@ export function DevTaskDetailDrawer({ taskId, allTaskIds, onClose, contextLabel
              <div className="flex items-center gap-2">
                <User className="h-3 w-3 text-[var(--ink-muted)]" />
                <span className="text-[var(--ink-muted)]">负责人</span>
-                <span className="text-[var(--ink)] font-medium">{task.assigneeId}</span>
+                <span className={`font-medium ${needsClaim ? 'text-orange-600' : 'text-[var(--ink)]'}`}>{needsClaim ? '待领取' : task.assigneeId}</span>
              </div>
              <div className="flex items-center gap-2">
                <span className="text-[var(--ink-muted)]">优先级</span>
@@ -351,6 +461,8 @@ export function DevTaskDetailDrawer({ taskId, allTaskIds, onClose, contextLabel
            )}
          </div>

+          <ActivityLogPanel sourceType="dev_task" sourceId={task.id} />
+
          {predecessors.length > 0 && (
            <div className="rounded-xl border border-[var(--line)] bg-[var(--bg-card)] p-4">
              <div className="text-[10px] text-[var(--ink-muted)] uppercase tracking-wide mb-2">前置任务</div>