fix

2025-10-05 09:54:42 +08:00
parent 719f315405
commit 04c6c49eaa
7 changed files with 394 additions and 272 deletions
--- a/src/oj/problem/components/ContestEditor.vue
+++ b/src/oj/problem/components/ContestEditor.vue
@@ -0,0 +1,57 @@
+<script lang="ts" setup>
+import { code } from "oj/composables/code"
+import { problem } from "oj/composables/problem"
+import { SOURCES } from "utils/constants"
+import CodeEditor from "~/shared/components/CodeEditor.vue"
+import { isDesktop } from "~/shared/composables/breakpoints"
+import storage from "~/utils/storage"
+import { LANGUAGE } from "~/utils/types"
+import Form from "./Form.vue"
+
+const route = useRoute()
+
+const contestID = route.params.contestID || null
+const storageKey = computed(
+  () =>
+    `problem_${problem.value!._id}_contest_${contestID}_lang_${code.language}`,
+)
+
+const editorHeight = computed(() =>
+  isDesktop.value ? "calc(100vh - 133px)" : "calc(100vh - 172px)",
+)
+
+onMounted(() => {
+  const savedCode = storage.get(storageKey.value)
+  code.value =
+    savedCode ||
+    problem.value!.template[code.language] ||
+    SOURCES[code.language]
+})
+
+const changeCode = (v: string) => {
+  storage.set(storageKey.value, v)
+}
+
+const changeLanguage = (v: LANGUAGE) => {
+  const savedCode = storage.get(storageKey.value)
+  code.value =
+    savedCode && storageKey.value.split("_").pop() === v
+      ? savedCode
+      : problem.value!.template[code.language] || SOURCES[code.language]
+}
+</script>
+
+<template>
+  <n-flex vertical>
+    <Form
+      :storage-key="storageKey"
+      @change-language="changeLanguage"
+    />
+    <CodeEditor
+      v-model:value="code.value"
+      :language="code.language"
+      :height="editorHeight"
+      @update:model-value="changeCode"
+    />
+  </n-flex>
+</template>
--- a/src/oj/problem/components/Form.vue
+++ b/src/oj/problem/components/Form.vue
@@ -16,13 +16,13 @@ interface Props {
  storageKey: string
  withTest?: boolean
  otherUserInfo?: { name: string; isSuperAdmin: boolean }
-  isSynced?: boolean
+  isConnected?: boolean // WebSocket 实际的连接状态（已建立/未建立）
  hadConnection?: boolean
 }

 const props = withDefaults(defineProps<Props>(), {
  withTest: false,
-  isSynced: false,
+  isConnected: false,
  hadConnection: false,
 })

@@ -36,34 +36,40 @@ const route = useRoute()
 const router = useRouter()
 const userStore = useUserStore()

-const isSynced = ref(false)
+const syncEnabled = ref(false) // 用户点击按钮后的意图状态（想要开启/关闭）
 const statisticPanel = ref(false)

+// 计算属性
+const isContestMode = computed(() => route.name === "contest problem")
+const buttonSize = computed(() => (isDesktop.value ? "medium" : "small"))
+const showSyncFeature = computed(
+  () => isDesktop.value && userStore.isAuthed && !isContestMode.value,
+)
+
 const menu = computed<DropdownOption[]>(() => [
-  { label: "去自测猫", key: "test", show: isMobile.value },
+  { label: "去自测猫", key: "goTestCat", show: isMobile.value },
  { label: "复制代码", key: "copy" },
  { label: "重置代码", key: "reset" },
 ])

-const languageOptions: DropdownOption[] = problem.value!.languages.map((it) => ({
-  label: () =>
-    h("div", { style: "display: flex; align-items: center;" }, [
-      h("img", {
-        src: `/${it}.svg`,
-        style: { width: "16px", height: "16px", marginRight: "8px" },
-      }),
-      LANGUAGE_SHOW_VALUE[it],
-    ]),
-  value: it,
-}))
+const languageOptions: DropdownOption[] = problem.value!.languages.map(
+  (it) => ({
+    label: () =>
+      h("div", { style: "display: flex; align-items: center;" }, [
+        h("img", {
+          src: `/${it}.svg`,
+          style: { width: "16px", height: "16px", marginRight: "8px" },
+        }),
+        LANGUAGE_SHOW_VALUE[it],
+      ]),
+    value: it,
+  }),
+)

+// 代码操作相关
 const copy = async () => {
  const success = await copyToClipboard(code.value)
-  if (success) {
-    message.success("代码复制成功")
-  } else {
-    message.error("代码复制失败")
-  }
+  message[success ? "success" : "error"](`代码复制${success ? "成功" : "失败"}`)
 }

 const reset = () => {
@@ -72,67 +78,70 @@ const reset = () => {
  message.success("代码重置成功")
 }

+const changeLanguage = (v: LANGUAGE) => {
+  storage.set(STORAGE_KEY.LANGUAGE, v)
+  emit("changeLanguage", v)
+}
+
+const runCode = async () => {
+  const res = await createTestSubmission(code, input.value)
+  output.value = res.output
+}
+
+// 导航相关
+const goTestCat = () => {
+  window.open(import.meta.env.PUBLIC_CODE_URL, "_blank")
+}
+
 const goSubmissions = () => {
  const name = route.params.contestID ? "contest submissions" : "submissions"
  router.push({ name, query: { problem: problem.value!._id } })
 }

 const goEdit = () => {
-  const baseUrl = "/admin/problem/edit/" + problem.value!.id
  const url = problem.value!.contest
    ? `/admin/contest/${problem.value!.contest}/problem/edit/${problem.value!.id}`
-    : baseUrl
+    : `/admin/problem/edit/${problem.value!.id}`
  window.open(router.resolve(url).href, "_blank")
 }

-const test = async () => {
-  const res = await createTestSubmission(code, input.value)
-  output.value = res.output
-}
-
+// 菜单处理
 const handleMenuSelect = (key: string) => {
  const actions: Record<string, () => void> = {
    reset,
    copy,
-    test: () => window.open(import.meta.env.PUBLIC_CODE_URL, "_blank"),
+    goTestCat,
  }
  actions[key]?.()
 }

-const changeLanguage = (v: LANGUAGE) => {
-  storage.set(STORAGE_KEY.LANGUAGE, v)
-  emit("changeLanguage", v)
-}
-
+// 协同编辑相关
 const toggleSync = () => {
-  isSynced.value = !isSynced.value
-  emit("toggleSync", isSynced.value)
-}
-
-const gotoTestCat = () => {
-  window.open(import.meta.env.PUBLIC_CODE_URL, "_blank")
+  syncEnabled.value = !syncEnabled.value
+  emit("toggleSync", syncEnabled.value)
 }

 defineExpose({
  resetSyncStatus: () => {
-    isSynced.value = false
+    syncEnabled.value = false
  },
 })
 </script>

 <template>
  <n-flex align="center">
+    <!-- 语言选择器 -->
    <n-select
      v-model:value="code.language"
      class="language"
-      :size="isDesktop ? 'medium' : 'small'"
+      :size="buttonSize"
      :options="languageOptions"
      @update:value="changeLanguage"
    />

    <template v-if="withTest">
      <n-button @click="reset">重置代码</n-button>
-      <n-button type="primary" secondary @click="test">运行代码</n-button>
+      <n-button type="primary" secondary @click="runCode">运行代码</n-button>
    </template>

    <n-flex v-else align="center">
@@ -140,7 +149,7 @@ defineExpose({

      <n-button
        v-if="!userStore.isSuperAdmin && userStore.showSubmissions"
-        :size="isDesktop ? 'medium' : 'small'"
+        :size="buttonSize"
        @click="goSubmissions"
      >
        提交信息
@@ -148,16 +157,16 @@ defineExpose({

      <n-button
        v-if="userStore.isSuperAdmin"
-        :size="isDesktop ? 'medium' : 'small'"
+        :size="buttonSize"
        @click="statisticPanel = true"
      >
        {{ isDesktop ? "统计信息" : "统计" }}
      </n-button>

-      <n-button v-if="isDesktop" @click="gotoTestCat">自测猫</n-button>
+      <n-button v-if="isDesktop" @click="goTestCat">自测猫</n-button>

      <n-dropdown size="large" :options="menu" @select="handleMenuSelect">
-        <n-button :size="isDesktop ? 'medium' : 'small'">操作</n-button>
+        <n-button :size="buttonSize">操作</n-button>
      </n-dropdown>

      <IconButton
@@ -167,28 +176,31 @@ defineExpose({
        @click="goEdit"
      />

-      <IconButton
-        v-if="isDesktop && userStore.isAuthed"
-        :icon="
-          isSynced
-            ? 'streamline-stickies-color:earpod-connected'
-            : 'streamline-stickies-color:earpod-connected-duo'
-        "
-        :tip="isSynced ? '断开同步' : '打开同步'"
-        :type="isSynced ? 'info' : 'default'"
-        @click="toggleSync"
-      />
+      <!-- 协同编辑功能（仅在非比赛模式） -->
+      <template v-if="showSyncFeature">
+        <IconButton
+          :icon="
+            syncEnabled
+              ? 'streamline-stickies-color:earpod-connected'
+              : 'streamline-stickies-color:earpod-connected-duo'
+          "
+          :tip="syncEnabled ? '断开同步' : '打开同步'"
+          :type="syncEnabled ? 'info' : 'default'"
+          @click="toggleSync"
+        />

-      <template v-if="isDesktop && props.isSynced">
-        <n-tag v-if="otherUserInfo" type="info">
-          与 {{ otherUserInfo.name }} 同步中
-        </n-tag>
-        <n-tag
-          v-if="userStore.isSuperAdmin && !otherUserInfo && hadConnection"
-          type="warning"
-        >
-          学生已退出，可以关闭同步
-        </n-tag>
+        <!-- 同步状态标签 -->
+        <template v-if="props.isConnected">
+          <n-tag v-if="otherUserInfo" type="info">
+            与 {{ otherUserInfo.name }} 同步中
+          </n-tag>
+          <n-tag
+            v-if="userStore.isSuperAdmin && !otherUserInfo && hadConnection"
+            type="warning"
+          >
+            学生已退出，可以关闭同步
+          </n-tag>
+        </template>
      </template>
    </n-flex>
  </n-flex>
--- a/src/oj/problem/components/ProblemEditor.vue
+++ b/src/oj/problem/components/ProblemEditor.vue
@@ -2,7 +2,7 @@
 import { code } from "oj/composables/code"
 import { problem } from "oj/composables/problem"
 import { SOURCES } from "utils/constants"
-import CodeEditor from "~/shared/components/CodeEditor.vue"
+import SyncCodeEditor from "~/shared/components/SyncCodeEditor.vue"
 import { isDesktop } from "~/shared/composables/breakpoints"
 import storage from "~/utils/storage"
 import { LANGUAGE } from "~/utils/types"
@@ -75,12 +75,12 @@ const handleSyncStatusChange = (status: {
      ref="formRef"
      :storage-key="storageKey"
      :other-user-info="otherUserInfo"
-      :is-synced="sync"
+      :is-connected="sync"
      :had-connection="hadConnection"
      @change-language="changeLanguage"
      @toggle-sync="toggleSync"
    />
-    <CodeEditor
+    <SyncCodeEditor
      v-model:value="code.value"
      :sync="sync"
      :problem="problem!._id"
--- a/src/oj/problem/detail.vue
+++ b/src/oj/problem/detail.vue
@@ -9,7 +9,8 @@ import {
 } from "~/shared/composables/switchScreen"
 import { problem } from "../composables/problem"

-const Editor = defineAsyncComponent(() => import("./components/Editor.vue"))
+const ProblemEditor = defineAsyncComponent(() => import("./components/ProblemEditor.vue"))
+const ContestEditor = defineAsyncComponent(() => import("./components/ContestEditor.vue"))
 const EditorWithTest = defineAsyncComponent(
  () => import("./components/EditorWithTest.vue"),
 )
@@ -54,6 +55,8 @@ const tabOptions = computed(() => {

 const currentTab = ref("content")

+const shouldUseProblemEditor = computed(() => route.name === "problem")
+
 watch(
  [() => route.query.tab, () => tabOptions.value],
  ([rawTab]) => {
@@ -125,7 +128,8 @@ watch(isMobile, (value) => {
          <ProblemContent />
        </n-tab-pane>
        <n-tab-pane name="editor" tab="编辑">
-          <Editor />
+          <ProblemEditor v-if="shouldUseProblemEditor" />
+          <ContestEditor v-else />
        </n-tab-pane>
        <n-tab-pane name="info" tab="统计">
          <ProblemInfo />
@@ -139,7 +143,8 @@ watch(isMobile, (value) => {
      </n-tabs>
    </n-gi>
    <n-gi v-if="isDesktop && screenMode === ScreenMode.both">
-      <Editor />
+      <ProblemEditor v-if="shouldUseProblemEditor" />
+      <ContestEditor v-else />
    </n-gi>
    <n-gi v-if="isDesktop && screenMode === ScreenMode.code">
      <EditorWithTest />
--- a/src/shared/components/CodeEditor.vue
+++ b/src/shared/components/CodeEditor.vue
@@ -7,18 +7,8 @@ import type { Extension } from "@codemirror/state"
 import { LANGUAGE } from "~/utils/types"
 import { oneDark } from "../themes/oneDark"
 import { smoothy } from "../themes/smoothy"
-import { useCodeSync } from "../composables/sync"
-import { isDesktop } from "../composables/breakpoints"
-
-interface EditorReadyPayload {
-  view: EditorView
-  state: any
-  container: HTMLElement
-}

 interface Props {
-  sync?: boolean
-  problem?: string
  language?: LANGUAGE
  fontSize?: number
  height?: string
@@ -27,8 +17,6 @@ interface Props {
 }

 const props = withDefaults(defineProps<Props>(), {
-  sync: false,
-  problem: "",
  language: "Python3",
  fontSize: 20,
  height: "100%",
@@ -39,13 +27,6 @@ const props = withDefaults(defineProps<Props>(), {
 const { readonly, placeholder, height, fontSize } = toRefs(props)
 const code = defineModel<string>("value")

-const emit = defineEmits<{
-  syncClosed: []
-  syncStatusChange: [
-    status: { otherUser?: { name: string; isSuperAdmin: boolean } },
-  ]
-}>()
-
 const isDark = useDark()

 const styleTheme = EditorView.baseTheme({
@@ -64,66 +45,7 @@ const extensions = computed(() => [
  styleTheme,
  lang.value,
  isDark.value ? oneDark : smoothy,
-  getInitialExtension(),
 ])
-
-const { startSync, stopSync, getInitialExtension } = useCodeSync()
-const editorView = ref<EditorView | null>(null)
-let cleanupSync: (() => void) | null = null
-
-const cleanupSyncResources = () => {
-  if (cleanupSync) {
-    cleanupSync()
-    cleanupSync = null
-  }
-  stopSync()
-}
-
-const initSync = async () => {
-  if (!editorView.value || !props.problem || !isDesktop.value) return
-
-  cleanupSyncResources()
-
-  cleanupSync = await startSync({
-    problemId: props.problem,
-    editorView: editorView.value as EditorView,
-    onStatusChange: (status) => {
-      if (status.error === "超管已离开" && !status.connected) {
-        emit("syncClosed")
-      }
-      emit("syncStatusChange", { otherUser: status.otherUser })
-    },
-  })
-}
-
-const handleEditorReady = (payload: EditorReadyPayload) => {
-  editorView.value = payload.view as EditorView
-  if (props.sync) {
-    initSync()
-  }
-}
-
-watch(
-  () => props.sync,
-  (shouldSync) => {
-    if (shouldSync) {
-      initSync()
-    } else {
-      cleanupSyncResources()
-    }
-  },
-)
-
-watch(
-  () => props.problem,
-  (newProblem, oldProblem) => {
-    if (newProblem !== oldProblem && props.sync) {
-      initSync()
-    }
-  },
-)
-
-onUnmounted(cleanupSyncResources)
 </script>

 <template>
@@ -135,6 +57,5 @@ onUnmounted(cleanupSyncResources)
    :tab-size="4"
    :placeholder="placeholder"
    :style="{ height, fontSize: `${fontSize}px` }"
-    @ready="handleEditorReady"
  />
 </template>
--- a/src/shared/components/SyncCodeEditor.vue
+++ b/src/shared/components/SyncCodeEditor.vue
@@ -0,0 +1,138 @@
+<script lang="ts" setup>
+import { cpp } from "@codemirror/lang-cpp"
+import { python } from "@codemirror/lang-python"
+import { EditorView } from "@codemirror/view"
+import { Codemirror } from "vue-codemirror"
+import type { Extension } from "@codemirror/state"
+import { LANGUAGE } from "~/utils/types"
+import { oneDark } from "../themes/oneDark"
+import { smoothy } from "../themes/smoothy"
+import { useCodeSync } from "../composables/sync"
+import { isDesktop } from "../composables/breakpoints"
+
+interface EditorReadyPayload {
+  view: EditorView
+  state: any
+  container: HTMLElement
+}
+
+interface Props {
+  sync: boolean
+  problem: string
+  language?: LANGUAGE
+  fontSize?: number
+  height?: string
+  readonly?: boolean
+  placeholder?: string
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  language: "Python3",
+  fontSize: 20,
+  height: "100%",
+  readonly: false,
+  placeholder: "",
+})
+
+const { readonly, placeholder, height, fontSize } = toRefs(props)
+const code = defineModel<string>("value")
+
+const emit = defineEmits<{
+  syncClosed: []
+  syncStatusChange: [
+    status: { otherUser?: { name: string; isSuperAdmin: boolean } },
+  ]
+}>()
+
+const isDark = useDark()
+
+const styleTheme = EditorView.baseTheme({
+  "& .cm-scroller": { "font-family": "Monaco" },
+  "&.cm-editor.cm-focused": { outline: "none" },
+  "&.cm-editor .cm-tooltip.cm-tooltip-autocomplete ul": {
+    "font-family": "Monaco",
+  },
+})
+
+const lang = computed((): Extension => {
+  return ["Python2", "Python3"].includes(props.language) ? python() : cpp()
+})
+
+const extensions = computed(() => [
+  styleTheme,
+  lang.value,
+  isDark.value ? oneDark : smoothy,
+  getInitialExtension(),
+])
+
+const { startSync, stopSync, getInitialExtension } = useCodeSync()
+const editorView = ref<EditorView | null>(null)
+let cleanupSync: (() => void) | null = null
+
+const cleanupSyncResources = () => {
+  if (cleanupSync) {
+    cleanupSync()
+    cleanupSync = null
+  }
+  stopSync()
+}
+
+const initSync = async () => {
+  if (!editorView.value || !props.problem || !isDesktop.value) return
+
+  cleanupSyncResources()
+
+  cleanupSync = await startSync({
+    problemId: props.problem,
+    editorView: editorView.value as EditorView,
+    onStatusChange: (status) => {
+      if (status.error === "超管已离开" && !status.connected) {
+        emit("syncClosed")
+      }
+      emit("syncStatusChange", { otherUser: status.otherUser })
+    },
+  })
+}
+
+const handleEditorReady = (payload: EditorReadyPayload) => {
+  editorView.value = payload.view as EditorView
+  if (props.sync) {
+    initSync()
+  }
+}
+
+watch(
+  () => props.sync,
+  (shouldSync) => {
+    if (shouldSync) {
+      initSync()
+    } else {
+      cleanupSyncResources()
+    }
+  },
+)
+
+watch(
+  () => props.problem,
+  (newProblem, oldProblem) => {
+    if (newProblem !== oldProblem && props.sync) {
+      initSync()
+    }
+  },
+)
+
+onUnmounted(cleanupSyncResources)
+</script>
+
+<template>
+  <Codemirror
+    v-model="code"
+    indentWithTab
+    :extensions="extensions"
+    :disabled="readonly"
+    :tab-size="4"
+    :placeholder="placeholder"
+    :style="{ height, fontSize: `${fontSize}px` }"
+    @ready="handleEditorReady"
+  />
+</template>
--- a/src/shared/composables/sync.ts
+++ b/src/shared/composables/sync.ts
@@ -121,7 +121,7 @@ export function useCodeSync() {
        },
        onStatusChange,
      )
-      message.warning(`超管 ${superAdminInfo.name} 已退出`)
+      message.warning(`🎈 超管 ${superAdminInfo.name} 溜了，协同编辑已断开连接`)
      stopSync()
    }
  }
@@ -150,7 +150,7 @@ export function useCodeSync() {
        onStatusChange,
      )
      if (lastSyncState !== "error") {
-        message.warning("协同编辑需要至少一个超级管理员")
+        message.warning("🎓 协同编辑需要一位超级管理员坐镇哦")
        lastSyncState = "error"
      }
    } else if (canSync) {
@@ -159,13 +159,13 @@ export function useCodeSync() {
          connected: true,
          roomUsers,
          canSync: true,
-          message: "协同编辑已激活，可以开始协作！",
+          message: "🎉 协同编辑已激活，开始愉快的代码之旅吧！",
          otherUser,
        },
        onStatusChange,
      )
      if (lastSyncState !== "active") {
-        message.success("协同编辑已激活，可以开始协作！")
+        message.success("🎉 协同编辑已激活，开始愉快的代码之旅吧！")
        lastSyncState = "active"
      }
    } else {
@@ -174,7 +174,7 @@ export function useCodeSync() {
          connected: true,
          roomUsers,
          canSync: false,
-          message: roomUsers === 1 ? "正在等待加入" : "等待超级管理员加入...",
+          message: roomUsers === 1 ? "👋 正在等待小伙伴加入..." : "🎓 等待超级管理员加入...",
          otherUser,
        },
        onStatusChange,
@@ -213,17 +213,6 @@ export function useCodeSync() {
    const { problemId, editorView, onStatusChange } = options

    if (!userStore.isAuthed) {
-      updateStatus(
-        {
-          connected: false,
-          roomUsers: 0,
-          canSync: false,
-          message: "请先登录后再使用同步功能",
-          error: "用户未登录",
-        },
-        onStatusChange,
-      )
-      message.error("请先登录后再使用同步功能")
      return () => {}
    }

@@ -260,7 +249,7 @@ export function useCodeSync() {
          },
          onStatusChange,
        )
-        message.warning("协同编辑连接已断开")
+        message.warning("📡 协同编辑连接断开了，可能网络不太稳定呢")
      }
    })

@@ -280,7 +269,7 @@ export function useCodeSync() {
          onStatusChange,
        )
        message.warning(
-          `房间人数已满（最多${SYNC_CONSTANTS.MAX_ROOM_USERS}人），已自动断开连接`,
+          `🚪 哎呀，房间已经坐满了（最多${SYNC_CONSTANTS.MAX_ROOM_USERS}人），已自动断开连接`,
        )
        stopSync()
        return
@@ -349,13 +338,13 @@ export function useCodeSync() {
          connected: true,
          roomUsers: 1,
          canSync: false,
-          message: "正在等待加入",
+          message: "🚀 协同编辑已准备就绪，等待伙伴加入...",
        },
        onStatusChange,
      )

      message.info(
-        userStore.isSuperAdmin ? "正在等待学生加入..." : "正在等待超管加入...",
+        userStore.isSuperAdmin ? "👀 正在等待学生加入房间..." : "🎯 正在等待超管加入房间...",
      )
      lastSyncState = "waiting"
    }