圆桌第二步支持按席位筛选会商记录,左侧角色卡与消息头像联动。
新增 seat-filter 归一化匹配逻辑,点击角色卡或气泡头像可只看该席位发言,并支持一键显示全部。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
9002ae157a
commit
dd329e7a4f
3 files changed
+350
-36
No files matched your search
@@ -68,6 +68,12 @@ import { ParallelSeatStrip } from "@/roundtable-planning/components/ParallelSeat
|
||||
import { DagFlowChart } from "@/roundtable-planning/components/DagFlowChart";
|
||||
import { useAutoScroll } from "@/roundtable-planning/hooks/useAutoScroll";
|
||||
import { useDialogueSpeedMetrics } from "@/roundtable-planning/hooks/useDialogueSpeedMetrics";
|
||||
import {
|
||||
seatFilterForSender,
|
||||
seatFilterLabel,
|
||||
senderMatchesSeatFilter,
|
||||
type SeatFilter,
|
||||
} from "@/roundtable-planning/lib/seat-filter";
|
||||
import type {
|
||||
AgentConfig,
|
||||
ParallelSeatView,
|
||||
@@ -100,6 +106,10 @@ export interface Step2PanelProps {
|
||||
agentConfigs: Record<number, AgentConfig>;
|
||||
selectedAgentId: number | null;
|
||||
roles: RoleEntry[];
|
||||
// ─── 按席位筛选会商记录(状态在页面层,与左侧角色卡片共用)──────────────
|
||||
/** 当前筛选标识;null = 显示全部。 */
|
||||
seatFilter: SeatFilter | null;
|
||||
setSeatFilter: React.Dispatch<React.SetStateAction<SeatFilter | null>>;
|
||||
// ─── 并行显示(§5)────────────────────────────────────────────
|
||||
parallelBatch: ParallelSeatView[];
|
||||
selectedParallelSeats: string[];
|
||||
@@ -161,6 +171,8 @@ export function Step2Panel(props: Step2PanelProps) {
|
||||
agentConfigs,
|
||||
selectedAgentId,
|
||||
roles,
|
||||
seatFilter,
|
||||
setSeatFilter,
|
||||
parallelBatch,
|
||||
selectedParallelSeats,
|
||||
isParallelRunning,
|
||||
@@ -201,6 +213,36 @@ export function Step2Panel(props: Step2PanelProps) {
|
||||
const speedMeterEnabled = localSettings.display.streamSpeedMeterEnabled;
|
||||
const dialogueMetrics = useDialogueSpeedMetrics(step2RoundtableDialogues);
|
||||
|
||||
// ─── 按席位筛选会商记录 ──────────────────────────────────────────────────
|
||||
// 筛选状态在页面层(与左侧「参与角色 / 人工参与」卡片共用)。点卡片或点气泡头像
|
||||
// 都把目标归一化成同一 SeatFilter 标识(见 lib/seat-filter),命中 = 标识相等。
|
||||
// 仅在单列(非并行)视图启用;并行进行时主区另有「头像条选席位」机制,互不干扰。
|
||||
const toggleSeatFilter = useCallback(
|
||||
(filter: SeatFilter) =>
|
||||
setSeatFilter((cur) => (cur === filter ? null : filter)),
|
||||
[setSeatFilter],
|
||||
);
|
||||
const visibleDialogues = useMemo(
|
||||
() =>
|
||||
seatFilter
|
||||
? step2RoundtableDialogues.filter((d) =>
|
||||
senderMatchesSeatFilter(d.sender, seatFilter),
|
||||
)
|
||||
: step2RoundtableDialogues,
|
||||
[seatFilter, step2RoundtableDialogues],
|
||||
);
|
||||
// 选中的席位若已不在对话里(切换草稿 / 重置后),自动清除筛选,避免卡在空列表。
|
||||
useEffect(() => {
|
||||
if (
|
||||
seatFilter &&
|
||||
!step2RoundtableDialogues.some((d) =>
|
||||
senderMatchesSeatFilter(d.sender, seatFilter),
|
||||
)
|
||||
) {
|
||||
setSeatFilter(null);
|
||||
}
|
||||
}, [seatFilter, step2RoundtableDialogues, setSeatFilter]);
|
||||
|
||||
// 并行进入/退出、或切换主区显示席位时,布局在「平铺列表 ↔ 两列/单列网格」之间切换,
|
||||
// scrollHeight 会突变、scrollTop 被浏览器 clamp → useAutoScroll 误判成「用户上滚」而停跟随
|
||||
// (表现为并行时自动下滑失效)。这里在这些布局切换点**重新拉到底部 + 恢复自动跟随**。
|
||||
@@ -485,20 +527,55 @@ export function Step2Panel(props: Step2PanelProps) {
|
||||
})}
|
||||
</div>
|
||||
) : (
|
||||
step2RoundtableDialogues.map((msg) => (
|
||||
<Step2Message
|
||||
key={msg.id}
|
||||
msg={msg}
|
||||
metric={speedMeterEnabled ? dialogueMetrics.get(msg.id) : undefined}
|
||||
resolveAgentName={resolveAgentName}
|
||||
onArtifactStepClick={(step) => openArtifactFromStep(msg, step)}
|
||||
onFileCardClick={(path) => {
|
||||
if (msg.agentThreadId) {
|
||||
openArtifactPreview(msg.agentThreadId, path);
|
||||
}
|
||||
}}
|
||||
/>
|
||||
))
|
||||
<>
|
||||
{/* 席位筛选提示条:点卡片 / 头像只看某席位发言时出现,可一键显示全部。 */}
|
||||
{seatFilter && (
|
||||
<div className="sticky top-0 z-10 mb-1 flex items-center justify-between gap-2 rounded-lg border border-primary/20 bg-[var(--brand-200)]/20 px-3 py-1.5 backdrop-blur-sm">
|
||||
<span className="roundtable-chat-meta font-medium text-slate-600">
|
||||
仅显示{" "}
|
||||
<span className="font-bold text-primary">
|
||||
{seatFilterLabel(seatFilter)}
|
||||
</span>{" "}
|
||||
的发言
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setSeatFilter(null)}
|
||||
className="roundtable-chat-meta inline-flex shrink-0 items-center gap-1 rounded-md px-2 py-0.5 font-semibold text-primary transition hover:bg-primary/10"
|
||||
>
|
||||
<X className="size-3.5" />
|
||||
显示全部
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
{seatFilter && visibleDialogues.length === 0 ? (
|
||||
<div className="py-10 text-center text-xs text-slate-400">
|
||||
没有匹配「{seatFilterLabel(seatFilter)}」的消息
|
||||
</div>
|
||||
) : (
|
||||
visibleDialogues.map((msg) => (
|
||||
<Step2Message
|
||||
key={msg.id}
|
||||
msg={msg}
|
||||
metric={speedMeterEnabled ? dialogueMetrics.get(msg.id) : undefined}
|
||||
isAvatarSelected={
|
||||
seatFilter !== null &&
|
||||
senderMatchesSeatFilter(msg.sender, seatFilter)
|
||||
}
|
||||
onAvatarClick={() =>
|
||||
toggleSeatFilter(seatFilterForSender(msg.sender))
|
||||
}
|
||||
resolveAgentName={resolveAgentName}
|
||||
onArtifactStepClick={(step) => openArtifactFromStep(msg, step)}
|
||||
onFileCardClick={(path) => {
|
||||
if (msg.agentThreadId) {
|
||||
openArtifactPreview(msg.agentThreadId, path);
|
||||
}
|
||||
}}
|
||||
/>
|
||||
))
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
{!step2AtBottom && <ScrollToBottomButton onClick={scrollStep2ToBottom} />}
|
||||
@@ -706,6 +783,13 @@ export interface Step2MessageProps {
|
||||
* 由调用方按全局开关 streamSpeedMeterEnabled 决定是否传入(关则传 undefined)。
|
||||
*/
|
||||
metric?: MessageMetric;
|
||||
/**
|
||||
* 点击头像的回调 —— 传入则头像变为可点的「按席位筛选」开关。不传(并行两列等
|
||||
* 场景)则头像为纯展示,保持原样。
|
||||
*/
|
||||
onAvatarClick?: () => void;
|
||||
/** 当前筛选是否正命中本气泡的席位(命中则头像高亮)。 */
|
||||
isAvatarSelected?: boolean;
|
||||
/** 把派活 chip 的 agent id 解析成中文席位名。 */
|
||||
resolveAgentName?: (idOrName: string) => string;
|
||||
onArtifactStepClick?: (
|
||||
@@ -718,6 +802,8 @@ export interface Step2MessageProps {
|
||||
export function Step2Message({
|
||||
msg,
|
||||
metric,
|
||||
onAvatarClick,
|
||||
isAvatarSelected = false,
|
||||
resolveAgentName,
|
||||
onArtifactStepClick,
|
||||
onFileCardClick,
|
||||
@@ -732,9 +818,32 @@ export function Step2Message({
|
||||
const hasContent = content.length > 0;
|
||||
const presentedFiles = collectPresentedFiles(msg.steps);
|
||||
|
||||
const avatarInner = getAvatar(msg.avatarType, "h-9 w-9 shrink-0");
|
||||
// 传了 onAvatarClick → 头像变成「按席位筛选」开关:点亮当前筛选席位,带光圈高亮。
|
||||
const avatar = onAvatarClick ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={onAvatarClick}
|
||||
aria-pressed={isAvatarSelected}
|
||||
title={
|
||||
isAvatarSelected
|
||||
? "取消筛选,显示全部发言"
|
||||
: `只看 ${msg.sender} 的发言`
|
||||
}
|
||||
className={cn(
|
||||
"shrink-0 cursor-pointer rounded-full transition hover:opacity-80 focus:outline-none focus-visible:ring-2 focus-visible:ring-primary/60",
|
||||
isAvatarSelected && "ring-2 ring-primary ring-offset-1 ring-offset-white",
|
||||
)}
|
||||
>
|
||||
{avatarInner}
|
||||
</button>
|
||||
) : (
|
||||
avatarInner
|
||||
);
|
||||
|
||||
return (
|
||||
<MessageBubble
|
||||
avatar={getAvatar(msg.avatarType, "h-9 w-9 shrink-0")}
|
||||
avatar={avatar}
|
||||
senderName={msg.sender}
|
||||
badge={msg.confidence}
|
||||
time={msg.time}
|
||||
|
||||
Reference in new issue
Block a user