Merge branch 'ji' into master

This commit is contained in:
吉鑫升 committed 2026-06-17 17:39:23 +08:00
commit af8db1d24c
3 files changed
+142 -41

No files matched your search

+12
View File
@@ -27,6 +27,7 @@ import { QuestionNavigator } from "@/components/workspace/question-navigator";
import { ThreadTitle } from "@/components/workspace/thread-title";
import { TodoList } from "@/components/workspace/todo-list";
import { TokenUsageIndicator } from "@/components/workspace/token-usage-indicator";
import { UserIdentityBadge } from "@/components/workspace/user-identity-badge";
import { Welcome } from "@/components/workspace/welcome";
import { CompactWelcome } from "@/components/workspace/compact-welcome";
import { readSidebarEnabled } from "@/core/page-layout/sidebar-enabled";
@@ -481,6 +482,17 @@ export default function ChatPage() {
<ExportTrigger threadId={threadId} />
<KnowledgeSaveTrigger threadId={threadId} />
<ArtifactTrigger />
{/* 不带全局顶栏(紧凑模式)时,名称+岗位回落到聊天页顶栏右侧,
与全量模式 Header 右上角保持一致。全量模式已有顶栏则不重复展示。 */}
{!compactChrome && (
<>
<div
className="bg-border/70 mx-1 h-6 w-px shrink-0"
aria-hidden
/>
<UserIdentityBadge />
</>
)}
</div>
</header>
<main className="flex min-h-0 max-w-full grow flex-col">