From 1bc9d2f67e6769d1cf282791ecc0d984fe66488f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 21 Mar 2026 07:45:06 +0000
Subject: [PATCH] feat: Add 12-hour clock format support to TimeCard

Co-authored-by: Sunwuyuan <88357633+Sunwuyuan@users.noreply.github.com>
Agent-Logs-Url: https://github.com/ZeroCatDev/Classworks/sessions/5b22f5d2-515c-4a87-84f5-18ef897ede79
---
 src/components/TimeCard.vue | 46 +++++++++++++++++++++++++++++++++----
 src/utils/settings.js       |  6 +++++
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/components/TimeCard.vue b/src/components/TimeCard.vue
index 4e875f1..a1dec48 100644
--- a/src/components/TimeCard.vue
+++ b/src/components/TimeCard.vue
@@ -22,7 +22,11 @@
             {{ timeString }}<span
               class="seconds-text"
               :style="secondsStyle"
-            >{{ secondsString }}</span>
+            >{{ secondsString }}</span><span
+              v-if="use12hClock"
+              class="ampm-text"
+              :style="secondsStyle"
+            > {{ amPmString }}</span>
           </div>
           <div
             class="date-line mt-3"
@@ -302,7 +306,10 @@
           <v-tabs-window-item value="clock">
             <div class="d-flex flex-column align-center justify-center">
               <div class="fullscreen-time-display">
-                {{ timeString }}<span class="fullscreen-seconds">{{ secondsString }}</span>
+                {{ timeString }}<span class="fullscreen-seconds">{{ secondsString }}</span><span
+                  v-if="use12hClock"
+                  class="fullscreen-seconds"
+                > {{ amPmString }}</span>
               </div>
               <div class="fullscreen-date-line mt-6">
                 {{ dateString }}  {{ weekdayString }}  {{ periodOfDay }}
@@ -677,6 +684,24 @@
               />
             </template>
           </v-list-item>
+          <v-list-item>
+            <template #prepend>
+              <v-icon
+                class="mr-3"
+                icon="mdi-clock-time-six-outline"
+              />
+            </template>
+            <v-list-item-title>12 小时制</v-list-item-title>
+            <v-list-item-subtitle>以 12 小时制（AM/PM）显示时间。</v-list-item-subtitle>
+            <template #append>
+              <v-switch
+                :model-value="use12hClock"
+                hide-details
+                density="comfortable"
+                @update:model-value="setUse12hClock"
+              />
+            </template>
+          </v-list-item>
         </v-list>
       </v-card-text>
       <v-card-actions>
@@ -720,6 +745,7 @@ export default {
       showFullscreen: false,
       showSettings: false,
       timeCardEnabled: true,
+      use12hClock: false,
       // 全屏模式切换
       fullscreenMode: 'clock',
       // 工具栏自动隐藏
@@ -785,9 +811,16 @@ export default {
   },
   computed: {
     timeString() {
-      const h = String(this.now.getHours()).padStart(2, '0')
+      const hours = this.now.getHours()
       const m = String(this.now.getMinutes()).padStart(2, '0')
-      return `${h}:${m}`
+      if (this.use12hClock) {
+        const h12 = hours % 12 || 12
+        return `${h12}:${m}`
+      }
+      return `${String(hours).padStart(2, '0')}:${m}`
+    },
+    amPmString() {
+      return this.now.getHours() < 12 ? 'AM' : 'PM'
     },
     secondsString() {
       return `:${String(this.now.getSeconds()).padStart(2, '0')}`
@@ -994,12 +1027,17 @@ export default {
     loadSettings() {
       this.fontSize = SettingsManager.getSetting('font.size')
       this.timeCardEnabled = getSetting('timeCard.enabled')
+      this.use12hClock = getSetting('timeCard.use12h')
       this.noiseEnabled = getSetting('noiseMonitor.enabled')
     },
     setTimeCardEnabled(val) {
       this.timeCardEnabled = val
       setSetting('timeCard.enabled', val)
     },
+    setUse12hClock(val) {
+      this.use12hClock = val
+      setSetting('timeCard.use12h', val)
+    },
     startTimer() {
       this.timer = setInterval(() => {
         this.now = new Date()
diff --git a/src/utils/settings.js b/src/utils/settings.js
index c475762..a7c15f0 100644
--- a/src/utils/settings.js
+++ b/src/utils/settings.js
@@ -127,6 +127,12 @@ const settingsDefinitions = {
     description: "启用时间卡片",
     icon: "mdi-clock-outline",
   },
+  "timeCard.use12h": {
+    type: "boolean",
+    default: false,
+    description: "使用 12 小时制显示时间",
+    icon: "mdi-clock-time-six-outline",
+  },
 
   // 一言设置
   "hitokoto.enabled": {