This commit is contained in:
@@ -3,7 +3,6 @@ import {
|
|||||||
Banner,
|
Banner,
|
||||||
Button,
|
Button,
|
||||||
Checkbox,
|
Checkbox,
|
||||||
Descriptions,
|
|
||||||
Empty,
|
Empty,
|
||||||
Divider,
|
Divider,
|
||||||
Input,
|
Input,
|
||||||
@@ -31,6 +30,7 @@ import type {
|
|||||||
Research,
|
Research,
|
||||||
ResearchState,
|
ResearchState,
|
||||||
} from "../types";
|
} from "../types";
|
||||||
|
import { DetailFieldGrid } from "./DetailFieldGrid";
|
||||||
import { PnlChart } from "./PnlChart";
|
import { PnlChart } from "./PnlChart";
|
||||||
import { SelfCorrelationPanel } from "./SelfCorrelationPanel";
|
import { SelfCorrelationPanel } from "./SelfCorrelationPanel";
|
||||||
import { SubmissionPanel } from "./SubmissionPanel";
|
import { SubmissionPanel } from "./SubmissionPanel";
|
||||||
@@ -231,19 +231,10 @@ export function AlphaDetail({
|
|||||||
>
|
>
|
||||||
<TabPane tab="概览与表达式" itemKey="overview">
|
<TabPane tab="概览与表达式" itemKey="overview">
|
||||||
<div className="detail-section">
|
<div className="detail-section">
|
||||||
<Descriptions
|
<DetailFieldGrid
|
||||||
size="small"
|
|
||||||
align="left"
|
|
||||||
layout="horizontal"
|
|
||||||
column={3}
|
|
||||||
data={["region", "universe", "stage"].map((key) => ({
|
data={["region", "universe", "stage"].map((key) => ({
|
||||||
key,
|
key,
|
||||||
value: (
|
value: detail[key as keyof Detail],
|
||||||
<DescriptionValue
|
|
||||||
field={key}
|
|
||||||
value={detail[key as keyof Detail]}
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
}))}
|
}))}
|
||||||
/>
|
/>
|
||||||
<p className="muted">
|
<p className="muted">
|
||||||
@@ -266,14 +257,10 @@ export function AlphaDetail({
|
|||||||
)}
|
)}
|
||||||
<Divider />
|
<Divider />
|
||||||
<h3>回测设置</h3>
|
<h3>回测设置</h3>
|
||||||
<Descriptions
|
<DetailFieldGrid
|
||||||
size="small"
|
|
||||||
align="left"
|
|
||||||
layout="horizontal"
|
|
||||||
column={3}
|
|
||||||
data={Object.entries(detail.settings).map(([key, value]) => ({
|
data={Object.entries(detail.settings).map(([key, value]) => ({
|
||||||
key,
|
key,
|
||||||
value: <DescriptionValue field={key} value={value} />,
|
value,
|
||||||
}))}
|
}))}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -494,15 +481,8 @@ function MetricTable({
|
|||||||
<div className="detail-section">
|
<div className="detail-section">
|
||||||
<h3>{title}</h3>
|
<h3>{title}</h3>
|
||||||
{entries.length ? (
|
{entries.length ? (
|
||||||
<Descriptions
|
<DetailFieldGrid
|
||||||
size="small"
|
data={entries.map(([key, value]) => ({ key, value }))}
|
||||||
align="left"
|
|
||||||
layout="horizontal"
|
|
||||||
column={3}
|
|
||||||
data={entries.map(([key, value]) => ({
|
|
||||||
key,
|
|
||||||
value: <DescriptionValue field={key} value={value} />,
|
|
||||||
}))}
|
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<p className="muted">未提供</p>
|
<p className="muted">未提供</p>
|
||||||
@@ -510,57 +490,3 @@ function MetricTable({
|
|||||||
</div>
|
</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 {
|
import {
|
||||||
Banner,
|
Banner,
|
||||||
Button,
|
Button,
|
||||||
Descriptions,
|
|
||||||
Empty,
|
Empty,
|
||||||
Spin,
|
Spin,
|
||||||
Table,
|
Table,
|
||||||
@@ -10,6 +9,7 @@ import {
|
|||||||
Toast,
|
Toast,
|
||||||
} from "@douyinfe/semi-ui-19";
|
} from "@douyinfe/semi-ui-19";
|
||||||
import { api, correlationLabels, formatNumber, formatTime, post } from "../api";
|
import { api, correlationLabels, formatNumber, formatTime, post } from "../api";
|
||||||
|
import { DetailFieldGrid } from "./DetailFieldGrid";
|
||||||
import type { CorrelationResult } from "../types";
|
import type { CorrelationResult } from "../types";
|
||||||
|
|
||||||
export function SelfCorrelationPanel({
|
export function SelfCorrelationPanel({
|
||||||
@@ -108,11 +108,7 @@ export function SelfCorrelationPanel({
|
|||||||
计算于 {formatTime(result.calculated_at, timezone)}
|
计算于 {formatTime(result.calculated_at, timezone)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<Descriptions
|
<DetailFieldGrid
|
||||||
size="small"
|
|
||||||
align="left"
|
|
||||||
layout="horizontal"
|
|
||||||
column={3}
|
|
||||||
data={[
|
data={[
|
||||||
{
|
{
|
||||||
key: "最大相关系数",
|
key: "最大相关系数",
|
||||||
|
|||||||
+53
-12
@@ -919,20 +919,61 @@ label:not(.semi-checkbox):not(.semi-radio) {
|
|||||||
.alpha-detail .semi-divider-horizontal {
|
.alpha-detail .semi-divider-horizontal {
|
||||||
margin: 16px 0;
|
margin: 16px 0;
|
||||||
}
|
}
|
||||||
.alpha-detail .semi-descriptions table {
|
/* Container queries follow the available drawer width, including chat offsets. */
|
||||||
table-layout: fixed;
|
.detail-field-container {
|
||||||
width: 100%;
|
container-type: inline-size;
|
||||||
|
min-width: 0;
|
||||||
}
|
}
|
||||||
.alpha-detail .semi-descriptions th,
|
.detail-field-grid {
|
||||||
.alpha-detail .semi-descriptions td {
|
display: grid;
|
||||||
padding-bottom: 6px;
|
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||||
vertical-align: top;
|
gap: 8px 24px;
|
||||||
overflow-wrap: anywhere;
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
.alpha-detail .nested-descriptions {
|
.detail-field {
|
||||||
margin-bottom: 0;
|
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 {
|
.detail-field-grid dt,
|
||||||
width: 45%;
|
.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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,11 +95,31 @@ test("submission tabs, day selection, local correlation and reload", async ({
|
|||||||
await page.route("**/api/v1/alphas/TEST0004", async (route) => {
|
await page.route("**/api/v1/alphas/TEST0004", async (route) => {
|
||||||
const response = await route.fetch();
|
const response = await route.fetch();
|
||||||
const detail = await response.json();
|
const detail = await response.json();
|
||||||
detail.is_metrics.nested = {
|
detail.is_metrics.glbAmer = {
|
||||||
yearly: { sharpe: 1.25, status: "PASS" },
|
yearly: { sharpe: 1.25, status: "PASS" },
|
||||||
samples: 120,
|
samples: 120,
|
||||||
enabled: false,
|
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 route.fulfill({ response, json: detail });
|
||||||
});
|
});
|
||||||
await page.locator(".alpha-link").click();
|
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({
|
const metrics = sheet.locator(".detail-section").filter({
|
||||||
has: page.getByRole("heading", { name: "IS 指标", exact: true }),
|
has: page.getByRole("heading", { name: "IS 指标", exact: true }),
|
||||||
});
|
});
|
||||||
await expect(metrics.locator(".nested-descriptions").first()).toContainText(
|
|
||||||
"1.25",
|
|
||||||
);
|
|
||||||
await expect(
|
await expect(
|
||||||
metrics
|
metrics
|
||||||
.locator(".semi-descriptions-horizontal > table > tbody > tr")
|
.locator(".detail-field-group")
|
||||||
.first()
|
.filter({ has: page.locator("dt", { hasText: "yearly" }) })
|
||||||
.locator(":scope > th"),
|
.first(),
|
||||||
).toHaveCount(3);
|
).toContainText("1.25");
|
||||||
await expect(
|
await expect(
|
||||||
metrics.locator(".semi-tag").filter({ hasText: "PASS" }),
|
metrics.locator(".semi-tag").filter({ hasText: "PASS" }).first(),
|
||||||
).toBeVisible();
|
).toBeVisible();
|
||||||
await expect(
|
await expect(
|
||||||
metrics.locator(".semi-tag").filter({ hasText: "否" }),
|
metrics.locator(".semi-tag").filter({ hasText: "否" }),
|
||||||
).toBeVisible();
|
).toBeVisible();
|
||||||
expect(
|
await expect(metrics).toContainText("[]");
|
||||||
await metrics
|
await expect(metrics).toContainText("{}");
|
||||||
.locator("th, td")
|
await expect(metrics).toContainText("未提供");
|
||||||
.evaluateAll((cells) =>
|
for (const [viewportWidth, columns] of [
|
||||||
cells.every((cell) => getComputedStyle(cell).textAlign === "left"),
|
[1440, 3],
|
||||||
),
|
[900, 2],
|
||||||
).toBe(true);
|
[600, 1],
|
||||||
await page.screenshot({
|
[390, 1],
|
||||||
path: "../output/playwright/alpha-detail-metrics.png",
|
]) {
|
||||||
});
|
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 sheet.getByRole("tab", { name: "变体关系", exact: true }).click();
|
||||||
await expect(
|
await expect(
|
||||||
sheet.getByRole("button", { name: "研究此 Alpha 的变体" }),
|
sheet.getByRole("button", { name: "研究此 Alpha 的变体" }),
|
||||||
|
|||||||
Reference in New Issue
Block a user