- classLabel / groupClassOptions / classSelectOptions 挪到 utils/classes.ts,useTone 挪到 shared/composables/tone.ts:原来放在 oj/submission/ 下,被前台、后台、shared 引了 50 多处 - 流程图编辑器的草稿键改由题目页传进来(键名不变,学生存着的草稿照样读得到)。原来编辑器 自己读题目页的 store 和路由拼,后台出题页也用这个组件,那边 store 是空的 - SQL 表名补全改由题目页传表进来。原来补全直接读题目页的 store,自学页的 SQL 代码块会 补出上一道看过的题的表名 实跑:提交列表、题目页、排名、后台题目页、SQL 题、流程图题打开无报错;SQL 题输入 stu 补出 students;流程图加一步,草稿照旧存在 flowchart-v2-problem-<题号>。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
465dbfd42f
commit
309ca0ece2
59 files changed
+168
-142
No files matched your search
@@ -11,7 +11,7 @@ import { useBreakpoints } from "shared/composables/breakpoints"
|
||||
import AdminLink from "shared/components/AdminLink.vue"
|
||||
import { useUserStore } from "shared/store/user"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { parseTime } from "utils/functions"
|
||||
import { getLearningReport } from "../api"
|
||||
import AiSummary from "./components/AiSummary.vue"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import type { LearningDay } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
import ProblemChip from "./ProblemChip.vue"
|
||||
import { dayLabel, isDone } from "../utils"
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import type { ClassPk, ClassPkCell } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { parseTime } from "utils/functions"
|
||||
import { needToTie, pkColor, plateau, shortLabels, tint } from "../utils"
|
||||
import PkHist from "./PkHist.vue"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import type { ClassPk } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { useRankPalette } from "oj/rank/palette"
|
||||
import { needToTie, pkColor, shortLabels, tint } from "../utils"
|
||||
import PkRace from "./PkRace.vue"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import type { ClassBattleItem, ClassPk, ClassPkPeriod } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { getClassBattle, getClassPk } from "oj/api"
|
||||
import { classLabel, groupClassOptions } from "oj/submission/utils"
|
||||
import { classLabel, groupClassOptions } from "utils/classes"
|
||||
import { useAIStream } from "shared/composables/aiStream"
|
||||
import { useBreakpoints } from "shared/composables/breakpoints"
|
||||
import { useUserStore } from "shared/store/user"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { ClassPk, ClassPkCell } from "@oj2/contract"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
|
||||
/**
|
||||
* 每个班一种颜色,按选班的顺序给。蓝 / 橙打头:两个班对决时最常见,这两个色盲也分得开;
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
import { Icon } from "@iconify/vue"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { getClassBoard, setClassLesson } from "oj/api"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { groupClassOptions } from "oj/submission/utils"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { groupClassOptions } from "utils/classes"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import { useLeaveStudents } from "shared/composables/leaveStudents"
|
||||
import { useTeacherHelp } from "shared/composables/teacherHelp"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import { isExamTag } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { CONTEST_STATUS, ContestStatus } from "utils/constants"
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import type { ContestScoreRow } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { secondsToDuration } from "utils/functions"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { ContestStatus } from "utils/constants"
|
||||
import { parseTime, secondsToDuration } from "utils/functions"
|
||||
import NotFound from "shared/components/NotFound.vue"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { useRouteQuery } from "@vueuse/router"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { getContestList } from "oj/api"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { contestLength, parseTime, secondsToDuration } from "utils/functions"
|
||||
import type { Contest } from "utils/types"
|
||||
import ContestTitle from "shared/components/ContestTitle.vue"
|
||||
|
||||
@@ -5,8 +5,8 @@ import { updateACMHelperChecked } from "admin/api"
|
||||
import { getContestClassView, getSubmission, getSubmissions } from "oj/api"
|
||||
import { useContestStore } from "oj/store/contest"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { useLeaveStudents } from "shared/composables/leaveStudents"
|
||||
import { ContestStatus, LANGUAGE_FORMAT_VALUE } from "utils/constants"
|
||||
import { parseTime, secondsToDuration } from "utils/functions"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import type { ContestScoreRow } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { useContestStore } from "oj/store/contest"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { useUserStore } from "shared/store/user"
|
||||
import { ContestStatus } from "utils/constants"
|
||||
import { parseTime, secondsToDuration } from "utils/functions"
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
import type { ContestScoreCell, ContestScoreRow } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { useContestStore } from "oj/store/contest"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { useUserStore } from "shared/store/user"
|
||||
import { ContestStatus } from "utils/constants"
|
||||
import { secondsToDuration } from "utils/functions"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import { useVisibleInterval } from "shared/composables/visibleInterval"
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import type { ClassToday } from "@oj2/contract"
|
||||
import type { AnnouncementListItem } from "utils/types"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { getAnnouncementList, getClassToday } from "oj/api"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { useUserStore } from "shared/store/user"
|
||||
import { parseTime, zonedParts, zonedYear } from "utils/functions"
|
||||
|
||||
|
||||
@@ -120,6 +120,19 @@ onMounted(loadCode)
|
||||
|
||||
watch(() => problem.value?._id, loadCode)
|
||||
|
||||
/**
|
||||
* 流程图草稿:每道题一份;题单入口单独一份 —— 加入题单之前在题库里画到 A 的那张,不能一进
|
||||
* 题单就摆在画布上(设计文档第 11 节 3,和代码草稿同理)。
|
||||
* 键名带 v2:2026-10 之前的草稿是 vue-flow 的格式,读不了,也不去覆盖它
|
||||
*/
|
||||
const flowchartDraftKey = computed(() => {
|
||||
const id = problem.value?._id
|
||||
if (!id) return "flowchart-v2"
|
||||
const base = `flowchart-v2-problem-${id}`
|
||||
const problemSetId = route.params.problemSetId
|
||||
return problemSetId ? `${base}-problemset-${problemSetId}` : base
|
||||
})
|
||||
|
||||
/**
|
||||
* 存本地草稿。**协作中的教师不存** —— 那会儿编辑器里是学生的代码,存下去就把
|
||||
* 老师自己在这道题上的草稿盖掉了(他可能正开着自己的解法)。学生照存,那是他本人的。
|
||||
@@ -219,6 +232,7 @@ onBeforeUnmount(() => flowchartStore.attachEditor(null))
|
||||
v-if="codeStore.code.language === 'Flowchart'"
|
||||
ref="flowchartEditorRef"
|
||||
:height="editorHeight"
|
||||
:draft-key="flowchartDraftKey"
|
||||
/>
|
||||
<SyncCodeEditor
|
||||
v-else
|
||||
@@ -226,6 +240,7 @@ onBeforeUnmount(() => flowchartStore.attachEditor(null))
|
||||
:language="codeStore.code.language"
|
||||
:problem-id="problem!._id"
|
||||
:collab="ctx.collab"
|
||||
:sql-tables="problem?.sqlDisplay?.tables"
|
||||
:height="editorHeight"
|
||||
:extra-extensions="editorExtensions"
|
||||
:font-size="isDesktop ? 20 : 15"
|
||||
|
||||
@@ -5,8 +5,9 @@ import { storeToRefs } from "pinia"
|
||||
import { getProblemStats } from "oj/api"
|
||||
import { useContestStore } from "oj/store/contest"
|
||||
import { useProblemStore } from "oj/store/problem"
|
||||
import { useTone, type Tone } from "oj/submission/composables/tone"
|
||||
import { classLabel, submissionDayText } from "oj/submission/utils"
|
||||
import { useTone, type Tone } from "shared/composables/tone"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { submissionDayText } from "oj/submission/utils"
|
||||
import { DIFFICULTY, JUDGE_STATUS } from "utils/constants"
|
||||
import { getTagColor, parseTime } from "utils/functions"
|
||||
import type { ProblemStats, SUBMISSION_RESULT } from "utils/types"
|
||||
|
||||
@@ -3,7 +3,7 @@ import { Icon } from "@iconify/vue"
|
||||
import type { ProblemProgress } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import AchievementIcon from "shared/components/AchievementIcon.vue"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
|
||||
/**
|
||||
* 题目列表顶上那行的左半边:先说做到了什么(设计稿「题目列表重设计 · 改版」)。
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { Icon } from "@iconify/vue"
|
||||
import type { Tag, TagCategory } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
|
||||
/**
|
||||
* 题目列表左栏:知识点 / 主题,带自己的进度(设计稿「题目列表重设计 · 改版」)。
|
||||
|
||||
@@ -5,7 +5,7 @@ import { useRouteQuery } from "@vueuse/router"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { getAuthors, getProblemList, getProblemProgress, getRandomProblem } from "oj/api"
|
||||
import { useCodeStore } from "oj/store/code"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { STORAGE_KEY } from "utils/constants"
|
||||
import storage from "utils/storage"
|
||||
import type { ProblemRow } from "utils/types"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { parseTime } from "utils/functions"
|
||||
import type { ProblemSet } from "utils/types"
|
||||
import { badgeCondition, badgeShortfall, ladder, nextBadge } from "../badges"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<script setup lang="ts">
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { getProblemSetClassView } from "oj/api"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { classLabel, groupClassOptions } from "oj/submission/utils"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { classLabel, groupClassOptions } from "utils/classes"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import { parseTime } from "utils/functions"
|
||||
import type { ProblemSetClassView } from "utils/types"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { useRouteQuery } from "@vueuse/router"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { getProblemSetDetail, getProblemSetProblems, joinProblemSet } from "oj/api"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { errorMessage } from "utils/api"
|
||||
import { parseTime } from "utils/functions"
|
||||
import type { ProblemSet, ProblemSetProblem } from "utils/types"
|
||||
|
||||
@@ -4,7 +4,7 @@ import AdminLink from "shared/components/AdminLink.vue"
|
||||
import { useBreakpoints } from "shared/composables/breakpoints"
|
||||
import { useUserStore } from "shared/store/user"
|
||||
import { getProblemSetList } from "oj/api"
|
||||
import { rgba, useTone } from "oj/submission/composables/tone"
|
||||
import { rgba, useTone } from "shared/composables/tone"
|
||||
import { parseTime } from "utils/functions"
|
||||
import type { ProblemSet } from "utils/types"
|
||||
import { badgeCondition, ladder, nextBadge } from "./badges"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import type { ClassBattleItem } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { useRankPalette } from "../palette"
|
||||
|
||||
/**
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import type { ClassDetail } from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { getClassDetail } from "oj/api"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import { useAIStream } from "shared/composables/aiStream"
|
||||
import { useBackClose } from "shared/composables/backClose"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { useDark } from "@vueuse/core"
|
||||
import { rgba } from "oj/submission/composables/tone"
|
||||
import { rgba } from "shared/composables/tone"
|
||||
import { USERNAME_CLASS_RE } from "utils/constants"
|
||||
|
||||
/**
|
||||
|
||||
@@ -9,7 +9,7 @@ import type {
|
||||
} from "@oj2/contract"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { clearMood, getClassBattle, getRankBoard, getWeeklyChampions, setRankHidden } from "oj/api"
|
||||
import { classLabel, groupClassOptions } from "oj/submission/utils"
|
||||
import { classLabel, groupClassOptions } from "utils/classes"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import { useBreakpoints } from "shared/composables/breakpoints"
|
||||
import { useConfigStore } from "shared/store/config"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { RankPeriod, RankRow, RankScope } from "@oj2/contract"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
|
||||
export const SCOPE_OPTIONS: { value: RankScope; label: string }[] = [
|
||||
{ value: "class", label: "本班" },
|
||||
|
||||
@@ -14,7 +14,7 @@ import { getSubmission } from "oj/api"
|
||||
import { JUDGE_STATUS, LANGUAGE_FORMAT_VALUE, SubmissionStatus } from "utils/constants"
|
||||
import { parseTime } from "utils/functions"
|
||||
import type { SUBMISSION_RESULT } from "utils/types"
|
||||
import { useTone, type Tone } from "oj/submission/composables/tone"
|
||||
import { useTone, type Tone } from "shared/composables/tone"
|
||||
|
||||
/**
|
||||
* 一个人在一道题上的每一次提交,一格一次、从早到晚(设计稿「统计重设计」)。
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { NO_CLASS, type SubmissionStatisticsGrid } from "@oj2/contract"
|
||||
import { SubmissionStatus } from "utils/constants"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { classLabel, submissionDayText } from "oj/submission/utils"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { submissionDayText } from "oj/submission/utils"
|
||||
|
||||
/**
|
||||
* 没选班级、也没填学生时(多半是从题目页进来,只带了题号):先按班级列出来,
|
||||
|
||||
@@ -5,7 +5,7 @@ import type { SubmissionStatistics, SubmissionStatisticsGrid } from "@oj2/contra
|
||||
import { SubmissionStatus } from "utils/constants"
|
||||
import { parseTime } from "utils/functions"
|
||||
import StatusPill from "oj/submission/components/StatusPill.vue"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import AttemptSquares from "./AttemptSquares.vue"
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ import { Bar, Doughnut, Radar } from "vue-chartjs"
|
||||
import type { FlowchartStatistics } from "@oj2/contract"
|
||||
import { useChartTheme } from "shared/composables/chartTheme"
|
||||
import { FLOWCHART_CRITERIA_ORDER } from "utils/constants"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import RingChart from "./RingChart.vue"
|
||||
import StatItem from "./StatItem.vue"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
|
||||
@@ -3,8 +3,8 @@ import { Icon } from "@iconify/vue"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import type { SubmissionLessons } from "@oj2/contract"
|
||||
import { parseTime, zonedParts } from "utils/functions"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { resultName, useResultColor } from "../results"
|
||||
|
||||
type Lesson = SubmissionLessons["lessons"][number]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { useTone, type Tone } from "oj/submission/composables/tone"
|
||||
import { useTone, type Tone } from "shared/composables/tone"
|
||||
|
||||
/** 数字行的一格:小字标签 + 大号数字 + 单位 */
|
||||
const props = defineProps<{
|
||||
|
||||
@@ -16,8 +16,8 @@ import {
|
||||
} from "oj/api"
|
||||
import { useConfigStore } from "shared/store/config"
|
||||
import { fromPickerValue, toPickerValue } from "utils/functions"
|
||||
import { useTone } from "oj/submission/composables/tone"
|
||||
import { classSelectOptions } from "oj/submission/utils"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { classSelectOptions } from "utils/classes"
|
||||
import { DEFAULT_PERIOD, PERIOD_OPTIONS, dayStartOfDate, periodRange, type Period } from "../period"
|
||||
import { resultName, useResultColor } from "../results"
|
||||
import ByClass from "./ByClass.vue"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { JUDGE_STATUS } from "utils/constants"
|
||||
import type { SUBMISSION_RESULT } from "utils/types"
|
||||
import { useTone, type Tone } from "oj/submission/composables/tone"
|
||||
import { useTone, type Tone } from "shared/composables/tone"
|
||||
|
||||
export function resultName(result: number) {
|
||||
return JUDGE_STATUS[result as SUBMISSION_RESULT]?.name ?? "其他"
|
||||
|
||||
@@ -6,7 +6,7 @@ import { useMermaid } from "shared/composables/useMermaid"
|
||||
import { sortFlowchartCriteria } from "utils/constants"
|
||||
import type { FlowchartSubmission, FlowchartSubmissionListItem } from "utils/types"
|
||||
import { FlowchartSubmissionStatus } from "utils/types"
|
||||
import { useTone } from "../composables/tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { submissionTimeText } from "../utils"
|
||||
import FlowchartState from "./FlowchartState.vue"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { FlowchartSubmissionStatus } from "utils/types"
|
||||
import { useTone, type Tone } from "../composables/tone"
|
||||
import { useTone, type Tone } from "shared/composables/tone"
|
||||
|
||||
/**
|
||||
* 流程图提交在列表里的那个胶囊:评完的直接是「A 级」,没评完的是
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { Icon } from "@iconify/vue"
|
||||
import { JUDGE_STATUS, SubmissionStatus } from "utils/constants"
|
||||
import type { SUBMISSION_RESULT } from "utils/types"
|
||||
import { useTone, type Tone } from "../composables/tone"
|
||||
import { useTone, type Tone } from "shared/composables/tone"
|
||||
|
||||
const props = defineProps<{
|
||||
result: SUBMISSION_RESULT
|
||||
|
||||
@@ -14,8 +14,9 @@ import { submissionCaseResults } from "utils/functions"
|
||||
import type { Submission, SubmissionListItem } from "utils/types"
|
||||
import { useCopySubmission } from "../composables/copySubmission"
|
||||
import { useSubmissionExplain } from "../composables/explain"
|
||||
import { useTone } from "../composables/tone"
|
||||
import { classLabel, submissionTimeText } from "../utils"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { submissionTimeText } from "../utils"
|
||||
import CodeView from "./CodeView.vue"
|
||||
import ExplainNote from "./ExplainNote.vue"
|
||||
import StatusPill from "./StatusPill.vue"
|
||||
|
||||
@@ -19,8 +19,9 @@ import { parseTime, submissionCaseResults } from "utils/functions"
|
||||
import type { Submission } from "utils/types"
|
||||
import { useCopySubmission } from "../composables/copySubmission"
|
||||
import { useSubmissionExplain } from "../composables/explain"
|
||||
import { useTone } from "../composables/tone"
|
||||
import { classLabel, submissionTimeText } from "../utils"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { classLabel } from "utils/classes"
|
||||
import { submissionTimeText } from "../utils"
|
||||
import CodeView from "./CodeView.vue"
|
||||
import ExplainNote from "./ExplainNote.vue"
|
||||
import StatusPill from "./StatusPill.vue"
|
||||
|
||||
@@ -3,7 +3,7 @@ import { explainPythonCompileError } from "oj/problem/utils/pythonError"
|
||||
import { explainRuntimeError } from "oj/problem/utils/runtimeError"
|
||||
import { SubmissionStatus } from "utils/constants"
|
||||
import type { Submission } from "utils/types"
|
||||
import { useTone } from "./tone"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
|
||||
export interface SubmissionExplain {
|
||||
/** 错在第几行(编辑器里那一行标红),说不出来的为 null */
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { useDark } from "@vueuse/core"
|
||||
|
||||
export type Tone = "success" | "error" | "warning" | "info" | "default"
|
||||
|
||||
export function rgba(hex: string, alpha: number) {
|
||||
const value = hex.replace("#", "")
|
||||
const full =
|
||||
value.length === 3
|
||||
? value
|
||||
.split("")
|
||||
.map((c) => c + c)
|
||||
.join("")
|
||||
: value.slice(0, 6)
|
||||
const n = parseInt(full, 16)
|
||||
return `rgba(${(n >> 16) & 255}, ${(n >> 8) & 255}, ${n & 255}, ${alpha})`
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交列表里各种小胶囊的配色:浅底 + 深一档的字(设计稿「提交列表重设计 · 定稿」)。
|
||||
* 从主题色里取,暗色下字换成主题色本身(深色字放在暗底上看不清)。
|
||||
* 不用 color-mix:Chrome 105 没有(111 才有),机房有一部分还是 105。
|
||||
*/
|
||||
export function useTone() {
|
||||
const theme = useThemeVars()
|
||||
const isDark = useDark()
|
||||
|
||||
return function tone(kind: Tone) {
|
||||
const t = theme.value
|
||||
const base = {
|
||||
success: t.successColor,
|
||||
error: t.errorColor,
|
||||
warning: t.warningColor,
|
||||
info: t.infoColor,
|
||||
default: t.textColor3,
|
||||
}[kind]
|
||||
const pressed = {
|
||||
success: t.successColorPressed,
|
||||
error: t.errorColorPressed,
|
||||
warning: t.warningColorPressed,
|
||||
info: t.infoColorPressed,
|
||||
default: t.textColor2,
|
||||
}[kind]
|
||||
return {
|
||||
color: isDark.value ? base : pressed,
|
||||
background: kind === "default" ? t.actionColor : rgba(base, isDark.value ? 0.16 : 0.12),
|
||||
solid: base,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -31,8 +31,9 @@ import { FlowchartSubmissionStatus } from "utils/types"
|
||||
import FlowchartState from "./components/FlowchartState.vue"
|
||||
import StatusPill from "./components/StatusPill.vue"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import { useTone } from "./composables/tone"
|
||||
import { classLabel, classSelectOptions, submissionClockText, submissionDayText } from "./utils"
|
||||
import { useTone } from "shared/composables/tone"
|
||||
import { classLabel, classSelectOptions } from "utils/classes"
|
||||
import { submissionClockText, submissionDayText } from "./utils"
|
||||
|
||||
/**
|
||||
* 提交列表(设计稿「提交列表重设计 · 定稿」):左边列表、右边常驻选中那条的代码。
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { NO_CLASS } from "@oj2/contract"
|
||||
import { parseTime } from "utils/functions"
|
||||
|
||||
/**
|
||||
@@ -33,57 +32,3 @@ export function submissionDayText(time: string) {
|
||||
if (day.slice(0, 4) === now.slice(0, 4)) return parseTime(time, "M月D日")
|
||||
return parseTime(time, "YYYY年M月D日")
|
||||
}
|
||||
|
||||
/**
|
||||
* 班级下拉的标签:`253` → `25计算机3班`,和统计面板、班级 PK 同一个写法。
|
||||
* null(接口里没填班级的号)和 NO_CLASS(筛选里的「没填班级」)都写成「没填班级」
|
||||
*/
|
||||
export function classLabel(className: string | null) {
|
||||
if (className === null || className === NO_CLASS) return "没填班级"
|
||||
if (!/^\d{3,}$/.test(className)) return className
|
||||
return `${className.slice(0, 2)}计算机${className.slice(2)}班`
|
||||
}
|
||||
|
||||
type ClassOption = { label: string; value: string }
|
||||
|
||||
/**
|
||||
* 全站的班级下拉都按年级分组:「25 级」底下列 251、252……,新的年级在上,组里按班号排
|
||||
* (11 班排在 2 班后面)。年级是班号前两位,和排名的「本年级」同一个口径。
|
||||
* `first` 给了就把那个年级提到最前(班级 PK 加班时先给同年级的)。
|
||||
* `toOption` 换掉选项长相(题单的「n/m 人加入」、登录框的 ks 前缀);不是数字班号的
|
||||
* 名字不分组,按原顺序跟在最后。
|
||||
*/
|
||||
export function groupClassOptions<T extends ClassOption = ClassOption>(
|
||||
names: string[],
|
||||
toOption: (name: string) => T = (name) => ({ label: classLabel(name), value: name }) as T,
|
||||
first?: string,
|
||||
) {
|
||||
const groups = new Map<string, string[]>()
|
||||
const rest: string[] = []
|
||||
for (const name of new Set(names)) {
|
||||
if (!/^\d{3,}$/.test(name)) {
|
||||
rest.push(name)
|
||||
continue
|
||||
}
|
||||
const grade = name.slice(0, 2)
|
||||
groups.set(grade, [...(groups.get(grade) ?? []), name])
|
||||
}
|
||||
const grouped = [...groups]
|
||||
.sort((a, b) => (a[0] === first ? -1 : b[0] === first ? 1 : b[0].localeCompare(a[0])))
|
||||
.map(([grade, list]) => ({
|
||||
type: "group" as const,
|
||||
label: `${grade} 级`,
|
||||
key: `grade-${grade}`,
|
||||
children: list.sort((a, b) => a.localeCompare(b, "zh", { numeric: true })).map(toOption),
|
||||
}))
|
||||
return [...grouped, ...rest.map(toOption)]
|
||||
}
|
||||
|
||||
/**
|
||||
* 班级下拉的选项:配置里的班按年级分组,最后一项「没填班级」(这批号也要能和普通班一样
|
||||
* 圈出来看)。带进来的班不在配置里(老班、手打的)也要显示得出来,不然框里是空的却在筛
|
||||
*/
|
||||
export function classSelectOptions(list: string[], current: string) {
|
||||
const all = current && current !== NO_CLASS ? [current, ...list] : list
|
||||
return [...groupClassOptions(all), { label: classLabel(NO_CLASS), value: NO_CLASS }]
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import { Icon } from "@iconify/vue"
|
||||
import { useThemeVars } from "naive-ui"
|
||||
import { clearMood, setRankHidden, updateProfile } from "oj/api"
|
||||
import RankAvatar from "oj/rank/components/RankAvatar.vue"
|
||||
import { classLabel } from "oj/submission/utils"
|
||||
import { classLabel } from "utils/classes"
|
||||
import UserName from "shared/components/UserName.vue"
|
||||
import { useUserStore } from "shared/store/user"
|
||||
import { durationToDays, parseTime } from "utils/functions"
|
||||
|
||||
Reference in new issue
Block a user