feat: align with upstream 1.5.9.9

2026-09-12 18:21:11 +08:00
commit 34f0679117
805 changed files with 376275 additions and 0 deletions
@@ -0,0 +1,106 @@
+From 0e60f15cfe6e7a5e285fe2e2de75078f9ffef3dd Mon Sep 17 00:00:00 2001
+From: HenryDu8133 <813367384@qq.com>
+Date: Sat, 12 Sep 2026 00:13:27 +0800
+Subject: [PATCH 38/58] feat(theme): sync defaultTheme=ClassicLight
+ enabledThemes=[ClassicLight,ModernLight] across all 6 fallback locations
+
+---
+ app/composables/useSiteConfig.js               | 4 ++--
+ app/drizzle/schema.ts                          | 4 ++--
+ nuxt.config.ts                                 | 4 ++--
+ server/api/admin/system-settings/index.post.ts | 4 ++--
+ server/api/site-config.get.ts                  | 4 ++--
+ server/utils/system-settings-defaults.ts       | 4 ++--
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/app/composables/useSiteConfig.js b/app/composables/useSiteConfig.js
+index 428a851..3971ae7 100644
+--- a/app/composables/useSiteConfig.js
+++ b/app/composables/useSiteConfig.js
+@@ -60,8 +60,8 @@ export const useSiteConfig = () => {
+         enableReplayRequests: false,
+         enableCollaborativeSubmission: true,
+         enableSubmissionRemarks: false,
+-        defaultTheme: 'System',
+-        enabledThemes: '["System","ClassicDark","ClassicLight","ModernLight"]'
+        defaultTheme: 'ClassicLight',
+        enabledThemes: '["ClassicLight","ModernLight"]'
+       }
+       isLoaded.value = true
+     } finally {
+diff --git a/app/drizzle/schema.ts b/app/drizzle/schema.ts
+index eb7b324..4399622 100644
+--- a/app/drizzle/schema.ts
+++ b/app/drizzle/schema.ts
+@@ -350,8 +350,8 @@ export const systemSettings = pgTable('SystemSettings', {
+   autoBackupConfig: text('autoBackupConfig'),
+   statisticsCode: text('statisticsCode'),
+   statisticsCodeEnabled: boolean('statisticsCodeEnabled').default(false).notNull(),
+-  defaultTheme: text('defaultTheme').default('System').notNull(),
+-  enabledThemes: text('enabledThemes').default('[\"System\",\"ClassicDark\",\"ClassicLight\",\"ModernLight\"]').notNull(),
+  defaultTheme: text('defaultTheme').default('ClassicLight').notNull(),
+  enabledThemes: text('enabledThemes').default('[\"ClassicLight\",\"ModernLight\"]').notNull(),
+   enabledPlatforms: text('enabledPlatforms'),
+   platformOrder: text('platformOrder'),
+ });
+diff --git a/nuxt.config.ts b/nuxt.config.ts
+index c20d613..d68f3fc 100644
+--- a/nuxt.config.ts
+++ b/nuxt.config.ts
+@@ -156,8 +156,8 @@ export default defineNuxtConfig({
+         themeColor: process.env.PWA_THEME_COLOR || '#111111'
+       },
+       // 主题配置
+-      defaultTheme: process.env.NUXT_PUBLIC_DEFAULT_THEME || 'dark',
+-      enabledThemes: (process.env.NUXT_PUBLIC_ENABLED_THEMES || 'dark,light')
+      defaultTheme: process.env.NUXT_PUBLIC_DEFAULT_THEME || 'ClassicLight',
+      enabledThemes: (process.env.NUXT_PUBLIC_ENABLED_THEMES || 'ClassicLight,ModernLight')
+         .split(',')
+         .map((s) => s.trim())
+         .filter(Boolean),
+diff --git a/server/api/admin/system-settings/index.post.ts b/server/api/admin/system-settings/index.post.ts
+index cbc2133..1c25235 100644
+--- a/server/api/admin/system-settings/index.post.ts
+++ b/server/api/admin/system-settings/index.post.ts
+@@ -833,8 +833,8 @@ export default defineEventHandler(async (event) => {
+   autoBackupIntervalHours: 24,
+   autoBackupRetentionDays: 30,
+   statisticsCodeEnabled: false,
+-  defaultTheme: 'System',
+-  enabledThemes: '["System","ClassicDark","ClassicLight","ModernLight"]'
+  defaultTheme: 'ClassicLight',
+  enabledThemes: '["ClassicLight","ModernLight"]'
+ } as const
+ 
+     // 获取当前设置，如果不存在则创建
+diff --git a/server/api/site-config.get.ts b/server/api/site-config.get.ts
+index d19a930..d0244a7 100644
+--- a/server/api/site-config.get.ts
+++ b/server/api/site-config.get.ts
+@@ -87,8 +87,8 @@ export default defineEventHandler(async (event) => {
+           forceBlockAllRequests: false,
+           enableReplayRequests: false,
+           smtpEnabled: false,
+-          defaultTheme: 'System',
+-          enabledThemes: '["System","ClassicDark","ClassicLight","ModernLight"]',
+          defaultTheme: 'ClassicLight',
+          enabledThemes: '["ClassicLight","ModernLight"]',
+           scheduleDaysBeforeEnabled: false,
+           scheduleDaysBefore: 30,
+           scheduleDaysAfterEnabled: false,
+diff --git a/server/utils/system-settings-defaults.ts b/server/utils/system-settings-defaults.ts
+index 7946b9e..df6a405 100644
+--- a/server/utils/system-settings-defaults.ts
+++ b/server/utils/system-settings-defaults.ts
+@@ -65,6 +65,6 @@ export const SYSTEM_SETTINGS_DEFAULTS = {
+   autoBackupIntervalHours: 24,
+   autoBackupRetentionDays: 30,
+   statisticsCodeEnabled: false,
+-  defaultTheme: 'System',
+-  enabledThemes: '["System","ClassicDark","ClassicLight","ModernLight"]'
+  defaultTheme: 'ClassicLight',
+  enabledThemes: '["ClassicLight","ModernLight"]'
+ } as const
+-- 
+2.45.1.windows.1
+