From 63e3f3639599c48053d0d6cfc6fe2e5b2e66a434 Mon Sep 17 00:00:00 2001
From: SuperHuangXu <www.1567891@qq.com>
Date: Thu, 30 Mar 2023 19:04:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Announcement=20?=
 =?UTF-8?q?=E6=98=BE=E9=9A=90=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/next/components/SideAreaRight.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/next/components/SideAreaRight.js b/themes/next/components/SideAreaRight.js
index 89b5b0ba..6376a4f7 100644
--- a/themes/next/components/SideAreaRight.js
+++ b/themes/next/components/SideAreaRight.js
@@ -25,6 +25,8 @@ const SideAreaRight = (props) => {
   const { tagOptions, currentTag, slot, categoryOptions, currentCategory, notice } = props
   const { locale } = useGlobal()
   const router = useRouter()
+  const announcementVisible = notice && Object.keys(notice).length > 0
+
   return (<aside id='right' className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'mr-4' : 'ml-4') + ' space-y-4 hidden xl:block flex-col w-60 relative z-10'}>
 
         {CONFIG_NEXT.RIGHT_AD && <Card className='mb-2'>
@@ -41,7 +43,7 @@ const SideAreaRight = (props) => {
         </Card>}
 
         <div className="sticky top-0 space-y-4 w-full">
-            {notice && <Card>
+            {announcementVisible && <Card>
                 <Announcement post={notice} />
             </Card>}
 

From 98d5fff6435366a2ceb834c9e51e9e86b36242f7 Mon Sep 17 00:00:00 2001
From: SuperHuangXu <www.1567891@qq.com>
Date: Thu, 30 Mar 2023 19:10:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20MenuList=20key=20?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/next/components/MenuList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/next/components/MenuList.js b/themes/next/components/MenuList.js
index 3afa60e9..2607fd26 100644
--- a/themes/next/components/MenuList.js
+++ b/themes/next/components/MenuList.js
@@ -35,12 +35,12 @@ export const MenuList = (props) => {
         <>
             {/* 大屏模式菜单 */}
             <nav id='nav' className='hidden md:block leading-8 text-gray-500 dark:text-gray-400 font-sans'>
-                {links.map(link => link && link.show && <MenuItemDrop key={link?.id} link={link} />)}
+                {links.map(link => link && link.show && <MenuItemDrop key={link?.to} link={link} />)}
             </nav>
 
             {/* 移动端菜单 */}
             <div id='nav-menu-mobile' className='block md:hidden my-auto justify-start bg-white'>
-                {links?.map(link => link && link.show && <MenuItemCollapse onHeightChange={props.onHeightChange} key={link?.id} link={link} />)}
+                {links?.map(link => link && link.show && <MenuItemCollapse onHeightChange={props.onHeightChange} key={link?.to} link={link} />)}
             </div>
         </>
   )