From 7ac084f73dc0819aaf7e988851a72656051cbd4e Mon Sep 17 00:00:00 2001
From: memorydream <34763046+memorydream@users.noreply.github.com>
Date: Thu, 24 Mar 2022 11:52:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=AD=8C=E6=89=8B=E9=A1=B5=20&=20?=
 =?UTF-8?q?=E6=AD=8C=E6=89=8B=E9=A1=B5=E9=93=BE=E6=8E=A5=20(#1434)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 禁止打开id为0的歌手页

* feat: 当歌手没有专辑时，不在歌手页中显示专辑 & 热门歌曲默认禁用滚动条

* fix

* fix: 根据建议进行修改
---
 .../renderer/src/components/ArtistsInline.tsx |  6 +++---
 packages/renderer/src/pages/Artist.tsx        | 20 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/renderer/src/components/ArtistsInline.tsx b/packages/renderer/src/components/ArtistsInline.tsx
index e1883e6..a6b8ca1 100644
--- a/packages/renderer/src/components/ArtistsInline.tsx
+++ b/packages/renderer/src/components/ArtistsInline.tsx
@@ -10,8 +10,8 @@ const ArtistInline = ({
   if (!artists) return <div></div>
 
   const navigate = useNavigate()
-  const handleClick = () => {
-    disableLink ? null : navigate(`/artist/${artists[0].id}`)
+  const handleClick = (id: number) => {
+    id !== 0 && !disableLink && navigate(`/artist/${id}`)
   }
 
   return (
@@ -19,7 +19,7 @@ const ArtistInline = ({
       {artists.map((artist, index) => (
         <span key={`${artist.id}-${artist.name}`}>
           <span
-            onClick={handleClick}
+            onClick={() => handleClick(artist.id)}
             className={classNames({
               'hover:underline': !!artist.id && !disableLink,
             })}
diff --git a/packages/renderer/src/pages/Artist.tsx b/packages/renderer/src/pages/Artist.tsx
index 3fe8ded..3ae010f 100644
--- a/packages/renderer/src/pages/Artist.tsx
+++ b/packages/renderer/src/pages/Artist.tsx
@@ -113,7 +113,7 @@ const Artist = () => {
           <div className='mb-6 text-2xl font-semibold dark:text-white'>
             热门歌曲
           </div>
-          <div className='overflow-scroll rounded-xl '>
+          <div className='rounded-xl'>
             <TracksGrid
               tracks={artist?.hotSongs.slice(0, 10) ?? []}
               isSkeleton={isLoading}
@@ -123,13 +123,17 @@ const Artist = () => {
       </div>
 
       {/* Albums */}
-      <div className='mt-20 px-2'>
-        <div className='mb-6 text-2xl font-semibold dark:text-white'>专辑</div>
-        <CoverRow
-          albums={albums.slice(0, 10)}
-          subtitle={Subtitle.TYPE_RELEASE_YEAR}
-        />
-      </div>
+      {albums.length !== 0 && (
+        <div className='mt-20 px-2'>
+          <div className='mb-6 text-2xl font-semibold dark:text-white'>
+            专辑
+          </div>
+          <CoverRow
+            albums={albums.slice(0, 10)}
+            subtitle={Subtitle.TYPE_RELEASE_YEAR}
+          />
+        </div>
+      )}
 
       {/* Singles/EP */}
       <div className='mt-16 px-2'>