fix(账号): 固化超级管理员身份
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user