From 2d1dc2b055f2e486485968c46d68a193baffee48 Mon Sep 17 00:00:00 2001 From: Snowykami Date: Fri, 26 Sep 2025 00:31:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=90=8D=E7=A7=B0=E4=BB=A5=E6=9B=B4=E6=B8=85?= =?UTF-8?q?=E6=99=B0=E5=9C=B0=E5=8F=8D=E6=98=A0=E9=94=99=E8=AF=AF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E4=BC=98=E5=8C=96=E5=90=88=E5=B9=B6=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BB=A5=E6=94=AF=E6=8C=81=E5=AF=B9=E8=B1=A1=E9=80=92?= =?UTF-8?q?=E5=BD=92=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/app/layout.tsx | 4 +++- web/src/contexts/site-info-context.tsx | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx index ed5a6e5..4984e5d 100644 --- a/web/src/app/layout.tsx +++ b/web/src/app/layout.tsx @@ -72,8 +72,10 @@ export default async function RootLayout({ const siteInfo = await getSiteInfo().then(res => res.data).catch(() => fallbackSiteInfo); const colorSchemes = siteInfo?.colorSchemes ? siteInfo.colorSchemes : fallbackSiteInfo.colorSchemes; + console.log(siteInfo) + return ( - + diff --git a/web/src/contexts/site-info-context.tsx b/web/src/contexts/site-info-context.tsx index 791c635..ec2cd2b 100644 --- a/web/src/contexts/site-info-context.tsx +++ b/web/src/contexts/site-info-context.tsx @@ -34,7 +34,7 @@ export type SiteInfo = { export const fallbackSiteInfo: SiteInfo = { colorSchemes: ["blue", "green", "orange", "red", "rose", "violet", "yellow"], metadata: { - name: "Failed to Fetch Name", + name: "Failed to Fetch", icon: "", description: "Failed to fetch site info from server.", }, @@ -87,8 +87,8 @@ function mergeWithFallback>(initial: T, fallba typeof fallbackValue === 'object' && !Array.isArray(fallbackValue) ) { - // 如果都是对象（非数组），也不要递归合并 - result[key] = { ...initialValue, ...fallbackValue }; + // 如果都是对象（非数组），递归合并 + result[key] = mergeWithFallback(initialValue as Record, fallbackValue as Record) as T[typeof key]; } // 否则保持 initial 的值不变 }