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 的值不变 }