From 065bbef781fe94f391ca590668058a90815ebae1 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 4 Nov 2022 18:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=AD=8C=E6=9B=B2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=B9=E7=AA=97=E4=B8=AD=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=88=97=E8=A1=A8=E6=B2=A1=E6=9C=89=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/ListAddModal.vue        | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/renderer/components/common/ListAddModal.vue b/src/renderer/components/common/ListAddModal.vue
index 4a93a923..b563263f 100644
--- a/src/renderer/components/common/ListAddModal.vue
+++ b/src/renderer/components/common/ListAddModal.vue
@@ -18,7 +18,7 @@
 
 <script>
 // import { mapMutations } from 'vuex'
-import { watch, ref } from '@common/utils/vueTools'
+import { watch, ref, onBeforeUnmount } from '@common/utils/vueTools'
 import { defaultList, loveList, userLists } from '@renderer/store/list/state'
 import { addListMusics, moveListMusics, createUserList, getMusicExistListIds } from '@renderer/store/list/action'
 import useKeyDown from '@renderer/utils/compositions/useKeyDown'
@@ -77,19 +77,39 @@ export default {
       })
     }
 
-    watch(() => props.show, show => {
-      if (!show) return
-      if (!props.musicInfo) return lists.value = []
-
-      currentMusicInfo.value = 'progress' in props.musicInfo ? props.musicInfo.metadata.musicInfo : props.musicInfo
+    let stopWatchUserList = null
 
+    const getList = () => {
       lists.value = [
         defaultList,
         loveList,
         ...userLists,
       ].filter(l => !props.excludeListId.includes(l.id)).map(l => ({ ...l, isExist: false }))
-
       checkMusicExist(currentMusicInfo.value)
+    }
+
+    watch(() => props.show, show => {
+      if (!show) {
+        if (stopWatchUserList) {
+          stopWatchUserList()
+          stopWatchUserList = null
+        }
+        return
+      }
+      if (!props.musicInfo) return lists.value = []
+
+      currentMusicInfo.value = 'progress' in props.musicInfo ? props.musicInfo.metadata.musicInfo : props.musicInfo
+
+      getList()
+
+      stopWatchUserList = watch(userLists, getList)
+    })
+
+    onBeforeUnmount(() => {
+      if (stopWatchUserList) {
+        stopWatchUserList()
+        stopWatchUserList = null
+      }
     })
 
     return {