diff --git a/apps/api/src/routes/admin/problem.ts b/apps/api/src/routes/admin/problem.ts index e595d54..25c3d59 100644 --- a/apps/api/src/routes/admin/problem.ts +++ b/apps/api/src/routes/admin/problem.ts @@ -11,6 +11,7 @@ import { sqlPreviewRequestSchema, sqlTestCaseScriptSchema, uploadTestCaseResponseSchema, + type SqlConfig, } from "@oj2/contract" import { and, count, desc, eq, ilike, inArray, isNull, ne, or, sql } from "drizzle-orm" import { Hono } from "hono" @@ -138,7 +139,7 @@ function commonChecks(data: { inputDescription: string outputDescription: string samples: unknown[] - sqlConfig: Record | null + sqlConfig: SqlConfig | null answers: Record[] }): { error: string } | { sql: boolean } { if (data.languages.includes("SQL")) { @@ -164,7 +165,7 @@ function commonChecks(data: { async function generateSqlDisplay( testCaseId: string, answers: Record[], - sqlConfig: Record, + sqlConfig: SqlConfig, ): Promise<{ error: string } | { display: unknown }> { const info = await readInfo(testCaseId) if (!info) return { error: "测试点信息读取失败,请重新上传测试点" } @@ -183,8 +184,7 @@ async function generateSqlDisplay( (item) => item.language === "SQL" && typeof item.code === "string" && item.code.trim(), )?.code if (typeof refSql !== "string") return { error: "题目缺少 SQL 标准答案" } - const mode = sqlConfig.mode === "modify" ? "modify" as const : "query" as const - const outcome = await buildSqlDisplay(initSql, refSql, mode) + const outcome = await buildSqlDisplay(initSql, refSql, sqlConfig.mode) if (!outcome.ok) return { error: `SQL 展示数据生成失败: ${outcome.message}` } return { display: outcome.value } } diff --git a/apps/api/src/services/reaction.ts b/apps/api/src/services/reaction.ts index 7b640eb..7e9d7d7 100644 --- a/apps/api/src/services/reaction.ts +++ b/apps/api/src/services/reaction.ts @@ -1,4 +1,4 @@ -import { reactionKeySchema } from "@oj2/contract" +import { reactionKeySchema, type ReactionKey } from "@oj2/contract" import { count, inArray } from "drizzle-orm" import { db, schema } from "../db" @@ -12,8 +12,13 @@ const TYPE_ORDER = new Map( reactionKeySchema.options.map((key, index) => [key, index]), ) +/** 库里的 type 是裸字符串;在 TYPE_ORDER 里就等价于「契约认得的类型」。 */ +function isReactionKey(value: string): value is ReactionKey { + return TYPE_ORDER.has(value) +} + export interface TopReaction { - type: string + type: ReactionKey count: number } @@ -38,10 +43,10 @@ export async function getTopReactions(problemIds: number[]) { .groupBy(schema.reaction.problemId, schema.reaction.type) for (const row of rows) { - const order = TYPE_ORDER.get(row.type) // 库里可能残留前端已经下掉的旧类型。跳过而不是当成并列最优 —— // 否则一个已经不展示的类型会把真正的最高票挤掉。 - if (order === undefined) continue + if (!isReactionKey(row.type)) continue + const order = TYPE_ORDER.get(row.type)! const current = top.get(row.problemId) if ( !current || diff --git a/apps/web/src/admin/api.ts b/apps/web/src/admin/api.ts index 49ab240..307e902 100644 --- a/apps/web/src/admin/api.ts +++ b/apps/web/src/admin/api.ts @@ -29,7 +29,7 @@ import type { Contest, Exercise, ExerciseType, - SQLDisplay, + SqlDisplay, TestcaseUploadedReturns, Tutorial, User, @@ -237,7 +237,7 @@ export function previewSQLTestcase(data: { refSql: string mode: "query" | "modify" }) { - return api2.post("admin/sql-test-cases/preview", data) + return api2.post("admin/sql-test-cases/preview", data) } // 回显已上传的 SQL 测试点脚本内容(按 1.sql, 2.sql... 排序) diff --git a/apps/web/src/admin/problem/components/SQLTestcaseEditor.vue b/apps/web/src/admin/problem/components/SQLTestcaseEditor.vue index 7263f43..c13d61c 100644 --- a/apps/web/src/admin/problem/components/SQLTestcaseEditor.vue +++ b/apps/web/src/admin/problem/components/SQLTestcaseEditor.vue @@ -1,5 +1,5 @@