diff --git a/eslint.config.js b/eslint.config.js index 2e02a43..b70755a 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -62,6 +62,8 @@ export default [ // Web Workers Worker: 'readonly', SharedWorker: 'readonly', + // Fetch API + AbortController: 'readonly', }, }, } diff --git a/index.html b/index.html index 6fdc3cb..d04c40c 100644 --- a/index.html +++ b/index.html @@ -6,14 +6,12 @@ Classworks 作业板 - - @@ -24,7 +22,6 @@ - @@ -39,6 +36,5 @@
- xICP备x号-4 diff --git a/src/App.vue b/src/App.vue index 6118c99..af2408a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,17 @@ + + + 12 小时制 + 以 12 小时制(AM/PM)显示时间。 + + @@ -723,6 +748,7 @@ export default { showFullscreen: false, showSettings: false, timeCardEnabled: true, + use12hClock: false, // 全屏模式切换 fullscreenMode: 'clock', // 工具栏自动隐藏 @@ -788,9 +814,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')}` @@ -997,12 +1030,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/components/settings/SettingItem.vue b/src/components/settings/SettingItem.vue index 2f56105..49683d6 100644 --- a/src/components/settings/SettingItem.vue +++ b/src/components/settings/SettingItem.vue @@ -11,9 +11,9 @@ {{ displayTitle }} - +