From 1e1c0515d16e970e38e0d47cbb6c9b88733c3b09 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Tue, 15 Nov 2022 12:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E6=80=A7=E8=83=BDbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/views/Download/index.vue       | 16 +++++++++-------
 src/renderer/views/List/MusicList/index.vue | 14 ++++++++------
 src/renderer/worker/main/list.ts            |  4 +++-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/renderer/views/Download/index.vue b/src/renderer/views/Download/index.vue
index 13f8bb4c..afdd662a 100644
--- a/src/renderer/views/Download/index.vue
+++ b/src/renderer/views/Download/index.vue
@@ -20,7 +20,7 @@
       </div>
       <div v-if="list.length" ref="dom_listContent" :class="$style.content">
         <base-virtualized-list
-          v-slot="{ item, index }" :list="list" key-name="key" :item-height="listItemHeight"
+          v-slot="{ item, index }" :list="list" key-name="id" :item-height="listItemHeight"
           container-class="scroll" content-class="list"
         >
           <div
@@ -29,12 +29,14 @@
             @click="handleListItemClick($event, index)" @contextmenu="handleListItemRightClick($event, index)"
           >
             <div class="list-item-cell no-select" :class="$style.num" style="flex: 0 0 5%;">
-              <div v-if="playTaskId == item.id" :class="$style.playIcon">
-                <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="50%" viewBox="0 0 512 512" space="preserve">
-                  <use xlink:href="#icon-play-outline" />
-                </svg>
-              </div>
-              <div v-else class="num">{{ index + 1 }}</div>
+              <transition name="play-active">
+                <div v-if="playTaskId == item.id" :class="$style.playIcon">
+                  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="50%" viewBox="0 0 512 512" space="preserve">
+                    <use xlink:href="#icon-play-outline" />
+                  </svg>
+                </div>
+                <div v-else class="num">{{ index + 1 }}</div>
+              </transition>
             </div>
             <div class="list-item-cell auto name">
               <span class="select name" :aria-label="getName(item)">{{ getName(item) }}</span>
diff --git a/src/renderer/views/List/MusicList/index.vue b/src/renderer/views/List/MusicList/index.vue
index 12288175..fb96f935 100644
--- a/src/renderer/views/List/MusicList/index.vue
+++ b/src/renderer/views/List/MusicList/index.vue
@@ -32,12 +32,14 @@
           @click="handleListItemClick($event, index)" @contextmenu="handleListItemRightClick($event, index)"
         >
           <div class="list-item-cell no-select" :class="$style.num" style="flex: 0 0 5%;">
-            <div v-if="playerInfo.isPlayList && playerInfo.playIndex === index" :class="$style.playIcon">
-              <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="50%" viewBox="0 0 512 512" space="preserve">
-                <use xlink:href="#icon-play-outline" />
-              </svg>
-            </div>
-            <div v-else class="num">{{ index + 1 }}</div>
+            <transition name="play-active">
+              <div v-if="playerInfo.isPlayList && playerInfo.playIndex === index" :class="$style.playIcon">
+                <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="50%" viewBox="0 0 512 512" space="preserve">
+                  <use xlink:href="#icon-play-outline" />
+                </svg>
+              </div>
+              <div v-else class="num">{{ index + 1 }}</div>
+            </transition>
           </div>
           <div class="list-item-cell auto name" :aria-label="item.name">
             <span class="select name">{{ item.name }}</span>
diff --git a/src/renderer/worker/main/list.ts b/src/renderer/worker/main/list.ts
index 81de6b88..ddaef343 100644
--- a/src/renderer/worker/main/list.ts
+++ b/src/renderer/worker/main/list.ts
@@ -149,19 +149,21 @@ const variantRxp2 = /\s|'|\.|,|，|&|"|、|\(|\)|（|）|`|~|-|<|>|\||\/|\]|\[/g
  * @returns
  */
 export const filterDuplicateMusic = async(list: LX.Music.MusicInfo[], isFilterVariant: boolean = true) => {
-  type ListMapValue = Array<{ index: number, musicInfo: LX.Music.MusicInfo }>
+  type ListMapValue = Array<{ id: string, index: number, musicInfo: LX.Music.MusicInfo }>
   const listMap = new Map<string, ListMapValue>()
   const duplicateList = new Set<string>()
   const handleFilter = (name: string, index: number, musicInfo: LX.Music.MusicInfo) => {
     if (listMap.has(name)) {
       const targetMusicInfo = listMap.get(name)
       targetMusicInfo!.push({
+        id: musicInfo.id,
         index,
         musicInfo,
       })
       duplicateList.add(name)
     } else {
       listMap.set(name, [{
+        id: musicInfo.id,
         index,
         musicInfo,
       }])