refactor: 一批名不副实的命名改掉(只动一端,不碰契约)

后端:
- getUserByToken → authenticateToken:它会删会话、续 TTL、记在线,不是纯读
- todayStart → dayStart(instant):本来就接受任意时刻,不只是「今天」
- objectValue → asRecord,删掉 4 份一模一样的私有拷贝和 `as toObject` 别名
- 报错文案 "does not exists" / "Already be a public problem" 改通顺

前端:
- utils/types 里 Contest / User / Problem 三个别名删掉:Contest 原来指后台
  比赛、契约里同名的却是学生侧。现在 Contest = 学生侧、AdminContest = 后台,
  后台用户表单叫 AdminUserForm,题目详情直接用 ProblemDetail
- SubmissionInfo → ContestSubmissionInfo,免得和 submission.info 撞名
- utoa / atou → compressToBase64 / decompressFromBase64(实际是 zlib + base64),
  encode / decode → base64EncodeUtf8 / base64DecodeUtf8
- filterResult → toProblemRow、toProblemListItem → toAdminProblemRow,
  行字段 submission / rate → submissionCount / acRate
- 组件:Modal → AddFromLibraryModal、Form → EditorToolbar、
  ContestEditor → BasicEditor(题单也在用它)、rank 的 Index → RankMedal、
  Name → UserNameCell、Password → PasswordCell、ContestType → ContestAccessTag

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
xuyueandClaude Opus 5.5 committed 2026-09-27 16:08:21 +08:00
1 parent 572a818d49
commit 5ae830a7f9
62 files changed
+284 -320

No files matched your search

+15 -15
View File
@@ -1,5 +1,5 @@
import api from "utils/api"
import { toProblemListItem } from "admin/transforms"
import { toAdminProblemRow } from "admin/transforms"
import type {
AcTrend,
AdminProblemSetProgress,
@@ -8,7 +8,7 @@ import type {
RenameTagResponse,
SqlTestCaseScript,
AcmHelperItem,
SubmissionInfo,
ContestSubmissionInfo,
AdminAiReport,
AdminAiReportList,
StuckProblem,
@@ -30,13 +30,13 @@ import type {
AdminAnnouncementListItem,
BlankContest,
BlankProblem,
Contest,
AdminContest,
Exercise,
ExerciseType,
SqlDisplay,
UploadTestCaseResponse,
Tutorial,
User,
AdminUserForm,
WebsiteConfig,
AdminProblemSetBadge,
AdminProblemSetList,
@@ -70,7 +70,7 @@ export async function getProblemList(
params: { offset, limit, keyword, author, tagId },
})
return {
results: res.results.map(toProblemListItem),
results: res.results.map(toAdminProblemRow),
total: res.total,
}
}
@@ -165,7 +165,7 @@ export function getUserList(
}
// 编辑用户
export function editUser(user: User) {
export function editUser(user: AdminUserForm) {
return api.put<AdminUser>(`admin/users/${user.id}`, {
username: user.username,
email: user.email,
@@ -297,7 +297,7 @@ export function createContestProblem(problem: BlankProblem) {
}
/** 组件里的比赛对象是 snake_case,出站转成新后端要的 camelCase */
function toContestBody(contest: Contest | BlankContest) {
function toContestBody(contest: AdminContest | BlankContest) {
return {
title: contest.title,
description: contest.description,
@@ -310,22 +310,22 @@ function toContestBody(contest: Contest | BlankContest) {
}
export function createContest(contest: BlankContest) {
return api.post<Contest>("admin/contests", toContestBody(contest))
return api.post<AdminContest>("admin/contests", toContestBody(contest))
}
export function editContest(contest: Contest | BlankContest) {
return api.put<Contest>(
`admin/contests/${(contest as Contest).id}`,
export function editContest(contest: AdminContest | BlankContest) {
return api.put<AdminContest>(
`admin/contests/${(contest as AdminContest).id}`,
toContestBody(contest),
)
}
export function cloneContest(contestId: number) {
return api.post<Contest>(`admin/contests/${contestId}/clone`)
return api.post<AdminContest>(`admin/contests/${contestId}/clone`)
}
export function getContest(id: string) {
return api.get<Contest>(`admin/contests/${id}`)
return api.get<AdminContest>(`admin/contests/${id}`)
}
export function addProblemForContest(
@@ -463,9 +463,9 @@ export function makeProblemPublic(id: number, displayId: string) {
// 比赛辅助检查
export function getACMHelperList(contestId: number) {
// acInfo 在契约里是 Record<string, unknown>(acm_contest_rank 的 JSONB 原文),
// 组件侧按 SubmissionInfo 读,收窄放在这里
// 组件侧按 ContestSubmissionInfo 读,收窄放在这里
return api.get<
Array<Omit<AcmHelperItem, "acInfo"> & { acInfo: SubmissionInfo }>
Array<Omit<AcmHelperItem, "acInfo"> & { acInfo: ContestSubmissionInfo }>
>(`admin/contests/${contestId}/acm-helper`)
}
@@ -1,9 +1,9 @@
<script lang="ts" setup>
import type { Contest } from "utils/types"
import type { AdminContest } from "utils/types"
import { cloneContest } from "../../api"
interface Props {
contest: Contest
contest: AdminContest
}
const props = defineProps<Props>()
const router = useRouter()
+3 -3
View File
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { errorMessage } from "utils/api"
import type { AcmHelperItem, SubmissionInfo } from "utils/types"
import type { AcmHelperItem, ContestSubmissionInfo } from "utils/types"
import { NButton, NCheckbox, NSelect, NTag } from "naive-ui"
import { parseTime } from "utils/functions"
import { getACMHelperList, getContest, updateACMHelperChecked } from "../api"
@@ -14,10 +14,10 @@ interface Props {
/**
* ACM 助手行。`acInfo` 的**内容**是 acm_contest_rank.submission_info 的 JSONB 原文,
* 键名保持 snake_case —— 判题写进去的就是这套键名,见 utils/types.ts 的 SubmissionInfo。
* 键名保持 snake_case —— 判题写进去的就是这套键名,见 utils/types.ts 的 ContestSubmissionInfo。
*/
type HelperItem = Omit<AcmHelperItem, "acInfo"> & {
acInfo: SubmissionInfo
acInfo: ContestSubmissionInfo
}
const props = defineProps<Props>()
+6 -6
View File
@@ -1,15 +1,15 @@
<script setup lang="ts">
import { NSwitch, NTag } from "naive-ui"
import ContestTitle from "shared/components/ContestTitle.vue"
import ContestType from "shared/components/ContestType.vue"
import ContestAccessTag from "shared/components/ContestAccessTag.vue"
import Pagination from "shared/components/Pagination.vue"
import { CONTEST_STATUS } from "utils/constants"
import { parseTime } from "utils/functions"
import type { Contest } from "utils/types"
import type { AdminContest } from "utils/types"
import { editContest, getContestList } from "../api"
import Actions from "./components/Actions.vue"
const contests = ref<Contest[]>([])
const contests = ref<AdminContest[]>([])
const total = ref(0)
const query = reactive({
limit: 10,
@@ -17,12 +17,12 @@ const query = reactive({
keyword: "",
})
function toggleVisible(contest: Contest) {
function toggleVisible(contest: AdminContest) {
contest.visible = !contest.visible
editContest(contest)
}
const columns: DataTableColumn<Contest>[] = [
const columns: DataTableColumn<AdminContest>[] = [
{ title: "ID", key: "id", width: 60 },
{
title: "比赛",
@@ -39,7 +39,7 @@ const columns: DataTableColumn<Contest>[] = [
title: "类型",
key: "contest_type",
width: 100,
render: (row) => h(ContestType, { contest: row, size: "small" }),
render: (row) => h(ContestAccessTag, { contest: row, size: "small" }),
},
{
title: "状态",
@@ -1,7 +1,7 @@
<script lang="ts" setup>
import { getProblemList } from "admin/api"
import Pagination from "shared/components/Pagination.vue"
import type { AdminProblemFiltered } from "utils/types"
import type { AdminProblemRow } from "utils/types"
import AddButton from "./AddButton.vue"
interface Props {
@@ -23,9 +23,9 @@ const query = reactive({
keyword: "",
})
const total = ref(0)
const problems = shallowRef<AdminProblemFiltered[]>([])
const problems = shallowRef<AdminProblemRow[]>([])
const columns: DataTableColumn<AdminProblemFiltered>[] = [
const columns: DataTableColumn<AdminProblemRow>[] = [
{ title: "编号", key: "_id", width: 80 },
{ title: "标题", key: "title" },
{
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { NButton, NTag } from "naive-ui"
import Pagination from "shared/components/Pagination.vue"
import type { AdminProblemFiltered } from "utils/types"
import type { AdminProblemRow } from "utils/types"
import { batchTagProblems, getProblemList } from "admin/api"
interface Props {
@@ -19,13 +19,13 @@ const emit = defineEmits<{
const router = useRouter()
const message = useMessage()
const problems = ref<AdminProblemFiltered[]>([])
const problems = ref<AdminProblemRow[]>([])
const total = ref(0)
const page = ref(1)
const limit = ref(10)
const keyword = ref("")
const columns: DataTableColumn<AdminProblemFiltered>[] = [
const columns: DataTableColumn<AdminProblemRow>[] = [
{ title: "显示编号", key: "_id", width: 100 },
{
title: "标题",
@@ -81,12 +81,12 @@ function close() {
emit("update:show", false)
}
function goEdit(row: AdminProblemFiltered) {
function goEdit(row: AdminProblemRow) {
close()
router.push({ name: "admin problem edit", params: { problemID: row.id } })
}
async function removeTag(row: AdminProblemFiltered) {
async function removeTag(row: AdminProblemRow) {
await batchTagProblems([row.id], [props.tagName], "remove")
message.success(`已移除「${row.title}」的标签`)
emit("changed")
+7 -7
View File
@@ -4,11 +4,11 @@ import { Icon } from "@iconify/vue"
import Pagination from "shared/components/Pagination.vue"
import { usePagination } from "shared/composables/pagination"
import { getTagColor, parseTime } from "utils/functions"
import type { AdminProblemFiltered } from "utils/types"
import type { AdminProblemRow } from "utils/types"
import { DIFFICULTY, REACTIONS } from "utils/constants"
import { getProblemList, toggleProblemVisible } from "../api"
import Actions from "./components/Actions.vue"
import Modal from "./components/Modal.vue"
import AddFromLibraryModal from "./components/AddFromLibraryModal.vue"
import { useRouteQuery } from "@vueuse/router"
import AuthorSelect from "shared/components/AuthorSelect.vue"
import type { DataTableRowKey } from "naive-ui"
@@ -36,7 +36,7 @@ const isContestProblemList = computed(
const [show, toggleShow] = useToggle()
const { count, inc } = useCounter(0)
const total = ref(0)
const problems = ref<AdminProblemFiltered[]>([])
const problems = ref<AdminProblemRow[]>([])
const selectedRowKeys = ref<DataTableRowKey[]>([])
const batchTagAction = ref<"add" | "remove">("add")
@@ -46,7 +46,7 @@ const selectedProblemIds = computed(() =>
selectedRowKeys.value.map((key) => Number(key)),
)
const rowKey = (row: AdminProblemFiltered) => row.id
const rowKey = (row: AdminProblemRow) => row.id
function chooseProblems(rowKeys: DataTableRowKey[]) {
selectedRowKeys.value = rowKeys
@@ -83,7 +83,7 @@ const { query, clearQuery } = usePagination<ProblemQuery>({
author: useRouteQuery("author", "").value,
})
const baseColumns: DataTableColumn<AdminProblemFiltered>[] = [
const baseColumns: DataTableColumn<AdminProblemRow>[] = [
{ title: "ID", key: "id", width: 100 },
{ title: "显示编号", key: "_id", width: 100 },
{ title: "标题", key: "title", minWidth: 200 },
@@ -183,7 +183,7 @@ const baseColumns: DataTableColumn<AdminProblemFiltered>[] = [
]
// 比赛题目接口不返回 top_reaction,这一列只在普通题目列表里显示
const columns = computed<DataTableColumn<AdminProblemFiltered>[]>(() =>
const columns = computed<DataTableColumn<AdminProblemRow>[]>(() =>
isContestProblemList.value
? baseColumns.filter((it) => !("key" in it) || it.key !== "topReaction")
: [{ type: "selection" }, ...baseColumns],
@@ -310,7 +310,7 @@ watch(() => [query.page, query.limit, query.author], listProblems)
v-model:limit="query.limit"
v-model:page="query.page"
/>
<Modal
<AddFromLibraryModal
v-model:show="show"
:count="count"
:next-display-id="nextDisplayID"
+3 -3
View File
@@ -1,9 +1,9 @@
import type { AdminProblemFiltered, AdminProblemListItem } from "utils/types"
import type { AdminProblemRow, AdminProblemListItem } from "utils/types"
// 把后端的列表项塑形成管理端列表行,与请求逻辑解耦。
export function toProblemListItem(
export function toAdminProblemRow(
result: AdminProblemListItem,
): AdminProblemFiltered {
): AdminProblemRow {
return {
id: result.id,
_id: result._id,
@@ -1,16 +1,16 @@
<script lang="ts" setup>
import { editUser } from "admin/api"
import type { User } from "utils/types"
import type { AdminUserForm } from "utils/types"
interface Props {
user: User
user: AdminUserForm
}
const props = defineProps<Props>()
const emit = defineEmits<{
(e: "deleteUser", value: number[]): void
(e: "userBanned", value: User): void
(e: "openEditModal", value: User): void
(e: "resetPassword", value: User): void
(e: "userBanned", value: AdminUserForm): void
(e: "openEditModal", value: AdminUserForm): void
(e: "resetPassword", value: AdminUserForm): void
}>()
async function banUser() {
@@ -1,10 +1,10 @@
<script lang="ts" setup>
import TextCopy from "shared/components/TextCopy.vue"
import { USER_TYPE } from "utils/constants"
import type { User } from "utils/types"
import type { AdminUserForm } from "utils/types"
interface Props {
user: User
user: AdminUserForm
revealed: boolean
}
const props = defineProps<Props>()
@@ -1,14 +1,14 @@
<script setup lang="ts">
import { PROBLEM_PERMISSION, USER_TYPE } from "utils/constants"
import { getUserRole } from "utils/functions"
import type { User } from "utils/types"
import type { AdminUserForm } from "utils/types"
import TextCopy from "shared/components/TextCopy.vue"
interface Props {
user: User
user: AdminUserForm
}
const props = defineProps<Props>()
const isNotRegularUser = computed(
const hasRoleTag = computed(
() => props.user.adminType !== USER_TYPE.REGULAR_USER,
)
</script>
@@ -18,7 +18,7 @@ const isNotRegularUser = computed(
封号中
</n-tag>
<n-tag
v-if="isNotRegularUser"
v-if="hasRoleTag"
:type="getUserRole(props.user.adminType).type"
size="small"
>
+12 -12
View File
@@ -4,7 +4,7 @@ import { DataTableRowKey, NFlex, NTag, SelectOption } from "naive-ui"
import Pagination from "shared/components/Pagination.vue"
import { usePagination } from "shared/composables/pagination"
import { parseTime } from "utils/functions"
import type { User } from "utils/types"
import type { AdminUserForm } from "utils/types"
import {
deleteUsers,
editUser,
@@ -13,8 +13,8 @@ import {
resetPassword,
} from "../api"
import Actions from "./components/Actions.vue"
import Name from "./components/Name.vue"
import Password from "./components/Password.vue"
import UserNameCell from "./components/UserNameCell.vue"
import PasswordCell from "./components/PasswordCell.vue"
import { PROBLEM_PERMISSION, USER_TYPE } from "utils/constants"
import { useRouteQuery } from "@vueuse/router"
import TextCopy from "shared/components/TextCopy.vue"
@@ -35,8 +35,8 @@ const { query, clearQuery } = usePagination<UserQuery>({
})
const total = ref(0)
const users = ref<User[]>([])
const userEditing = ref<User | null>(null)
const users = ref<AdminUserForm[]>([])
const userEditing = ref<AdminUserForm | null>(null)
const adminOptions = [
{ label: "全部用户", value: "" },
@@ -57,16 +57,16 @@ const password = ref("")
const revealedPasswords = ref(new Set<number>())
const userIDs = ref<DataTableRowKey[]>([])
const rowKey = (row: User) => row.id
const rowKey = (row: AdminUserForm) => row.id
const columns: DataTableColumn<User>[] = [
const columns: DataTableColumn<AdminUserForm>[] = [
{ type: "selection" },
{ title: "ID", key: "id", width: 80 },
{
title: "用户名",
key: "username",
width: 220,
render: (row) => h(Name, { user: row }),
render: (row) => h(UserNameCell, { user: row }),
},
{
// 显示出来的密码后面还跟着「隐藏」按钮,150 挤得下点点、挤不下密码
@@ -74,7 +74,7 @@ const columns: DataTableColumn<User>[] = [
key: "raw_password",
width: 180,
render: (row) =>
h(Password, {
h(PasswordCell, {
user: row,
revealed: revealedPasswords.value.has(row.id),
onToggle: (id: number) => {
@@ -165,7 +165,7 @@ async function onDeleteUsers(userIDs: DataTableRowKey[] | Ref<number[]>) {
listUsers()
}
async function onResetPassword(user: User) {
async function onResetPassword(user: AdminUserForm) {
const res = await resetPassword(user.id)
message.success(`【${user.username}】的密码已重置成【${res}】`)
users.value = users.value.map((it) => {
@@ -176,7 +176,7 @@ async function onResetPassword(user: User) {
})
}
async function onUserBanned(user: User) {
async function onUserBanned(user: AdminUserForm) {
users.value = users.value.map((it) => {
if (it.id === user.id) {
it.isDisabled = user.isDisabled
@@ -209,7 +209,7 @@ function createNewUser() {
password.value = ""
}
function onOpenEditModal(user: User) {
function onOpenEditModal(user: AdminUserForm) {
userEditing.value = user
password.value = ""
}