添加主题字体颜色设置

src/renderer/store/list/listManage/action.ts

@@ -97,7 +97,7 @@ const removeUserList = (id: string) => {
 }
 
 const overwriteUserList = (lists: LX.List.UserListInfo[]) => {
-  userLists.splice(0, lists.length, ...lists)
+  userLists.splice(0, userLists.length, ...lists)
 }
 
 
@@ -108,13 +108,22 @@ const overwriteUserList = (lists: LX.List.UserListInfo[]) => {
 
 export const listDataOverwrite = ({ defaultList, loveList, userList, tempList }: MakeOptional<LX.List.ListDataFull, 'tempList'>): string[] => {
   const updatedListIds: string[] = []
-  overwriteUserList(userList.map(({ list, ...listInfo }) => {
+  const newUserIds: string[] = []
+  const newUserListInfos = userList.map(({ list, ...listInfo }) => {
+    newUserIds.push(listInfo.id)
     if (allMusicList.has(listInfo.id)) {
       overwriteMusicList(listInfo.id, list)
       updatedListIds.push(listInfo.id)
     }
     return listInfo
-  }))
+  })
+  for (const list of userLists) {
+    if (!allMusicList.has(list.id)) continue
+    removeMusicList(list.id)
+    updatedListIds.push(list.id)
+  }
+  overwriteUserList(newUserListInfos)
+
   if (allMusicList.has(LIST_IDS.DEFAULT)) {
     overwriteMusicList(LIST_IDS.DEFAULT, defaultList)
     updatedListIds.push(LIST_IDS.DEFAULT)
@@ -130,8 +139,8 @@ export const listDataOverwrite = ({ defaultList, loveList, userList, tempList }:
   }
   const newIds = [LIST_IDS.DEFAULT, LIST_IDS.LOVE, ...userList.map(l => l.id)]
   if (tempList) newIds.push(LIST_IDS.TEMP)
-  overwriteListPosition(newIds)
-  overwriteListUpdateInfo(newIds)
+  void overwriteListPosition(newIds)
+  void overwriteListUpdateInfo(newIds)
   return updatedListIds
 }
 
@@ -158,10 +167,10 @@ export const userListsRemove = (ids: string[]) => {
   const changedIds = []
   for (const id of ids) {
     removeUserList(id)
-    if (!allMusicList.has(id)) continue
-    removeMusicList(id)
     removeListPosition(id)
     removeListUpdateInfo(id)
+    if (!allMusicList.has(id)) continue
+    removeMusicList(id)
     changedIds.push(id)
   }
 

src/renderer/store/list/listManage/rendererListManage.ts

@@ -235,7 +235,7 @@ export const registerListAction = (appSetting: LX.AppSetting, onListChanged: (li
   rendererOn(PLAYER_EVENT_NAME.list_music_update, list_music_update)
   rendererOn(PLAYER_EVENT_NAME.list_music_update_position, list_music_update_position)
   rendererOn(PLAYER_EVENT_NAME.list_music_overwrite, list_music_overwrite)
-  rendererOn(PLAYER_EVENT_NAME.list_data_overwire, list_music_clear)
+  rendererOn(PLAYER_EVENT_NAME.list_music_clear, list_music_clear)
 
   return () => {
     rendererOff(PLAYER_EVENT_NAME.list_data_overwire, list_data_overwrite)
@@ -249,6 +249,6 @@ export const registerListAction = (appSetting: LX.AppSetting, onListChanged: (li
     rendererOff(PLAYER_EVENT_NAME.list_music_update, list_music_update)
     rendererOff(PLAYER_EVENT_NAME.list_music_update_position, list_music_update_position)
     rendererOff(PLAYER_EVENT_NAME.list_music_overwrite, list_music_overwrite)
-    rendererOff(PLAYER_EVENT_NAME.list_data_overwire, list_music_clear)
+    rendererOff(PLAYER_EVENT_NAME.list_music_clear, list_music_clear)
   }
 }

src/renderer/store/utils.ts

@@ -5,7 +5,6 @@
 // export const getList = (listId: string | null): LX.Download.ListItem[] | LX.Music.MusicInfo[] => {
 //   return listId == 'download' ? downloadList : getListFromState(listId)
 // }
-import { commonColorNames, commonDarkColorValues, commonLightColorValues } from '@common/config'
 import { encodePath, isUrl } from '@common/utils/common'
 import { joinPath } from '@common/utils/nodejs'
 import { markRaw, shallowReactive } from '@common/utils/vueTools'
@@ -41,11 +40,6 @@ export const buildThemeColors = (theme: LX.Theme, dataPath: string) => {
     ...theme.config.extInfo,
   }
 
-  const vals = theme.isDark ? commonDarkColorValues : commonLightColorValues
-  for (let i = commonColorNames.length; i--;) {
-    colors[commonColorNames[i]] = vals[i]
-  }
-
   return colors
 }