fix(账号): 固化超级管理员身份

2026-06-26 11:18:00 +08:00
parent 56e0fe562d
commit 4cda624dc7
13 changed files with 419 additions and 80 deletions
--- a/apps/web/components/bug/BugCreateModal.tsx
+++ b/apps/web/components/bug/BugCreateModal.tsx
@@ -8,6 +8,7 @@ import { useDevTaskStore } from '@/stores/useDevTaskStore';
 import { useRequirementStore } from '@/stores/useRequirementStore';
 import { useMemberStore } from '@/stores/useMemberStore';
 import { useAuthStore } from '@/stores/useAuthStore';
+import { resolveMemberDisplayName } from '@/lib/member-system';
 import type { Priority } from '@/lib/derive';
 import type { BugSeverity } from '@/lib/bug';

@@ -60,6 +61,7 @@ export function BugCreateModal({ testCaseId, onClose }: Props) {

  const handleSubmit = () => {
    if (!canSubmit) return;
+    const operator = user ? resolveMemberDisplayName(user.id, members) : '系统';
    createBug({
      versionId: tc?.versionId || '',
      testCaseId,
@@ -68,10 +70,10 @@ export function BugCreateModal({ testCaseId, onClose }: Props) {
      description: description.trim(),
      severity,
      priority,
-      reportedBy: user?.name || '系统',
+      reportedBy: operator,
      assigneeId,
      images: images.length > 0 ? images : undefined,
-    }, user?.name || '系统');
+    }, operator);
    onClose();
  };

--- a/apps/web/components/bug/BugDetailDrawer.tsx
+++ b/apps/web/components/bug/BugDetailDrawer.tsx
@@ -10,6 +10,7 @@ import { useMemberStore } from '@/stores/useMemberStore';
 import { useAuthStore } from '@/stores/useAuthStore';
 import { BUG_ALLOWED_TRANSITIONS, BUG_STATUS_LABEL, BUG_SEVERITY_LABEL, BUG_SEVERITY_COLOR } from '@/lib/bug';
 import { formatDateTime } from '@/lib/format';
+import { isMemberReference, resolveMemberDisplayName } from '@/lib/member-system';
 import type { BugStatus } from '@/lib/bug';

 const LOG_ACTION_LABEL: Record<string, string> = {
@@ -31,7 +32,7 @@ export function BugDetailDrawer({ bugId, onClose, contextLabel }: Props) {
  const { requirements } = useRequirementStore();
  const { members } = useMemberStore();
  const user = useAuthStore((s) => s.user);
-  const operator = user?.name || '系统';
+  const operator = user ? resolveMemberDisplayName(user.id, members) : '系统';

  const bug = bugs.find((b) => b.id === bugId);
  if (!bug) return null;
@@ -39,6 +40,12 @@ export function BugDetailDrawer({ bugId, onClose, contextLabel }: Props) {
  const tc = testCases.find((c) => c.id === bug.testCaseId);
  const requirement = tc ? requirements.find((r) => r.id === tc.requirementId) : null;
  const nextStatuses = BUG_ALLOWED_TRANSITIONS[bug.status];
+  const currentMember = user ? members.find((m) => m.id === user.id) : undefined;
+  const assigneeName = resolveMemberDisplayName(bug.assigneeId, members);
+  const reporterName = resolveMemberDisplayName(bug.reportedBy, members);
+  const isCurrentAssignee = currentMember
+    ? isMemberReference(bug.assigneeId, currentMember)
+    : operator === assigneeName;

  const [resolution, setResolution] = useState(bug.resolution || '');
  const [showResolutionInput, setShowResolutionInput] = useState(false);
@@ -110,7 +117,7 @@ export function BugDetailDrawer({ bugId, onClose, contextLabel }: Props) {
              <span className="text-[11px] text-[var(--ink-muted)]">{bug.priority}</span>
            </div>

-            {nextStatuses.length > 0 && !showResolutionInput && operator === bug.assigneeId && (
+            {nextStatuses.length > 0 && !showResolutionInput && isCurrentAssignee && (
              <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) => (
@@ -125,8 +132,8 @@ export function BugDetailDrawer({ bugId, onClose, contextLabel }: Props) {
                )}
              </div>
            )}
-            {nextStatuses.length > 0 && !showResolutionInput && operator !== bug.assigneeId && (
-              <div className="text-[11px] text-[var(--ink-muted)] pt-1">当前修复人为 {bug.assigneeId}，仅修复人可操作</div>
+            {nextStatuses.length > 0 && !showResolutionInput && !isCurrentAssignee && (
+              <div className="text-[11px] text-[var(--ink-muted)] pt-1">当前修复人为 {assigneeName}，仅修复人可操作</div>
            )}

            {showResolutionInput && (
@@ -144,7 +151,7 @@ export function BugDetailDrawer({ bugId, onClose, contextLabel }: Props) {
                <div className="text-[11px] text-[var(--ink-muted)]">转交给：</div>
                <select value={transferTo} onChange={(e) => setTransferTo(e.target.value)} className="h-8 w-full rounded-lg border border-[var(--line)] px-3 text-[12px] focus:border-[var(--accent)] focus:outline-none">
                  <option value="">选择接收人</option>
-                  {members.filter((m) => m.name !== bug.assigneeId).map((m) => <option key={m.id} value={m.name}>{m.name}</option>)}
+                  {members.filter((m) => !isMemberReference(bug.assigneeId, m)).map((m) => <option key={m.id} value={m.name}>{m.name}</option>)}
                </select>
                <input value={transferRemark} onChange={(e) => setTransferRemark(e.target.value)} placeholder="转交备注（可选）" className="h-8 w-full rounded-lg border border-[var(--line)] px-3 text-[12px] focus:border-[var(--accent)] focus:outline-none" />
                <div className="flex gap-2">
@@ -159,8 +166,8 @@ export function BugDetailDrawer({ bugId, onClose, contextLabel }: Props) {
          <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-3">基本信息</div>
            <div className="grid grid-cols-2 gap-y-3 gap-x-4 text-[12px]">
-              <div><span className="text-[var(--ink-muted)]">提交人：</span><span className="text-[var(--ink)]">{bug.reportedBy}</span></div>
-              <div><span className="text-[var(--ink-muted)]">修复人：</span><span className="text-[var(--ink)] font-medium">{bug.assigneeId}</span></div>
+              <div><span className="text-[var(--ink-muted)]">提交人：</span><span className="text-[var(--ink)]">{reporterName}</span></div>
+              <div><span className="text-[var(--ink-muted)]">修复人：</span><span className="text-[var(--ink)] font-medium">{assigneeName}</span></div>
              <div><span className="text-[var(--ink-muted)]">提交：</span><span className="text-[var(--ink)]">{formatDateTime(bug.createdAt)}</span></div>
              {bug.resolvedAt && <div><span className="text-[var(--ink-muted)]">修复：</span><span className="text-[var(--ink)]">{formatDateTime(bug.resolvedAt)}</span></div>}
              {bug.closedAt && <div><span className="text-[var(--ink-muted)]">关闭：</span><span className="text-emerald-600">{formatDateTime(bug.closedAt)}</span></div>}
@@ -202,10 +209,10 @@ export function BugDetailDrawer({ bugId, onClose, contextLabel }: Props) {
                  <div key={log.id} className="flex gap-2.5 text-[11px]">
                    <span className="text-[var(--ink-muted)] tabular-nums shrink-0 w-[110px]">{formatDateTime(log.createdAt)}</span>
                    <div className="flex-1">
-                      <span className="font-medium text-[var(--ink)]">{log.operator}</span>
+                      <span className="font-medium text-[var(--ink)]">{resolveMemberDisplayName(log.operator, members)}</span>
                      <span className="text-[var(--ink-soft)]"> {LOG_ACTION_LABEL[log.action] || log.action}</span>
                      {log.fromValue && log.toValue && (
-                        <span className="text-[var(--ink-muted)]"> {log.fromValue} → {log.toValue}</span>
+                        <span className="text-[var(--ink-muted)]"> {resolveMemberDisplayName(log.fromValue, members)} → {resolveMemberDisplayName(log.toValue, members)}</span>
                      )}
                      {log.remark && <span className="text-[var(--ink-muted)]"> ({log.remark})</span>}
                    </div>
--- a/apps/web/components/bug/BugRow.tsx
+++ b/apps/web/components/bug/BugRow.tsx
@@ -4,6 +4,8 @@ import { memo } from 'react';
 import { BugStatusBadge } from './BugStatusBadge';
 import { BUG_SEVERITY_LABEL, BUG_SEVERITY_COLOR, getBugActualHours } from '@/lib/bug';
 import { formatWorkHours } from '@/lib/work-hours';
+import { resolveMemberDisplayName } from '@/lib/member-system';
+import { useMemberStore } from '@/stores/useMemberStore';
 import type { Bug } from '@/lib/bug';

 interface Props {
@@ -21,6 +23,8 @@ const PRIORITY_DOT: Record<string, string> = {

 function BugRowImpl({ bug, testCaseNo, onClick }: Props) {
  const actualHours = getBugActualHours(bug);
+  const members = useMemberStore((s) => s.members);
+  const assigneeName = resolveMemberDisplayName(bug.assigneeId, members);
  return (
    <div onClick={onClick} className="flex items-center gap-3 px-4 py-2.5 border-b border-[var(--line)] hover:bg-[var(--bg-subtle)] cursor-pointer transition-colors last:border-b-0">
      <span className={`h-2 w-2 rounded-full shrink-0 ${PRIORITY_DOT[bug.priority] || 'bg-zinc-300'}`} />
@@ -32,7 +36,7 @@ function BugRowImpl({ bug, testCaseNo, onClick }: Props) {
        <span className="text-[11px] text-[var(--ink-muted)] tabular-nums w-28 text-right shrink-0 whitespace-nowrap">{formatWorkHours(actualHours)}</span>
      )}
      {testCaseNo && <span className="text-[10px] font-mono text-[var(--ink-muted)] w-14 text-right shrink-0">{testCaseNo}</span>}
-      <span className="text-[11px] text-[var(--ink-soft)] w-14 text-right truncate shrink-0">{bug.assigneeId}</span>
+      <span className="text-[11px] text-[var(--ink-soft)] w-14 text-right truncate shrink-0">{assigneeName}</span>
    </div>
  );
 }
--- a/apps/web/components/bug/BugTab.tsx
+++ b/apps/web/components/bug/BugTab.tsx
@@ -6,6 +6,7 @@ import { useBugStore } from '@/stores/useBugStore';
 import { useTestCaseStore } from '@/stores/useTestCaseStore';
 import { useRequirementStore } from '@/stores/useRequirementStore';
 import { useAuthStore } from '@/stores/useAuthStore';
+import { useMemberStore } from '@/stores/useMemberStore';
 import { BugRow } from './BugRow';
 import { BugDetailDrawer } from './BugDetailDrawer';
 import { Pagination, usePagination } from '@/components/Pagination';
@@ -13,6 +14,7 @@ import { SearchInput, matchTitleOrNo } from '@/components/SearchInput';
 import { useDebouncedValue } from '@/hooks/useDebouncedValue';
 import { BUG_STATUS_LABEL, BUG_SEVERITY_LABEL, bugIntervals } from '@/lib/bug';
 import { formatWorkHours, calcTwoMetrics } from '@/lib/work-hours';
+import { isMemberReference, resolveMemberDisplayName } from '@/lib/member-system';
 import type { BugStatus, BugSeverity } from '@/lib/bug';

 interface Props {
@@ -25,6 +27,7 @@ export function BugTab({ versionId, requirementIds }: Props) {
  const { testCases, fetchTestCases } = useTestCaseStore();
  const { requirements } = useRequirementStore();
  const user = useAuthStore((s) => s.user);
+  const members = useMemberStore((s) => s.members);

  useEffect(() => { fetchBugs(); }, [fetchBugs]);
  useEffect(() => { fetchTestCases(); }, [fetchTestCases]);
@@ -48,26 +51,36 @@ export function BugTab({ versionId, requirementIds }: Props) {
  const [keyword, setKeyword] = useState('');
  const debouncedKeyword = useDebouncedValue(keyword, 300);

+  const [selectedBugId, setSelectedBugId] = useState<string | null>(null);
+
+  const testCaseMap = useMemo(() => new Map(testCases.map((c) => [c.id, c])), [testCases]);
+  const currentMember = useMemo(() => members.find((m) => m.id === user?.id), [members, user?.id]);
+  const currentUserName = currentMember?.name ?? user?.name;
+
+  const assignees = useMemo(() => {
+    const names = new Set(versionBugs.map((b) => resolveMemberDisplayName(b.assigneeId, members)));
+    return Array.from(names);
+  }, [versionBugs, members]);
+
  const filteredBugs = useMemo(() => {
    let result = versionBugs;
-    if (filterAssignee) result = result.filter((b) => b.assigneeId === filterAssignee);
+    if (filterAssignee === '__me') {
+      if (currentMember) {
+        result = result.filter((b) => isMemberReference(b.assigneeId, currentMember));
+      } else {
+        result = [];
+      }
+    } else if (filterAssignee) {
+      result = result.filter((b) => resolveMemberDisplayName(b.assigneeId, members) === filterAssignee);
+    }
    if (filterStatus) result = result.filter((b) => b.status === filterStatus);
    if (filterSeverity) result = result.filter((b) => b.severity === filterSeverity);
    if (debouncedKeyword) result = result.filter((b) => matchTitleOrNo({ title: b.title, no: b.bugNo }, debouncedKeyword));
    return result;
-  }, [versionBugs, filterAssignee, filterStatus, filterSeverity, debouncedKeyword]);
+  }, [versionBugs, filterAssignee, filterStatus, filterSeverity, debouncedKeyword, currentMember, members]);

  const { paged, page, setPage, total, pageSize, setPageSize } = usePagination(filteredBugs, 20);

-  const [selectedBugId, setSelectedBugId] = useState<string | null>(null);
-
-  const testCaseMap = useMemo(() => new Map(testCases.map((c) => [c.id, c])), [testCases]);
-
-  const assignees = useMemo(() => {
-    const names = new Set(versionBugs.map((b) => b.assigneeId));
-    return Array.from(names);
-  }, [versionBugs]);
-
  const hasFilter = !!(filterAssignee || filterStatus || filterSeverity || debouncedKeyword);

  return (
@@ -94,8 +107,8 @@ export function BugTab({ versionId, requirementIds }: Props) {
        <SearchInput value={keyword} onChange={(v) => { setKeyword(v); setPage(1); }} placeholder="搜索标题/编号" />
        <select value={filterAssignee} onChange={(e) => { setFilterAssignee(e.target.value); setPage(1); }} className="h-7 rounded-md border border-[var(--line)] bg-[var(--bg-card)] px-2 text-[11px] text-[var(--ink-soft)] focus:border-[var(--accent)] focus:outline-none">
          <option value="">全部修复人</option>
-          {user?.name && <option value={user.name}>我的Bug</option>}
-          {assignees.filter((a) => a !== user?.name).map((a) => <option key={a} value={a}>{a}</option>)}
+          {currentMember && <option value="__me">我的Bug</option>}
+          {assignees.filter((a) => a !== currentUserName).map((a) => <option key={a} value={a}>{a}</option>)}
        </select>
        <select value={filterStatus} onChange={(e) => { setFilterStatus(e.target.value); setPage(1); }} className="h-7 rounded-md border border-[var(--line)] bg-[var(--bg-card)] px-2 text-[11px] text-[var(--ink-soft)] focus:border-[var(--accent)] focus:outline-none">
          <option value="">全部状态</option>