From d93b5a3374efc92301bb587dd63ab2d2402d9345 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 17 Dec 2021 17:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AF=B9=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E4=BD=8D=E7=BD=AE=E5=90=8C=E6=AD=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/core/useApp/useSync.js | 10 +++-------
 src/renderer/store/modules/list.js  | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/renderer/core/useApp/useSync.js b/src/renderer/core/useApp/useSync.js
index fcbb33b4..542cc71d 100644
--- a/src/renderer/core/useApp/useSync.js
+++ b/src/renderer/core/useApp/useSync.js
@@ -17,10 +17,9 @@ export default () => {
   const createUserList = useCommit('list', 'createUserList')
   const removeUserList = useCommit('list', 'removeUserList')
   const setUserListName = useCommit('list', 'setUserListName')
-  const moveupUserList = useCommit('list', 'moveupUserList')
-  const movedownUserList = useCommit('list', 'movedownUserList')
   const setMusicPosition = useCommit('list', 'setMusicPosition')
   const setSyncListData = useCommit('list', 'setSyncListData')
+  const setUserListPosition = useCommit('list', 'setUserListPosition')
 
   const setting = useRefGetter('setting')
 
@@ -65,11 +64,8 @@ export default () => {
       case 'set_user_list_name':
         setUserListName(data)
         break
-      case 'moveup_user_list':
-        moveupUserList(data)
-        break
-      case 'movedown_user_list':
-        movedownUserList(data)
+      case 'set_user_list_position':
+        setUserListPosition(data)
         break
       case 'set_music_position':
         setMusicPosition(data)
diff --git a/src/renderer/store/modules/list.js b/src/renderer/store/modules/list.js
index 1e282a34..08071c93 100644
--- a/src/renderer/store/modules/list.js
+++ b/src/renderer/store/modules/list.js
@@ -362,11 +362,7 @@ const mutations = {
 
     const index = userLists.findIndex(l => l.id == id)
     if (index < 0) return
-    let targetList = userLists[index]
-    userLists.splice(index, 1)
-    userLists.splice(index - 1, 0, targetList)
-    targetList.locationUpdateTime = Date.now()
-    window.eventHub.emit(eventListNames.listChange, [id])
+    this.commit('list/setUserListPosition', { id, position: index - 1 })
   },
   movedownUserList(state, { id, isSync }) {
     if (!isSync) {
@@ -377,9 +373,20 @@ const mutations = {
     }
     const index = userLists.findIndex(l => l.id == id)
     if (index < 0) return
+    this.commit('list/setUserListPosition', { id, position: index + 1 })
+  },
+  setUserListPosition(state, { id, position, isSync }) {
+    if (!isSync) {
+      window.eventHub.emit(eventSyncName.send_action_list, {
+        action: 'set_user_list_position',
+        data: { id, position },
+      })
+    }
+    const index = userLists.findIndex(l => l.id == id)
+    if (index < 0) return
     let targetList = userLists[index]
     userLists.splice(index, 1)
-    userLists.splice(index + 1, 0, targetList)
+    userLists.splice(Math.max(Math.min(position, userLists.length - 1), 0), 0, targetList)
     targetList.locationUpdateTime = Date.now()
     window.eventHub.emit(eventListNames.listChange, [id])
   },