Compare commits

...

2 Commits

Author SHA1 Message Date
yuxuanhui ac92b3e70b fix: 使用响应式 Grid 展示 Alpha 详情并独立排列 JSON 分组
Deploy production / deploy (push) Successful in 35s
2026-09-10 13:31:42 +08:00
yuxuanhui 1ba8d3ff3d fix: 修复研究助手首屏滚动与欢迎区布局 2026-09-10 13:26:57 +08:00
10 changed files with 323 additions and 143 deletions
+1
View File
@@ -33,6 +33,7 @@ export function AssistantDialogue({
timezone?: string;
jobs: Job[];
}) {
if (!messages.length) return null;
const sources = new Map(messages.map((message) => [message.id, message]));
const chats: Message[] = messages.map((message) => ({
id: message.id,
+17 -15
View File
@@ -10,7 +10,7 @@ import {
IconPlus,
IconChevronRight,
} from "@douyinfe/semi-icons";
import { contextLabel, contextReferences, researchPrompts } from "./workspace";
import { contextLabel, contextReferences } from "./workspace";
import { chatTransport } from "./transport";
import { runLabels } from "./types";
import type {
@@ -58,7 +58,7 @@ export function ChatPanel({
const [loading, setLoading] = useState(false);
const root = useRef<HTMLElement>(null);
const input = useRef<HTMLDivElement>(null);
const bottom = useRef<HTMLDivElement>(null);
const messagesViewport = useRef<HTMLDivElement>(null);
const previousFocus = useRef<HTMLElement | null>(null);
const seenChanges = useRef(new Set<string>());
const current = useRef({ conversationId, context });
@@ -206,7 +206,7 @@ export function ChatPanel({
const editor = input.current?.querySelector<HTMLElement>(
'[contenteditable="true"]',
);
if (editor) editor.focus();
if (editor) editor.focus({ preventScroll: true });
else
root.current
?.querySelector<HTMLButtonElement>('button[aria-label="收起研究助手"]')
@@ -226,7 +226,11 @@ export function ChatPanel({
};
}, [open]);
useEffect(() => {
if (open) bottom.current?.scrollIntoView({ block: "nearest" });
if (!open || !messagesViewport.current) return;
// Scroll only the message region; empty conversations always start at the welcome.
messagesViewport.current.scrollTop = chat.messages.length
? messagesViewport.current.scrollHeight
: 0;
}, [chat.messages, open]);
async function createConversation() {
@@ -409,7 +413,12 @@ export function ChatPanel({
/>
)}
{failure && <Banner type="danger" description={failure} />}
<div className="ai-messages" aria-live="polite" aria-busy={streaming}>
<div
ref={messagesViewport}
className="ai-messages"
aria-live="polite"
aria-busy={streaming}
>
{loading && <Spin />}
{!chat.messages.length && (
<div className="ai-empty">
@@ -428,7 +437,9 @@ export function ChatPanel({
开始新会话
</Button>
)}
<span>修改和任务操作会先展示预览,确认后执行。</span>
<p className="ai-empty-note">
修改和任务操作会先展示预览,确认后执行。
</p>
</div>
)}
<AssistantDialogue
@@ -460,7 +471,6 @@ export function ChatPanel({
)}
</div>
)}
<div ref={bottom} />
</div>
<footer className="ai-composer" ref={input}>
<div className="ai-context">{contextLabel(context)}</div>
@@ -477,14 +487,6 @@ export function ChatPanel({
busy={!!activeRun || streaming}
onSubmit={() => void send()}
onStop={activeRun ? () => void stop() : undefined}
prompts={researchPrompts(context)}
hint={
context.page === "datasets"
? context.unsaved_field_selection
? "字段选择尚未保存;请先保存为固定研究输入。未保存备注不会发送。"
: "引用随当前页面更新,未保存备注不会发送。"
: "引用随当前页面更新。修改和任务操作会先展示预览,确认后执行。"
}
/>
</footer>
</aside>
+7 -3
View File
@@ -146,7 +146,7 @@
border-radius: 8px;
}
.ai-empty {
margin: 32px 0;
margin: 16px 0;
color: var(--muted);
line-height: 24px;
}
@@ -159,8 +159,7 @@
.ai-empty .semi-button {
margin-top: var(--space-3);
}
.ai-empty span {
display: block;
.ai-empty-note {
font-size: 12px;
line-height: 20px;
margin-top: var(--space-4);
@@ -307,9 +306,14 @@
border-radius: 8px;
background: var(--semi-color-ai-background-top);
}
/* The outer message region owns scrolling, including welcome and run status. */
.ai-messages .semi-ai-chat-dialogue {
height: auto;
min-height: 0;
}
.ai-messages .semi-ai-chat-dialogue-list {
overflow: visible;
}
.ai-messages .semi-ai-chat-dialogue-inner {
min-width: 0;
}
+7 -81
View File
@@ -3,7 +3,6 @@ import {
Banner,
Button,
Checkbox,
Descriptions,
Empty,
Divider,
Input,
@@ -31,6 +30,7 @@ import type {
Research,
ResearchState,
} from "../types";
import { DetailFieldGrid } from "./DetailFieldGrid";
import { PnlChart } from "./PnlChart";
import { SelfCorrelationPanel } from "./SelfCorrelationPanel";
import { SubmissionPanel } from "./SubmissionPanel";
@@ -231,19 +231,10 @@ export function AlphaDetail({
>
<TabPane tab="概览与表达式" itemKey="overview">
<div className="detail-section">
<Descriptions
size="small"
align="left"
layout="horizontal"
column={3}
<DetailFieldGrid
data={["region", "universe", "stage"].map((key) => ({
key,
value: (
<DescriptionValue
field={key}
value={detail[key as keyof Detail]}
/>
),
value: detail[key as keyof Detail],
}))}
/>
<p className="muted">
@@ -266,14 +257,10 @@ export function AlphaDetail({
)}
<Divider />
<h3>回测设置</h3>
<Descriptions
size="small"
align="left"
layout="horizontal"
column={3}
<DetailFieldGrid
data={Object.entries(detail.settings).map(([key, value]) => ({
key,
value: <DescriptionValue field={key} value={value} />,
value,
}))}
/>
</div>
@@ -494,15 +481,8 @@ function MetricTable({
<div className="detail-section">
<h3>{title}</h3>
{entries.length ? (
<Descriptions
size="small"
align="left"
layout="horizontal"
column={3}
data={entries.map(([key, value]) => ({
key,
value: <DescriptionValue field={key} value={value} />,
}))}
<DetailFieldGrid
data={entries.map(([key, value]) => ({ key, value }))}
/>
) : (
<p className="muted">未提供</p>
@@ -510,57 +490,3 @@ function MetricTable({
</div>
);
}
/** Render structured metric values without flattening their field hierarchy. */
function DescriptionValue({ field, value }: { field: string; value: unknown }) {
if (value !== null && typeof value === "object") {
const entries = Object.entries(value);
return entries.length ? (
<Descriptions
className="nested-descriptions"
size="small"
align="left"
data={entries.map(([key, child]) => ({
key,
value: <DescriptionValue field={key} value={child} />,
}))}
/>
) : (
<span>{Array.isArray(value) ? "[]" : "{}"}</span>
);
}
// Use field semantics for states; numbers and ordinary text remain plain values.
const stateField = /(?:^|_)(status|state|stage|result|verdict)$/.test(
field.replace(/([a-z])([A-Z])/g, "$1_$2").toLowerCase(),
);
const state = typeof value === "string" ? value.toUpperCase() : "";
if (
value !== null &&
value !== undefined &&
value !== "" &&
(typeof value === "boolean" ||
stateField ||
state === "ON" ||
state === "OFF")
) {
const color =
value === true ||
["PASS", "PASSED", "SUCCESS", "COMPLETED", "ON"].includes(state)
? "green"
: ["FAIL", "FAILED", "ERROR", "BLOCK"].includes(state)
? "red"
: ["WARNING", "PENDING", "PARTIAL", "REVIEW"].includes(state)
? "orange"
: "grey";
return (
<Tag size="small" color={color}>
{typeof value === "boolean"
? value
? "是"
: "否"
: displayValue(value)}
</Tag>
);
}
return <span>{displayValue(value)}</span>;
}
@@ -0,0 +1,82 @@
import { Tag } from "@douyinfe/semi-ui-19";
import { displayValue } from "../api";
/** Keep structured values on their own row at every nesting level. */
export function DetailFieldGrid({
data,
}: {
data: { key: string; value: unknown }[];
}) {
return (
<div className="detail-field-container">
<dl className="detail-field-grid">
{data.map(({ key, value }) => {
const structured = value !== null && typeof value === "object";
return (
<div
className={structured ? "detail-field-group" : "detail-field"}
key={key}
>
<dt>{key}</dt>
<dd>
{structured ? (
Object.keys(value).length ? (
<DetailFieldGrid
data={Object.entries(value).map(([name, child]) => ({
key: Array.isArray(value) ? `[${name}]` : name,
value: child,
}))}
/>
) : (
<span className="muted">
{Array.isArray(value) ? "[]" : "{}"}
</span>
)
) : (
<FieldValue field={key} value={value} />
)}
</dd>
</div>
);
})}
</dl>
</div>
);
}
function FieldValue({ field, value }: { field: string; value: unknown }) {
// Use field semantics for states; numbers and ordinary text remain plain values.
const stateField = /(?:^|_)(status|state|stage|result|verdict)$/.test(
field.replace(/([a-z])([A-Z])/g, "$1_$2").toLowerCase(),
);
const state = typeof value === "string" ? value.toUpperCase() : "";
if (
value !== null &&
value !== undefined &&
value !== "" &&
(typeof value === "boolean" ||
stateField ||
state === "ON" ||
state === "OFF")
) {
const color =
value === true ||
["PASS", "PASSED", "SUCCESS", "COMPLETED", "ON"].includes(state)
? "green"
: ["FAIL", "FAILED", "ERROR", "BLOCK"].includes(state)
? "red"
: ["WARNING", "PENDING", "PARTIAL", "REVIEW"].includes(state)
? "orange"
: "grey";
return (
<Tag size="small" color={color}>
{typeof value === "boolean"
? value
? "是"
: "否"
: displayValue(value)}
</Tag>
);
}
return <span>{displayValue(value)}</span>;
}
@@ -2,7 +2,6 @@ import { useEffect, useState } from "react";
import {
Banner,
Button,
Descriptions,
Empty,
Spin,
Table,
@@ -10,6 +9,7 @@ import {
Toast,
} from "@douyinfe/semi-ui-19";
import { api, correlationLabels, formatNumber, formatTime, post } from "../api";
import { DetailFieldGrid } from "./DetailFieldGrid";
import type { CorrelationResult } from "../types";
export function SelfCorrelationPanel({
@@ -108,11 +108,7 @@ export function SelfCorrelationPanel({
计算于 {formatTime(result.calculated_at, timezone)}
</span>
</div>
<Descriptions
size="small"
align="left"
layout="horizontal"
column={3}
<DetailFieldGrid
data={[
{
key: "最大相关系数",
+53 -12
View File
@@ -919,20 +919,61 @@ label:not(.semi-checkbox):not(.semi-radio) {
.alpha-detail .semi-divider-horizontal {
margin: 16px 0;
}
.alpha-detail .semi-descriptions table {
table-layout: fixed;
width: 100%;
/* Container queries follow the available drawer width, including chat offsets. */
.detail-field-container {
container-type: inline-size;
min-width: 0;
}
.alpha-detail .semi-descriptions th,
.alpha-detail .semi-descriptions td {
padding-bottom: 6px;
vertical-align: top;
overflow-wrap: anywhere;
.detail-field-grid {
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
gap: 8px 24px;
margin: 0;
padding: 0;
text-align: left;
}
.alpha-detail .nested-descriptions {
margin-bottom: 0;
.detail-field {
display: grid;
grid-template-columns: minmax(0, 0.9fr) minmax(0, 1.1fr);
align-items: start;
gap: 12px;
min-width: 0;
}
.alpha-detail .nested-descriptions th {
width: 45%;
.detail-field-grid dt,
.detail-field-grid dd {
min-width: 0;
margin: 0;
overflow-wrap: anywhere;
font-size: 13px;
line-height: 20px;
text-align: left;
}
.detail-field > dt {
color: var(--muted);
}
.detail-field-group {
grid-column: 1 / -1;
min-width: 0;
border-top: 1px solid var(--line);
padding-top: 12px;
margin-top: 4px;
}
.detail-field-group > dt {
margin-bottom: 8px;
font-weight: 500;
color: var(--ink);
}
.detail-field-group .detail-field-group {
border-left: 2px solid var(--line);
padding-left: 12px;
}
@container (max-width: 760px) {
.detail-field-grid {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
}
@container (max-width: 480px) {
.detail-field-grid {
grid-template-columns: minmax(0, 1fr);
}
}
+71
View File
@@ -0,0 +1,71 @@
import { expect, test } from "@playwright/test";
for (const viewport of [
{ width: 1440, height: 850 },
{ width: 390, height: 650 },
]) {
test(`assistant opens with welcome and composer in view at ${viewport.width}`, async ({
page,
}) => {
await page.setViewportSize(viewport);
await page.route("**/api/v1/ai/conversations", (route) =>
route.fulfill({ json: [] }),
);
await page.route("**/api/v1/account", async (route) => {
const response = await route.fetch();
await route.fulfill({
json: { ...(await response.json()), theme: "dark" },
});
});
if (viewport.width === 1440)
await page.route("**/api/v1/ai/settings", (route) =>
route.fulfill({ json: { enabled: true, ready: true } }),
);
await page.goto("/");
await page
.getByLabel("密码", { exact: true })
.fill("browser-test-password");
await page.getByRole("button", { name: "进入工作空间" }).click();
await page.evaluate(() => document.body.setAttribute("theme-mode", "dark"));
await page.getByRole("button", { name: "切换研究助手" }).click();
const chat = page.getByRole("complementary", { name: "AI 研究助手" });
await expect(
chat.getByRole("heading", { name: "从当前研究出发" }),
).toBeInViewport();
await expect(
chat.getByRole("button", { name: "发送", exact: true }),
).toBeInViewport();
await expect(page.locator("body")).toHaveAttribute("theme-mode", "dark");
await page.screenshot({
path: `../output/playwright/ai-layout-${viewport.width}.png`,
});
const start = chat.getByRole("button", { name: "开始新会话", exact: true });
expect(
await start.evaluate((button) => {
const outer = button.getBoundingClientRect();
return [...button.querySelectorAll("span")].every((span) => {
const inner = span.getBoundingClientRect();
return inner.top >= outer.top && inner.bottom <= outer.bottom;
});
}),
).toBe(true);
await expect(
chat.locator(".research-ai-prompts, .research-ai-hint"),
).toHaveCount(0);
expect(
await chat.evaluate((el) => el.scrollHeight <= el.clientHeight),
).toBe(true);
await chat.getByRole("button", { name: "收起研究助手" }).click();
await page.getByRole("button", { name: "切换研究助手" }).click();
await expect(
chat.getByRole("heading", { name: "从当前研究出发" }),
).toBeInViewport();
await page.evaluate(() =>
document.body.setAttribute("theme-mode", "light"),
);
await page.screenshot({
path: `../output/playwright/ai-layout-${viewport.width}-light.png`,
});
});
}
+2 -7
View File
@@ -84,13 +84,13 @@ test("model settings, text stream, contextual query, confirmation and preserved
await page.getByRole("button", { name: "Alpha 管理", exact: true }).click();
await page.getByRole("textbox", { name: "搜索 Alpha" }).fill("TEST0001");
await page.getByRole("button", { name: "查询", exact: true }).click();
// Global tools sit below drawers; open the assistant before the Alpha detail.
await page.getByRole("button", { name: "切换研究助手" }).click();
await page.locator(".alpha-link").click();
await page.getByRole("tab", { name: "研究信息" }).click();
await page
.getByRole("textbox", { name: "研究备注" })
.fill("尚未保存的人工研究草稿");
// A global launcher must remain reachable when the detail mask is open.
await page.getByRole("button", { name: "切换研究助手" }).click();
const chat = page.getByRole("complementary", { name: "AI 研究助手" });
await chat.getByRole("button", { name: "新会话", exact: true }).click();
await expect(chat.locator(".research-ai-reference")).toContainText(
@@ -430,11 +430,6 @@ test("AI composer preserves literal text, IME input and drafts while generating"
)
sent.push(request.postDataJSON().message);
});
await chat
.getByRole("button", { name: "查询当前研究对象与已有结果", exact: true })
.click();
await expect(input).toHaveText("查询当前研究对象与已有结果");
expect(sent).toEqual([]);
await input.fill("SLOW <字段>");
await input.dispatchEvent("keydown", {
key: "Enter",
+81 -19
View File
@@ -95,11 +95,31 @@ test("submission tabs, day selection, local correlation and reload", async ({
await page.route("**/api/v1/alphas/TEST0004", async (route) => {
const response = await route.fetch();
const detail = await response.json();
detail.is_metrics.nested = {
detail.is_metrics.glbAmer = {
yearly: { sharpe: 1.25, status: "PASS" },
samples: 120,
enabled: false,
};
detail.is_metrics.glbApac = {
pnl: 439696,
bookSize: 20000000,
longCount: 215,
turnover: 0.0242,
sharpe: 0.85,
};
detail.is_metrics.glbEmea = { pnl: 571980, fitness: 0.19, sharpe: 0.72 };
detail.is_metrics.investabilityConstrained = {
pnl: 3696382,
longCount: 890,
turnover: 0.0919,
};
detail.is_metrics.history = [
{ status: "PASS", sharpe: 1.1 },
{ status: "FAIL", sharpe: 0.2 },
];
detail.is_metrics.emptyObject = {};
detail.is_metrics.emptyArray = [];
detail.is_metrics.unavailable = null;
await route.fulfill({ response, json: detail });
});
await page.locator(".alpha-link").click();
@@ -123,31 +143,73 @@ test("submission tabs, day selection, local correlation and reload", async ({
const metrics = sheet.locator(".detail-section").filter({
has: page.getByRole("heading", { name: "IS 指标", exact: true }),
});
await expect(metrics.locator(".nested-descriptions").first()).toContainText(
"1.25",
);
await expect(
metrics
.locator(".semi-descriptions-horizontal > table > tbody > tr")
.first()
.locator(":scope > th"),
).toHaveCount(3);
.locator(".detail-field-group")
.filter({ has: page.locator("dt", { hasText: "yearly" }) })
.first(),
).toContainText("1.25");
await expect(
metrics.locator(".semi-tag").filter({ hasText: "PASS" }),
metrics.locator(".semi-tag").filter({ hasText: "PASS" }).first(),
).toBeVisible();
await expect(
metrics.locator(".semi-tag").filter({ hasText: "否" }),
).toBeVisible();
expect(
await metrics
.locator("th, td")
.evaluateAll((cells) =>
cells.every((cell) => getComputedStyle(cell).textAlign === "left"),
),
).toBe(true);
await page.screenshot({
path: "../output/playwright/alpha-detail-metrics.png",
});
await expect(metrics).toContainText("[]");
await expect(metrics).toContainText("{}");
await expect(metrics).toContainText("未提供");
for (const [viewportWidth, columns] of [
[1440, 3],
[900, 2],
[600, 1],
[390, 1],
]) {
await page.setViewportSize({ width: viewportWidth, height: 1000 });
const grid = metrics.locator(
":scope > .detail-field-container > .detail-field-grid",
);
await expect
.poll(() =>
grid.evaluate(
(element) =>
getComputedStyle(element).gridTemplateColumns.split(" ").length,
),
)
.toBe(columns);
const layout = await metrics.evaluate((element) => {
const groups = Array.from(
element.querySelectorAll<HTMLElement>(".detail-field-group"),
);
return {
fullRows: groups.every((group) => {
const box = group.getBoundingClientRect();
const parent = group.parentElement!.getBoundingClientRect();
return (
Math.abs(box.x - parent.x) < 1 &&
Math.abs(box.width - parent.width) < 1
);
}),
leftAligned: Array.from(element.querySelectorAll("dt, dd")).every(
(cell) => getComputedStyle(cell).textAlign === "left",
),
noOverflow: Array.from(
element.querySelectorAll<HTMLElement>(
".detail-field-container, dt, dd",
),
).every((cell) => cell.scrollWidth <= cell.clientWidth + 1),
};
});
expect(layout).toEqual({
fullRows: true,
leftAligned: true,
noOverflow: true,
});
await page.screenshot({
path: `../output/playwright/alpha-grid-${viewportWidth}.png`,
animations: "disabled",
});
}
await page.setViewportSize({ width: 1440, height: 1000 });
await sheet.getByRole("tab", { name: "变体关系", exact: true }).click();
await expect(
sheet.getByRole("button", { name: "研究此 Alpha 的变体" }),