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 02/15] 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 }}{{ secondsString }} + >{{ secondsString }} {{ amPmString }}
- {{ timeString }}{{ secondsString }} + {{ timeString }}{{ secondsString }} {{ amPmString }}
{{ dateString }} {{ weekdayString }} {{ periodOfDay }} @@ -677,6 +684,24 @@ /> + + + 12 小时制 + 以 12 小时制（AM/PM）显示时间。 + + @@ -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": { From 6f697d0fd0a5d9f93f3b61d26db9ac79708be68d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 11 Apr 2026 13:38:31 +0000 Subject: [PATCH 04/15] Add Hitokoto API category customization support Agent-Logs-Url: https://github.com/ZeroCatDev/Classworks/sessions/6de2bd3a-dd64-4f26-a5a5-0f7fed081fdc Co-authored-by: Sunwuyuan <88357633+Sunwuyuan@users.noreply.github.com> --- src/components/HitokotoCard.vue | 14 ++++++++--- src/components/HitokotoSettings.vue | 39 +++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/src/components/HitokotoCard.vue b/src/components/HitokotoCard.vue index 6cbf3fd..a0bf03b 100644 --- a/src/components/HitokotoCard.vue +++ b/src/components/HitokotoCard.vue @@ -61,7 +61,8 @@ export default { refreshInterval: 60, kvConfig: { sources: ['zhaoyu'], - sensitiveWords: [] + sensitiveWords: [], + hitokotoCategories: [] }, sentence: '', author: '', @@ -125,7 +126,8 @@ export default { this.kvConfig = { sources: Array.isArray(data.sources) && data.sources.length > 0 ? data.sources : ['zhaoyu'], sensitiveWords: data.sensitiveWords ? data.sensitiveWords.split(/[,，]/).map(w => w.trim()).filter(w => w) : [], - jinrishiciToken: data.jinrishiciToken + jinrishiciToken: data.jinrishiciToken, + hitokotoCategories: Array.isArray(data.hitokotoCategories) ? data.hitokotoCategories : [] } } } catch (e) { @@ -155,7 +157,13 @@ export default { let origin = '' if (source === 'hitokoto') { - const res = await axios.get('https://v1.hitokoto.cn/') + const params = new URLSearchParams() + const categories = this.kvConfig.hitokotoCategories + if (Array.isArray(categories) && categories.length > 0) { + categories.forEach(cat => params.append('c', cat)) + } + const url = 'https://v1.hitokoto.cn/' + (params.toString() ? '?' + params.toString() : '') + const res = await axios.get(url) data = res.data content = data.hitokoto author = data.from_who diff --git a/src/components/HitokotoSettings.vue b/src/components/HitokotoSettings.vue index 26555e7..75efd00 100644 --- a/src/components/HitokotoSettings.vue +++ b/src/components/HitokotoSettings.vue @@ -47,6 +47,25 @@
+ + 一言句子类型 +
不选则返回所有类型；可多选。
+
+ +
+ + Date: Sat, 11 Apr 2026 13:38:58 +0000 Subject: [PATCH 05/15] Remove trailing comma in hitokotoCategories array Agent-Logs-Url: https://github.com/ZeroCatDev/Classworks/sessions/6de2bd3a-dd64-4f26-a5a5-0f7fed081fdc Co-authored-by: Sunwuyuan <88357633+Sunwuyuan@users.noreply.github.com> --- src/components/HitokotoSettings.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HitokotoSettings.vue b/src/components/HitokotoSettings.vue index 75efd00..2bce7af 100644 --- a/src/components/HitokotoSettings.vue +++ b/src/components/HitokotoSettings.vue @@ -312,7 +312,7 @@ export default { { value: 'i', label: '诗词' }, { value: 'j', label: '网易云' }, { value: 'k', label: '哲学' }, - { value: 'l', label: '抖机灵' }, + { value: 'l', label: '抖机灵' } ], loading: false, testLoading: false, From 3f6e0b88bd8a289a42819a485235ab9caa5df056 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 11 Apr 2026 13:53:32 +0000 Subject: [PATCH 07/15] feat: add custom background image with frosted glass effect - Add background settings (enabled, url, imageData, blur, opacity) to settings.js - Add watchSettings same-tab reactivity via custom DOM event dispatch - Create BackgroundSettingsCard.vue with URL input, file upload, sliders, preview - Apply background layer in App.vue with blur filter and dark overlay - Add background settings tab to settings.vue navigation Agent-Logs-Url: https://github.com/ZeroCatDev/Classworks/sessions/6dfae4c0-df49-4612-88b8-9e31287538b0 Co-authored-by: Sunwuyuan <88357633+Sunwuyuan@users.noreply.github.com> --- src/App.vue | 76 +++- .../settings/cards/BackgroundSettingsCard.vue | 422 ++++++++++++++++++ src/pages/settings.vue | 12 + src/utils/settings.js | 62 ++- 4 files changed, 566 insertions(+), 6 deletions(-) create mode 100644 src/components/settings/cards/BackgroundSettingsCard.vue diff --git a/src/App.vue b/src/App.vue index cd7b1bb..1771bc8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,11 @@ diff --git a/src/components/settings/cards/BackgroundSettingsCard.vue b/src/components/settings/cards/BackgroundSettingsCard.vue new file mode 100644 index 0000000..d6d0ab7 --- /dev/null +++ b/src/components/settings/cards/BackgroundSettingsCard.vue @@ -0,0 +1,422 @@ + + + + + diff --git a/src/pages/settings.vue b/src/pages/settings.vue index 67f3148..8bfdee1 100644 --- a/src/pages/settings.vue +++ b/src/pages/settings.vue @@ -195,6 +195,10 @@ + + + + @@ -280,6 +284,7 @@ import KvDatabaseCard from "@/components/settings/cards/KvDatabaseCard.vue"; import HitokotoSettings from "@/components/HitokotoSettings.vue"; import NotificationSoundSettings from "@/components/settings/NotificationSoundSettings.vue"; import NoiseSettingsCard from "@/components/settings/cards/NoiseSettingsCard.vue"; +import BackgroundSettingsCard from "@/components/settings/cards/BackgroundSettingsCard.vue"; export default { name: "Settings", @@ -304,6 +309,7 @@ export default { HitokotoSettings, NotificationSoundSettings, NoiseSettingsCard, + BackgroundSettingsCard, }, setup() { const {mobile} = useDisplay(); @@ -442,6 +448,12 @@ export default { value: "randomPicker", }, + { + title: "背景", + icon: "mdi-image", + value: "background", + }, + { title: "开发者", icon: "mdi-developer-board", diff --git a/src/utils/settings.js b/src/utils/settings.js index a7c15f0..b942ea9 100644 --- a/src/utils/settings.js +++ b/src/utils/settings.js @@ -441,6 +441,40 @@ const settingsDefinitions = { // 设置应用的主题模式，可选亮色或暗色主题 }, + // 背景设置 + "background.enabled": { + type: "boolean", + default: false, + description: "启用自定义背景", + icon: "mdi-image", + }, + "background.url": { + type: "string", + default: "", + description: "背景图片地址", + icon: "mdi-link", + }, + "background.imageData": { + type: "string", + default: "", + description: "本地背景图片（Base64）", + icon: "mdi-image-area", + }, + "background.blur": { + type: "number", + default: 10, + validate: (value) => value >= 0 && value <= 50, + description: "毛玻璃模糊幅度（px）", + icon: "mdi-blur", + }, + "background.opacity": { + type: "number", + default: 30, + validate: (value) => value >= 0 && value <= 80, + description: "遮罩暗色程度（%）", + icon: "mdi-circle-half-full", + }, + // 通知铃声设置 "notification.singleSound": { type: "string", @@ -674,6 +708,13 @@ class SettingsManagerClass { this.saveSettings(); this.logSettingsChange(key, oldValue, value); + // 触发同标签页内的设置变化事件 + if (typeof window !== "undefined") { + window.dispatchEvent(new CustomEvent("classworks-settings-changed", { + detail: { key, value }, + })); + } + // 为了保持向后兼容，同时更新旧的localStorage键 const legacyKey = definition.legacyKey; if (legacyKey && typeof localStorage !== "undefined") { @@ -721,6 +762,13 @@ class SettingsManagerClass { this.settingsCache[key] = definition.default; this.saveSettings(); + + // 触发同标签页内的设置变化事件 + if (typeof window !== "undefined") { + window.dispatchEvent(new CustomEvent("classworks-settings-changed", { + detail: { key, value: definition.default }, + })); + } } /** @@ -743,15 +791,23 @@ class SettingsManagerClass { if (typeof window === "undefined") return () => { }; - const handler = (event) => { + const storageHandler = (event) => { if (event.key === SETTINGS_STORAGE_KEY) { this.settingsCache = JSON.parse(event.newValue); callback(this.settingsCache); } }; - window.addEventListener("storage", handler); - return () => window.removeEventListener("storage", handler); + const customHandler = () => { + callback(this.settingsCache); + }; + + window.addEventListener("storage", storageHandler); + window.addEventListener("classworks-settings-changed", customHandler); + return () => { + window.removeEventListener("storage", storageHandler); + window.removeEventListener("classworks-settings-changed", customHandler); + }; } /** From c4279acdae78fc178685bda21ff5458eee9ac256 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 11 Apr 2026 13:56:41 +0000 Subject: [PATCH 08/15] fix: address code review feedback for background feature - Use SETTINGS_CHANGED_EVENT constant to prevent typos - Enforce 2MB image size limit (block upload instead of warn) - Fix resetAll to force re-render SettingItem for enabled toggle - Optimize watchSettings callback to only reload on relevant key changes Agent-Logs-Url: https://github.com/ZeroCatDev/Classworks/sessions/6dfae4c0-df49-4612-88b8-9e31287538b0 Co-authored-by: Sunwuyuan <88357633+Sunwuyuan@users.noreply.github.com> --- src/App.vue | 11 +++++++---- .../settings/cards/BackgroundSettingsCard.vue | 8 ++++++-- src/utils/settings.js | 17 ++++++++++------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/App.vue b/src/App.vue index 1771bc8..56d4c98 100644 --- a/src/App.vue +++ b/src/App.vue @@ -67,10 +67,13 @@ onMounted(() => { loadBgSettings(); - unwatchSettings = watchSettings(() => { - loadBgSettings(); - // Reapply theme on settings change too - theme.global.name.value = getSetting("theme.mode"); + unwatchSettings = watchSettings((_, event) => { + // If event detail is available (same-tab change), only reload on background keys + const changedKey = event?.detail?.key; + if (!changedKey || changedKey.startsWith("background.") || changedKey === "theme.mode") { + loadBgSettings(); + theme.global.name.value = getSetting("theme.mode"); + } }); window.addEventListener('beforeinstallprompt', (e) => { diff --git a/src/components/settings/cards/BackgroundSettingsCard.vue b/src/components/settings/cards/BackgroundSettingsCard.vue index d6d0ab7..d011b50 100644 --- a/src/components/settings/cards/BackgroundSettingsCard.vue +++ b/src/components/settings/cards/BackgroundSettingsCard.vue @@ -1,7 +1,7 @@