diff --git a/apps/web/src/oj/problem/components/BasicEditor.vue b/apps/web/src/oj/problem/components/BasicEditor.vue
index f830663..04dfb2d 100644
--- a/apps/web/src/oj/problem/components/BasicEditor.vue
+++ b/apps/web/src/oj/problem/components/BasicEditor.vue
@@ -27,7 +27,8 @@ const editorHeight = computed(() =>
   isDesktop.value ? "calc(100vh - 133px)" : "calc(100vh - 172px)",
 )
 
-onMounted(() => {
+function loadCode() {
+  codeStore.code.language = problemStore.supportedLanguage(codeStore.code.language)
   const savedCode = storage.get(storageKey.value)
   codeStore.setCode(
     savedCode ||
@@ -35,7 +36,12 @@ onMounted(() => {
       SOURCES[codeStore.code.language],
   )
   beginEditTrace(`problem_${problem.value!._id}_contest_${contestID}`, codeStore.code.value.length)
-})
+}
+
+onMounted(loadCode)
+
+// 换题时组件复用、不重新挂载，和 ProblemEditor 一样得自己重新载入
+watch(() => problem.value?._id, loadCode)
 
 const changeCode = (v: string) => {
   storage.set(storageKey.value, v)
diff --git a/apps/web/src/oj/problem/components/EditorToolbar.vue b/apps/web/src/oj/problem/components/EditorToolbar.vue
index 0a103bf..625ef84 100644
--- a/apps/web/src/oj/problem/components/EditorToolbar.vue
+++ b/apps/web/src/oj/problem/components/EditorToolbar.vue
@@ -185,17 +185,20 @@ const handleMenuSelect = (key: string) => {
   }
 }
 
-const languageOptions: DropdownOption[] = languages.value.map((it) => ({
-  label: () =>
-    h(NFlex, { align: "center" }, () => [
-      h(Icon, {
-        icon: ICON_SET[it],
-        width: 16,
-      }),
-      LANGUAGE_SHOW_VALUE[it],
-    ]),
-  value: it,
-}))
+// computed：换题时组件复用，选项得跟着新题的语言走
+const languageOptions = computed<DropdownOption[]>(() =>
+  languages.value.map((it) => ({
+    label: () =>
+      h(NFlex, { align: "center" }, () => [
+        h(Icon, {
+          icon: ICON_SET[it],
+          width: 16,
+        }),
+        LANGUAGE_SHOW_VALUE[it],
+      ]),
+    value: it,
+  })),
+)
 
 const copy = async () => {
   const success = await copyToClipboard(codeStore.code.value)
@@ -247,12 +250,7 @@ const goEdit = () => {
   window.open(router.resolve(url).href, "_blank")
 }
 
-onMounted(() => {
-  if (!languages.value.includes(codeStore.code.language)) {
-    // 回退到题目支持的第一种语言（如 SQL 题只有 "SQL"，硬编码 Python 会被后端拒绝）
-    codeStore.code.language = languages.value[0] ?? "Python"
-  }
-})
+// 语言回退不在这里做：它得排在载入草稿之前，见 problem store 的 supportedLanguage
 </script>
 
 <template>
diff --git a/apps/web/src/oj/problem/components/ProblemContent.vue b/apps/web/src/oj/problem/components/ProblemContent.vue
index 5e6e914..8214a61 100644
--- a/apps/web/src/oj/problem/components/ProblemContent.vue
+++ b/apps/web/src/oj/problem/components/ProblemContent.vue
@@ -88,14 +88,25 @@ const hasTriedButNotPassed = computed(() => {
   )
 })
 
-const samples = ref<Sample[]>(
-  problem.value!.samples.map((sample, index) => ({
+function freshSamples(): Sample[] {
+  return (problem.value?.samples ?? []).map((sample, index) => ({
     ...sample,
     id: index,
     msg: "",
     status: "not_test",
     loading: false,
-  })),
+  }))
+}
+
+const samples = ref<Sample[]>(freshSamples())
+
+// 题目页换题是同一个组件复用（顶栏题号直达、「下一题」、相似题都是只换路由参数），
+// 不跟着重建的话，新题下面摆的还是上一道题的例子，「测试」也拿旧例子去比
+watch(
+  () => problem.value?._id,
+  () => {
+    samples.value = freshSamples()
+  },
 )
 
 // 文案和配色分类都由后端生成 —— 原来这里有一份 NODE_TARGET_LABELS +
@@ -116,7 +127,10 @@ async function test(sample: Sample, index: number) {
     }
     return sample
   })
+  const problemId = problem.value?._id
   const res = await createTestSubmission(codeStore.code, sample.input)
+  // 跑的这一会儿换了题：结果是上一道题的例子的，按下标写进去就串到新题上了
+  if (problem.value?._id !== problemId) return
   samples.value = samples.value.map((sample) => {
     if (sample.id === index) {
       const status = res.status === 3 && res.output.trim() === sample.output ? "passed" : "failed"
@@ -133,6 +147,7 @@ async function test(sample: Sample, index: number) {
 
   const id = setTimeout(() => {
     clearTimeout(id)
+    if (problem.value?._id !== problemId) return
     samples.value = samples.value.map((sample) => {
       if (sample.id === index) {
         return {
diff --git a/apps/web/src/oj/problem/components/ProblemEditor.vue b/apps/web/src/oj/problem/components/ProblemEditor.vue
index 8f4b20d..f1628e0 100644
--- a/apps/web/src/oj/problem/components/ProblemEditor.vue
+++ b/apps/web/src/oj/problem/components/ProblemEditor.vue
@@ -93,6 +93,7 @@ const editorHeight = computed(() =>
 )
 
 function loadCode() {
+  codeStore.code.language = problemStore.supportedLanguage(codeStore.code.language)
   const savedCode = storage.get(storageKey.value)
   codeStore.setCode(
     savedCode ||
diff --git a/apps/web/src/oj/problem/components/SubmitFlowchart.vue b/apps/web/src/oj/problem/components/SubmitFlowchart.vue
index 331373f..184f365 100644
--- a/apps/web/src/oj/problem/components/SubmitFlowchart.vue
+++ b/apps/web/src/oj/problem/components/SubmitFlowchart.vue
@@ -153,16 +153,21 @@ const { start: startPollingDeadline, stop: stopPollingDeadline } = useTimeoutFn(
   { immediate: false },
 )
 
-function settle(submissionId: string, outcome: Outcome) {
-  // 一个学生可能同时开着几道题的页面，每条连接都订在同一个用户 topic 上，
-  // 别的页面的评分结果照样会推到这里来 —— 必须认 id，不然会张冠李戴
-  if (!submissionId || submissionId !== monitoringId.value) return
+/** 不再跟这一次评分：结算完、或者换了题 */
+function stopMonitoring() {
   monitoringId.value = ""
   unsubscribe()
   pausePolling()
   stopPollingFallback()
   stopPollingDeadline()
   loading.value = false
+}
+
+function settle(submissionId: string, outcome: Outcome) {
+  // 一个学生可能同时开着几道题的页面，每条连接都订在同一个用户 topic 上，
+  // 别的页面的评分结果照样会推到这里来 —— 必须认 id，不然会张冠李戴
+  if (!submissionId || submissionId !== monitoringId.value) return
+  stopMonitoring()
 
   if (!outcome.ok) {
     message.error(outcome.error ? `流程图评分失败: ${outcome.error}` : "流程图评分失败，请稍后重试")
@@ -261,8 +266,11 @@ function submit() {
 // ==================== 数据获取和处理函数 ====================
 
 async function getCurrentSubmission() {
-  if (!problem.value?.id) return
-  const data = await getCurrentProblemFlowchartSubmission(problem.value.id)
+  const problemId = problem.value?.id
+  if (!problemId) return
+  const data = await getCurrentProblemFlowchartSubmission(problemId)
+  // 换题之后才回来的是上一道题的分数，别盖掉新题的
+  if (problem.value?.id !== problemId) return
   submissionCount.value = data.count
   latestRating.value = {
     score: data.score,
@@ -271,8 +279,10 @@ async function getCurrentSubmission() {
 }
 
 async function getSubmission(submissionPage = 0) {
-  if (!problem.value?.id) return
-  const data = await getFlowchartSubmissionDetail(problem.value.id, submissionPage)
+  const problemId = problem.value?.id
+  if (!problemId) return
+  const data = await getFlowchartSubmissionDetail(problemId, submissionPage)
+  if (problem.value?.id !== problemId) return
   submissionCount.value = data.count
   const submission = data.submission
   // 翻到没有提交的页时后端返回 null（契约里 submission 是 nullable）——
@@ -380,19 +390,46 @@ const getPercentType = (percent: number) => {
 }
 
 // ==================== 生命周期钩子 ====================
-onMounted(async () => {
-  connect()
+/** 这道题最近一次的评分；画到了 A/S 的话，把那张图亮到「我的流程图」 */
+async function loadLatest() {
+  const problemId = problem.value?.id
   await getCurrentSubmission()
   page.value = submissionCount.value
   const grade = latestRating.value.grade
   if ((grade === "A" || grade === "S") && submissionCount.value > 0) {
     await getSubmission(submissionCount.value)
+    // 查的这一会儿又换了题，这张图不是新题的
+    if (problem.value?.id !== problemId) return
     if (myMermaidCode.value) {
       myFlowchartStore.show(myMermaidCode.value)
     }
   }
+}
+
+onMounted(() => {
+  connect()
+  loadLatest()
 })
 
+/**
+ * 换题。题目页换题是同一个组件复用（只换路由参数），两道题都能画流程图、语言又停在
+ * Flowchart 的时候，这个组件连卸载都不会：分数按钮和评分弹框还是上一道题的，
+ * 上一道还在评的那次评完，还会把它的图挂到新题的「我的流程图」上。
+ */
+watch(
+  () => problem.value?.id,
+  (next, previous) => {
+    if (!previous || next === previous) return
+    stopMonitoring()
+    showDetailModal.value = false
+    latestRating.value = { score: 0, grade: "" }
+    submissionCount.value = 0
+    page.value = 1
+    lastSubmittedMermaidCode.value = ""
+    loadLatest()
+  },
+)
+
 // 组件卸载时断开连接
 onUnmounted(() => {
   disconnect()
diff --git a/apps/web/src/oj/problem/detail.vue b/apps/web/src/oj/problem/detail.vue
index c11808e..72b1e6e 100644
--- a/apps/web/src/oj/problem/detail.vue
+++ b/apps/web/src/oj/problem/detail.vue
@@ -99,6 +99,8 @@ watch(
 
 async function init() {
   screenModeStore.resetScreenMode()
+  // 「我的流程图」是上一道题的。这道题也画到了 A/S 的话，SubmitFlowchart 查完会再亮出来
+  myFlowchartStore.hide()
   // 并行预取右侧编辑器 chunk（CodeMirror ~370K+），
   // 避免等 getProblem 返回后才串行下载，编辑器才迟迟出现
   ;(isPublicProblemRoute.value ? loadProblemEditor : loadContestEditor)()
diff --git a/apps/web/src/oj/store/problem.ts b/apps/web/src/oj/store/problem.ts
index 11d68c4..88c28e0 100644
--- a/apps/web/src/oj/store/problem.ts
+++ b/apps/web/src/oj/store/problem.ts
@@ -32,6 +32,15 @@ export const useProblemStore = defineStore("problem", () => {
     return problem.value?.languages ?? []
   })
 
+  /**
+   * 这道题收不收当前语言，不收就退到它支持的第一种（SQL 题只有 "SQL"，硬编码的
+   * Python 会被后端拒绝）。编辑器每次载入代码之前都要过一遍：草稿的键里带着语言，
+   * 先载入再改语言，编辑器里摆的就是另一种语言的模板。
+   */
+  function supportedLanguage(current: LANGUAGE): LANGUAGE {
+    return languages.value.includes(current) ? current : (languages.value[0] ?? "Python")
+  }
+
   function incrementFailCount() {
     sessionFailCount.value++
   }
@@ -47,6 +56,7 @@ export const useProblemStore = defineStore("problem", () => {
     problem,
     failCount,
     languages,
+    supportedLanguage,
     incrementFailCount,
   }
 })