From 0a919d707655e4549d4137ba369ffd460b5412e3 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 13 Dec 2020 12:32:55 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8DgetAttribute=E7=9A=84?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/plugins/Tips/index.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/renderer/plugins/Tips/index.js b/src/renderer/plugins/Tips/index.js
index 4e2aee98..eede83c9 100644
--- a/src/renderer/plugins/Tips/index.js
+++ b/src/renderer/plugins/Tips/index.js
@@ -4,11 +4,14 @@ import { debounce } from '../../utils'
 let instance
 let prevTips
 
-const getTips = el => el.getAttribute('tips')
-  ? el.getAttribute('tips')
-  : el.parentNode === document.documentElement
-    ? null
-    : getTips(el.parentNode)
+const getTips = el =>
+  el
+    ? el.getAttribute('tips')
+      ? el.getAttribute('tips')
+      : el.parentNode === document.documentElement
+        ? null
+        : getTips(el.parentNode)
+    : null
 
 const showTips = debounce(event => {
   let msg = getTips(event.target)

From 382235c5563940312f66adf0e8c0b0e88b532f2a Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 13 Dec 2020 13:30:21 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/views/List.vue     | 12 +++++-------
 src/renderer/views/SongList.vue |  4 +---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/renderer/views/List.vue b/src/renderer/views/List.vue
index d0f1a077..df5a82e6 100644
--- a/src/renderer/views/List.vue
+++ b/src/renderer/views/List.vue
@@ -846,18 +846,16 @@ export default {
       } else {
         this.fetchingListStatus[id] = true
       }
-      return this.getListDetailAll({ source, id: sourceListId }).catch(err => {
-        return Promise.reject(err)
-      }).finally(() => {
+      return this.getListDetailAll({ source, id: sourceListId }).finally(() => {
         this.fetchingListStatus[id] = false
       })
     },
     async handleSyncSourceList(index) {
-      const targetList = this.userList[index]
-      const list = await this.fetchList(targetList.id, targetList.source, targetList.sourceListId)
-      // console.log(targetList.list.length, list.length)
+      const targetListInfo = this.userList[index]
+      const list = await this.fetchList(targetListInfo.id, targetListInfo.source, targetListInfo.sourceListId)
+      // console.log(targetListInfo.list.length, list.length)
       this.setList({
-        ...targetList,
+        ...targetListInfo,
         list,
       })
     },
diff --git a/src/renderer/views/SongList.vue b/src/renderer/views/SongList.vue
index 2c1b5cda..d99241dc 100644
--- a/src/renderer/views/SongList.vue
+++ b/src/renderer/views/SongList.vue
@@ -405,9 +405,7 @@ export default {
     },
     async fetchList() {
       this.detailLoading = true
-      return this.getListDetailAll({ source: this.source, id: this.selectListInfo.id }).catch(err => {
-        return Promise.reject(err)
-      }).finally(() => {
+      return this.getListDetailAll({ source: this.source, id: this.selectListInfo.id }).finally(() => {
         this.detailLoading = false
       })
     },

From 0fcc3f257d1581cb5f00f46a783aabe7c835e77d Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 18 Dec 2020 19:36:29 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/--bug.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/--bug.md b/.github/ISSUE_TEMPLATE/--bug.md
index be948180..f0a8160b 100644
--- a/.github/ISSUE_TEMPLATE/--bug.md
+++ b/.github/ISSUE_TEMPLATE/--bug.md
@@ -34,7 +34,7 @@ assignees: ''
 
 **环境：**
   -操作系统及版本：[例如：Windows 10 64位 18362.156]
-  -软件安装包及版本：[例如：Windows 64位绿色版 1.0.0]
+  -软件安装包及版本：[例如：1.0.0 安装版]
 
 
 **其他内容**

From ba9fd8d1f12734e2fc7007f5ec856d4d4767262e Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 18 Dec 2020 19:36:38 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=B7=B2=E6=94=B6=E8=97=8F=E7=9A=84=E5=9C=A8=E7=BA=BF=E6=AD=8C?=
 =?UTF-8?q?=E5=8D=95=20=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FAQ.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/FAQ.md b/FAQ.md
index 9c808d33..6d04931c 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -125,6 +125,12 @@ Windows 7 未开启 Aero 效果时桌面歌词会有问题，详情看下面的
 注意：**绿色版**的软件自动更新功能**不可用**，建议使用安装版！！<br>
 注意：**Mac版**、**Linux deb**版不支持自动更新！
 
+## 更新已收藏的在线歌单
+
+该功能仅对直接从歌单详情页点“收藏”按钮收藏的歌单有效，可右击已收藏的列表名从弹出的菜单中选择“同步”使用该功能，
+
+需要注意的是：这将会覆盖本地的目标列表，歌曲将被替换成最新的在线列表。
+
 ## 缺少`xxx.dll`
 
 这个是电脑缺少某些dll导致的，正常的系统是没有这个问题的，可以尝试如下几个解决办法：

From bc69a98df1d2c8af662658d7b787ff3c988e84bc Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 19 Dec 2020 15:16:22 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95=E6=96=B0=E5=A2=9E=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 publish/changeLog.md                          |  12 +-
 src/renderer/components/material/Input.vue    |  21 +-
 .../components/material/ListAddModal.vue      | 201 ++++++++++++++++++
 .../material/ListAddMultipleModal.vue         | 195 +++++++++++++++++
 .../components/material/ListSortModal.vue     | 109 ++++++++++
 src/renderer/components/material/Menu.vue     |   4 +-
 .../components/material/XmVerifyModal.vue     |  50 +++++
 .../lang/en-us/material/list_sort_modal.json  |   6 +
 src/renderer/lang/en-us/view/list.json        |   1 +
 .../lang/zh-cn/material/list_sort_modal.json  |   6 +
 src/renderer/lang/zh-cn/view/list.json        |   1 +
 .../lang/zh-tw/material/list_sort_modal.json  |   6 +
 src/renderer/lang/zh-tw/view/list.json        |   1 +
 src/renderer/store/modules/list.js            |   6 +
 src/renderer/views/List.vue                   |  34 +++
 16 files changed, 639 insertions(+), 16 deletions(-)
 create mode 100644 src/renderer/components/material/ListAddModal.vue
 create mode 100644 src/renderer/components/material/ListAddMultipleModal.vue
 create mode 100644 src/renderer/components/material/ListSortModal.vue
 create mode 100644 src/renderer/components/material/XmVerifyModal.vue
 create mode 100644 src/renderer/lang/en-us/material/list_sort_modal.json
 create mode 100644 src/renderer/lang/zh-cn/material/list_sort_modal.json
 create mode 100644 src/renderer/lang/zh-tw/material/list_sort_modal.json

diff --git a/package.json b/package.json
index 378935fa..85f0e190 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "一个免费的音乐下载助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",
diff --git a/publish/changeLog.md b/publish/changeLog.md
index 085d884a..d758fc6e 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,14 +1,4 @@
 ### 新增
 
-- 直接从歌单详情收藏的列表新增同步功能。注意：这将会覆盖本地的目标列表，歌曲将被替换成最新的在线列表
+- 我的列表右键菜单新增列表排序功能，可调整单曲、多选后的歌曲的顺序
 
-### 优化
-
-- 优化软件启动时恢复上一次播放的歌曲进度功能
-
-### 修复
-
-- 修复MAC平台上下载歌曲封面嵌入无法显示的问题
-- 修复MAC平台首次运行软件最小化、关闭控制按钮默认在右边的问题
-- 修复酷狗源的某些歌曲没有专辑字段导致的列表加载失败问题
-- 修复某些酷狗源歌单链接无法打开的问题
diff --git a/src/renderer/components/material/Input.vue b/src/renderer/components/material/Input.vue
index 1f0bf89f..8b1ac781 100644
--- a/src/renderer/components/material/Input.vue
+++ b/src/renderer/components/material/Input.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
-  input(:class="$style.input" :type="type" :placeholder="placeholder" :value="value" :disabled="disabled"
-    @focus="$emit('focus', $event)" @blur="$emit('blur', $event)" @input="$emit('input', $event.target.value.trim())" @change="$emit('change', $event.target.value.trim())"
+  input(:class="$style.input" ref="dom_input" :type="type" :placeholder="placeholder" :value="value" :disabled="disabled"
+    @focus="$emit('focus', $event)" @blur="$emit('blur', $event)" @input="handleInput" @change="$emit('change', $event.target.value.trim())"
     @keyup.enter="$emit('submit', $event.target.value.trim())")
 </template>
 
@@ -24,6 +24,16 @@ export default {
       default: 'text',
     },
   },
+  methods: {
+    handleInput(event) {
+      let value = event.target.value.trim()
+      event.target.value = value
+      this.$emit('input', value)
+    },
+    focus() {
+      this.$refs.dom_input.focus()
+    },
+  },
 }
 </script>
 
@@ -41,6 +51,13 @@ export default {
   transition: background-color 0.2s ease;
   background-color: @color-btn-background;
   font-size: 13.3px;
+
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+
   &[disabled] {
     opacity: .4;
   }
diff --git a/src/renderer/components/material/ListAddModal.vue b/src/renderer/components/material/ListAddModal.vue
new file mode 100644
index 00000000..c42c8de3
--- /dev/null
+++ b/src/renderer/components/material/ListAddModal.vue
@@ -0,0 +1,201 @@
+<template lang="pug">
+material-modal(:show="show" :bg-close="bgClose" @close="handleClose")
+  main(:class="$style.main")
+    h2
+      | {{$t('material.list_add_modal.' + (isMove ? 'title_first_move' : 'title_first_add'))}}&nbsp;
+      span(:class="$style.name") {{this.musicInfo && `${musicInfo.name}`}}
+      | &nbsp;{{$t('material.list_add_modal.title_last')}}
+    div.scroll(:class="$style.btnContent")
+      material-btn(:class="$style.btn" :tips="$t('material.list_add_modal.btn_title', { name: item.name })" :key="item.id" @click="handleClick(index)" v-for="(item, index) in lists") {{item.name}}
+      material-btn(:class="[$style.btn, $style.newList, isEditing ? $style.editing : null]" @click="handleEditing($event)" :tips="$t('view.list.lists_new_list_btn')")
+        svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 42 42' space='preserve')
+          use(xlink:href='#icon-addTo')
+        input.key-bind(:class="$style.newListInput" :value="newListName" type="text" :placeholder="$t('view.list.lists_new_list_input')" @keyup.enter="handleSaveList($event)" @blur="handleSaveList($event)")
+      span(:class="$style.btn" v-for="i in spaceNum")
+</template>
+
+<script>
+import { mapGetters, mapMutations } from 'vuex'
+export default {
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    musicInfo: {
+      type: Object,
+    },
+    bgClose: {
+      type: Boolean,
+      default: true,
+    },
+    excludeListId: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
+    listName: {
+      type: String,
+      default: '',
+    },
+    fromListId: {
+      type: String,
+      default: null,
+    },
+    isMove: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      isEditing: false,
+      newListName: '',
+    }
+  },
+  computed: {
+    ...mapGetters('list', ['defaultList', 'loveList', 'userList']),
+    lists() {
+      return [
+        this.defaultList,
+        this.loveList,
+        ...this.userList,
+      ].filter(l => l.id != this.excludeListId.includes(l.id))
+    },
+    spaceNum() {
+      return this.lists.length < 2 ? 0 : (3 - this.lists.length % 3 - 1)
+    },
+  },
+  methods: {
+    ...mapMutations('list', ['listAdd', 'listMove', 'createUserList']),
+    handleClick(index) {
+      this.isMove
+        ? this.listMove({ fromId: this.fromListId, toId: this.lists[index].id, musicInfo: this.musicInfo })
+        : this.listAdd({ id: this.lists[index].id, musicInfo: this.musicInfo })
+      this.$nextTick(() => {
+        this.handleClose()
+      })
+    },
+    handleClose() {
+      this.$emit('close')
+    },
+    handleEditing(event) {
+      if (this.isEditing) return
+      if (!this.newListName) this.newListName = this.listName
+      this.isEditing = true
+      this.$nextTick(() => event.currentTarget.querySelector('.' + this.$style.newListInput).focus())
+    },
+    handleSaveList(event) {
+      let name = event.target.value
+      this.newListName = event.target.value = ''
+      this.isEditing = false
+      if (!name) return
+      this.createUserList({ name })
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../../assets/styles/layout.less';
+
+.main {
+  // padding: 15px 0;
+  max-width: 530px;
+  min-width: 200px;
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: center;
+  min-height: 0;
+  // max-height: 100%;
+  // overflow: hidden;
+  h2 {
+    font-size: 13px;
+    color: @color-theme_2-font;
+    line-height: 1.3;
+    text-align: center;
+    padding: 15px;
+  }
+}
+
+.name {
+  color: @color-theme;
+}
+
+.btn-content {
+  flex: auto;
+  max-height: 100%;
+  padding-right: 15px;
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: space-evenly;
+}
+
+.btn {
+  box-sizing: border-box;
+  margin-left: 15px;
+  margin-bottom: 15px;
+  height: 36px;
+  line-height: 36px;
+  padding: 0 10px !important;
+  width: 150px;
+  .mixin-ellipsis-1;
+}
+
+.newList {
+  border: 1px dashed @color-theme-hover;
+  background-color: @color-theme_2-background_2;
+  color: @color-theme-hover;
+  opacity: .7;
+
+  svg {
+    height: 18px;
+    margin-top: 9px;
+  }
+
+  &.editing {
+    opacity: 1;
+
+    svg {
+      display: none;
+    }
+    .newListInput {
+      display: block;
+    }
+  }
+}
+.newListInput {
+  width: 100%;
+  height: 34px;
+  border: none;
+  padding: 0;
+  line-height: 34px;
+  background: none;
+  outline: none;
+  font-size: 14px;
+  text-align: center;
+  font-family: inherit;
+  display: none;
+}
+
+each(@themes, {
+  :global(#container.@{value}) {
+    .main {
+      h2 {
+        color: ~'@{color-@{value}-theme_2-font}';
+      }
+    }
+    .name {
+      color: ~'@{color-@{value}-theme}';
+    }
+    .newList {
+      border-color: ~'@{color-@{value}-theme-hover}';
+      color: ~'@{color-@{value}-theme-hover}';
+      background-color: ~'@{color-@{value}-theme_2-background_2}';
+    }
+  }
+})
+
+</style>
diff --git a/src/renderer/components/material/ListAddMultipleModal.vue b/src/renderer/components/material/ListAddMultipleModal.vue
new file mode 100644
index 00000000..40a9e734
--- /dev/null
+++ b/src/renderer/components/material/ListAddMultipleModal.vue
@@ -0,0 +1,195 @@
+<template lang="pug">
+material-modal(:show="show" :bg-close="bgClose" @close="handleClose")
+  main(:class="$style.main")
+    h2 {{$t('material.list_add_multiple_modal.' + (isMove ? 'title_move' : 'title_add'), { num: musicList.length })}}
+    div.scroll(:class="$style.btnContent")
+      material-btn(:class="$style.btn" :tips="$t('material.list_add_multiple_modal.btn_title', { name: item.name })" :key="item.id" @click="handleClick(index)" v-for="(item, index) in lists") {{item.name}}
+      material-btn(:class="[$style.btn, $style.newList, isEditing ? $style.editing : null]" @click="handleEditing($event)" :tips="$t('view.list.lists_new_list_btn')")
+        svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 42 42' space='preserve')
+          use(xlink:href='#icon-addTo')
+        input.key-bind(:class="$style.newListInput" :value="newListName" type="text" :placeholder="$t('view.list.lists_new_list_input')" @keyup.enter="handleSaveList($event)" @blur="handleSaveList($event)")
+      span(:class="$style.btn" v-for="i in spaceNum")
+</template>
+
+<script>
+import { mapGetters, mapMutations } from 'vuex'
+export default {
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    musicList: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
+    bgClose: {
+      type: Boolean,
+      default: true,
+    },
+    excludeListId: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
+    listName: {
+      type: String,
+      default: '',
+    },
+    fromListId: {
+      type: String,
+      default: null,
+    },
+    isMove: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      isEditing: false,
+      newListName: '',
+    }
+  },
+  computed: {
+    ...mapGetters('list', ['defaultList', 'loveList', 'userList']),
+
+    lists() {
+      return [
+        this.defaultList,
+        this.loveList,
+        ...this.userList,
+      ].filter(l => l.id != this.excludeListId.includes(l.id))
+    },
+    spaceNum() {
+      return this.lists.length < 2 ? 0 : (3 - this.lists.length % 3 - 1)
+    },
+  },
+  methods: {
+    ...mapMutations('list', ['listAddMultiple', 'listMoveMultiple', 'createUserList']),
+    handleClick(index) {
+      this.isMove
+        ? this.listMoveMultiple({ fromId: this.fromListId, toId: this.lists[index].id, list: this.musicList })
+        : this.listAddMultiple({ id: this.lists[index].id, list: this.musicList })
+      this.$nextTick(() => {
+        this.handleClose(true)
+      })
+    },
+    handleClose(isSelect = false) {
+      this.$emit('close', isSelect)
+    },
+    handleEditing(event) {
+      if (this.isEditing) return
+      if (!this.newListName) this.newListName = this.listName
+      this.isEditing = true
+      this.$nextTick(() => event.currentTarget.querySelector('.' + this.$style.newListInput).focus())
+    },
+    handleSaveList(event) {
+      let name = event.target.value
+      this.newListName = event.target.value = ''
+      this.isEditing = false
+      if (!name) return
+      this.createUserList({ name })
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../../assets/styles/layout.less';
+
+.main {
+  // padding: 15px 0;
+  max-width: 530px;
+  min-width: 200px;
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: center;
+  min-height: 0;
+  // max-height: 100%;
+  // overflow: hidden;
+  h2 {
+    font-size: 13px;
+    color: @color-theme_2-font;
+    line-height: 1.3;
+    text-align: center;
+    padding: 15px;
+  }
+}
+
+.btn-content {
+  flex: auto;
+  max-height: 100%;
+  padding-right: 15px;
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: space-evenly;
+}
+
+.btn {
+  box-sizing: border-box;
+  margin-left: 15px;
+  margin-bottom: 15px;
+  height: 36px;
+  line-height: 36px;
+  padding: 0 10px !important;
+  width: 150px;
+  .mixin-ellipsis-1;
+}
+
+.newList {
+  border: 1px dashed @color-theme-hover;
+  background-color: @color-theme_2-background_2;
+  color: @color-theme-hover;
+  opacity: .7;
+
+  svg {
+    height: 18px;
+    margin-top: 9px;
+  }
+
+  &.editing {
+    opacity: 1;
+
+    svg {
+      display: none;
+    }
+    .newListInput {
+      display: block;
+    }
+  }
+}
+.newListInput {
+  width: 100%;
+  height: 34px;
+  border: none;
+  padding: 0;
+  line-height: 34px;
+  background: none;
+  outline: none;
+  font-size: 14px;
+  text-align: center;
+  font-family: inherit;
+  display: none;
+}
+
+each(@themes, {
+  :global(#container.@{value}) {
+    .main {
+      h2 {
+        color: ~'@{color-@{value}-theme_2-font}';
+      }
+    }
+    .newList {
+      border-color: ~'@{color-@{value}-theme-hover}';
+      color: ~'@{color-@{value}-theme-hover}';
+      background-color: ~'@{color-@{value}-theme_2-background_2}';
+    }
+  }
+})
+
+</style>
diff --git a/src/renderer/components/material/ListSortModal.vue b/src/renderer/components/material/ListSortModal.vue
new file mode 100644
index 00000000..79af530d
--- /dev/null
+++ b/src/renderer/components/material/ListSortModal.vue
@@ -0,0 +1,109 @@
+<template lang="pug">
+material-modal(:show="show" @close="handleClose")
+  main(:class="$style.main")
+    h2 {{selectedNum > 0 ? $t('material.list_sort_modal.title_multiple', { num: selectedNum }) : $t('material.list_sort_modal.title', { name: musicInfo ? musicInfo.name : '' })}}
+    material-input(:class="$style.input" type="number" v-model="sortNum" ref="input" :placeholder="$t('material.list_sort_modal.input_tip')" @keydown.native.enter="handleSubmit")
+    material-btn(:class="$style.btn" @click="handleSubmit") {{$t('material.list_sort_modal.btn_confirm')}}
+</template>
+
+<script>
+export default {
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    musicInfo: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+    selectedNum: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      sortNum: '',
+    }
+  },
+  watch: {
+    show(n) {
+      if (n) {
+        this.sortNum = ''
+        this.$nextTick(() => {
+          this.$refs.input.focus()
+        })
+      }
+    },
+  },
+  computed: {
+
+  },
+  methods: {
+    handleClose() {
+      this.$emit('close')
+    },
+    handleSubmit() {
+      let num = /^[1-9]\d*/.exec(this.sortNum)
+      num = num ? parseInt(num[0]) : ''
+      this.sortNum = num.toString()
+      if (this.sortNum == '') return
+      this.$emit('confirm', num)
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../../assets/styles/layout.less';
+
+.main {
+  padding: 0 15px;
+  max-width: 530px;
+  min-width: 320px;
+  display: flex;
+  flex-flow: column nowrap;
+  min-height: 0;
+  // max-height: 100%;
+  // overflow: hidden;
+  h2 {
+    font-size: 13px;
+    color: @color-theme_2-font;
+    line-height: 1.3;
+    // text-align: center;
+    padding: 15px 0 8px;
+  }
+}
+
+.input {
+  // width: 100%;
+  // height: 26px;
+  padding: 8px 8px;
+}
+.btn {
+  margin: 20px auto 15px;
+  // box-sizing: border-box;
+  // margin-left: 15px;
+  // margin-bottom: 15px;
+  // height: 36px;
+  // line-height: 36px;
+  // padding: 0 10px !important;
+  min-width: 100px;
+  // .mixin-ellipsis-1;
+}
+
+each(@themes, {
+  :global(#container.@{value}) {
+    .main {
+      h2 {
+        color: ~'@{color-@{value}-theme_2-font}';
+      }
+    }
+  }
+})
+
+</style>
diff --git a/src/renderer/components/material/Menu.vue b/src/renderer/components/material/Menu.vue
index 534cf82a..a48afd6e 100644
--- a/src/renderer/components/material/Menu.vue
+++ b/src/renderer/components/material/Menu.vue
@@ -138,10 +138,10 @@ export default {
   // will-change: transform;
   li {
     cursor: pointer;
-    min-width: 80px;
+    min-width: 90px;
     line-height: 34px;
     // color: @color-btn;
-    padding: 0 5px;
+    padding: 0 10px;
     text-align: center;
     outline: none;
     transition: @transition-theme;
diff --git a/src/renderer/components/material/XmVerifyModal.vue b/src/renderer/components/material/XmVerifyModal.vue
new file mode 100644
index 00000000..6a910c4c
--- /dev/null
+++ b/src/renderer/components/material/XmVerifyModal.vue
@@ -0,0 +1,50 @@
+<template lang="pug">
+material-modal(:show="show" :bg-close="bgClose" @close="handleClose")
+  main.ignore-to-rem(:class="$style.main")
+    h2 {{$t('material.xm_verify_modal.title')}}
+</template>
+
+<script>
+export default {
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    bgClose: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  methods: {
+    handleClose() {
+      this.$emit('close')
+    },
+  },
+}
+</script>
+
+
+<style lang="less" module>
+@import '../../assets/styles/layout.less';
+
+.main {
+  background: #fff !important;
+  &:global(.ignore-to-rem) {
+    padding: 15px;
+    width: 360px;
+    height: 330px;
+    h2 {
+      font-size: 16px;
+    }
+  }
+
+  h2 {
+    font-size: 13px;
+    color: @color-theme_2-font;
+    line-height: 1.3;
+    text-align: center;
+  }
+}
+
+</style>
diff --git a/src/renderer/lang/en-us/material/list_sort_modal.json b/src/renderer/lang/en-us/material/list_sort_modal.json
new file mode 100644
index 00000000..c767e46e
--- /dev/null
+++ b/src/renderer/lang/en-us/material/list_sort_modal.json
@@ -0,0 +1,6 @@
+{
+  "title": "Adjust the position of {name} to:",
+  "title_multiple": "Adjust the position of the selected {num} songs to:",
+  "input_tip": "Please input which position you want to adjust to",
+  "btn_confirm": "Confirm"
+}
diff --git a/src/renderer/lang/en-us/view/list.json b/src/renderer/lang/en-us/view/list.json
index 37809cf7..37d039d6 100644
--- a/src/renderer/lang/en-us/view/list.json
+++ b/src/renderer/lang/en-us/view/list.json
@@ -10,6 +10,7 @@
   "list_copy_name": "Copy name",
   "list_add_to": "Add to ...",
   "list_move_to": "Move to ...",
+  "list_sort": "Adjust position",
   "list_download": "Download",
   "list_remove": "Remove",
   "list_source_detail": "Song Page",
diff --git a/src/renderer/lang/zh-cn/material/list_sort_modal.json b/src/renderer/lang/zh-cn/material/list_sort_modal.json
new file mode 100644
index 00000000..457585b2
--- /dev/null
+++ b/src/renderer/lang/zh-cn/material/list_sort_modal.json
@@ -0,0 +1,6 @@
+{
+  "title": "将 {name} 的位置调整到：",
+  "title_multiple": "将已选的 {num} 首歌曲的位置调整到：",
+  "input_tip": "请输入要调整到第几个位置",
+  "btn_confirm": "确定"
+}
diff --git a/src/renderer/lang/zh-cn/view/list.json b/src/renderer/lang/zh-cn/view/list.json
index 87778d88..3fbbf6bb 100644
--- a/src/renderer/lang/zh-cn/view/list.json
+++ b/src/renderer/lang/zh-cn/view/list.json
@@ -11,6 +11,7 @@
   "list_source_detail": "歌曲详情页",
   "list_add_to": "添加到...",
   "list_move_to": "移动到...",
+  "list_sort": "调整位置",
   "list_download": "下载",
   "list_remove": "删除",
   "default_list": "试听列表",
diff --git a/src/renderer/lang/zh-tw/material/list_sort_modal.json b/src/renderer/lang/zh-tw/material/list_sort_modal.json
new file mode 100644
index 00000000..7e3ddd66
--- /dev/null
+++ b/src/renderer/lang/zh-tw/material/list_sort_modal.json
@@ -0,0 +1,6 @@
+{
+  "title": "將 {name} 的位置調整到：",
+  "title_multiple": "將已選的 {num} 首歌曲的位置調整到：",
+  "input_tip": "請輸入要調整到第幾個位置",
+  "btn_confirm": "確定"
+}
diff --git a/src/renderer/lang/zh-tw/view/list.json b/src/renderer/lang/zh-tw/view/list.json
index 1f218c54..68b7f9fe 100644
--- a/src/renderer/lang/zh-tw/view/list.json
+++ b/src/renderer/lang/zh-tw/view/list.json
@@ -10,6 +10,7 @@
   "list_copy_name": "複製歌曲名",
   "list_add_to": "添加到...",
   "list_move_to": "移動到...",
+  "list_sort": "調整位置",
   "list_download": "下載",
   "list_remove": "刪除",
   "list_source_detail": "歌曲詳情頁",
diff --git a/src/renderer/store/modules/list.js b/src/renderer/store/modules/list.js
index 9df804c3..ce6ce500 100644
--- a/src/renderer/store/modules/list.js
+++ b/src/renderer/store/modules/list.js
@@ -185,6 +185,12 @@ const mutations = {
   setListScroll(state, { id, location }) {
     if (allList[id]) allList[id].location = location
   },
+  sortList(state, { id, sortNum, musicInfos }) {
+    let targetList = allList[id]
+    this.commit('list/listRemoveMultiple', { id, list: musicInfos })
+
+    targetList.list.splice(sortNum - 1, 0, ...musicInfos)
+  },
 }
 
 export default {
diff --git a/src/renderer/views/List.vue b/src/renderer/views/List.vue
index df5a82e6..445b69e6 100644
--- a/src/renderer/views/List.vue
+++ b/src/renderer/views/List.vue
@@ -69,6 +69,7 @@
     material-menu(:menus="listsItemMenu" :location="listsData.menuLocation" item-name="name" :isShow="listsData.isShowItemMenu" @menu-click="handleListsItemMenuClick")
     material-menu(:menus="listItemMenu" :location="listMenu.menuLocation" item-name="name" :isShow="listMenu.isShowItemMenu" @menu-click="handleListItemMenuClick")
     material-search-list(:list="list" @action="handleMusicSearchAction" :visible="isVisibleMusicSearch")
+    material-list-sort-modal(:show="isShowListSortModal" :music-info="musicInfo" :selected-num="selectdListDetailData.length" @close="isShowListSortModal = false" @confirm="handleSortMusicInfo")
 </template>
 
 <script>
@@ -91,6 +92,7 @@ export default {
       delayShow: false,
       isShowListAdd: false,
       isShowListAddMultiple: false,
+      isShowListSortModal: false,
       delayTimeout: null,
       isToggleList: true,
       focusTarget: 'listDetail',
@@ -123,6 +125,7 @@ export default {
           copyName: true,
           addTo: true,
           moveTo: true,
+          sort: true,
           download: true,
           remove: true,
           sourceDetail: true,
@@ -229,6 +232,11 @@ export default {
           action: 'sourceDetail',
           disabled: !this.listMenu.itemMenuControl.sourceDetail,
         },
+        {
+          name: this.$t('view.list.list_sort'),
+          action: 'sort',
+          disabled: !this.listMenu.itemMenuControl.sort,
+        },
         {
           name: this.$t('view.list.list_add_to'),
           action: 'addTo',
@@ -329,6 +337,7 @@ export default {
       'removeUserList',
       'setListScroll',
       'setList',
+      'sortList',
     ]),
     ...mapActions('songList', ['getListDetailAll']),
     ...mapActions('download', ['createDownload', 'createDownloadMultiple']),
@@ -809,6 +818,20 @@ export default {
             })
           }
           break
+        case 'sort':
+          this.isShowListSortModal = true
+          this.musicInfo = this.list[index]
+          // if (this.selectdListDetailData.length) {
+          //   this.isShowDownloadMultiple = true
+          // } else {
+          //   minfo = this.list[index]
+          //   if (!this.assertApiSupport(minfo.source)) return
+          //   this.musicInfo = minfo
+          //   this.$nextTick(() => {
+          //     this.isShowDownload = true
+          //   })
+          // }
+          break
         case 'remove':
           if (this.selectdListDetailData.length) {
             this.listRemoveMultiple({ id: this.listId, list: this.selectdListDetailData })
@@ -854,11 +877,22 @@ export default {
       const targetListInfo = this.userList[index]
       const list = await this.fetchList(targetListInfo.id, targetListInfo.source, targetListInfo.sourceListId)
       // console.log(targetListInfo.list.length, list.length)
+      this.removeAllSelectListDetail()
       this.setList({
         ...targetListInfo,
         list,
       })
     },
+    handleSortMusicInfo(num) {
+      num = Math.min(num, this.list.length)
+      this.sortList({
+        id: this.listId,
+        sortNum: num,
+        musicInfos: this.selectdListDetailData.length ? [...this.selectdListDetailData] : [this.musicInfo],
+      })
+      this.removeAllSelectListDetail()
+      this.isShowListSortModal = false
+    },
   },
 }
 </script>

From 027466dfc2cff71678a50b5b8d84ab5f1e297742 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 19 Dec 2020 15:19:24 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index d758fc6e..ae012b8b 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,4 +1,4 @@
 ### 新增
 
-- 我的列表右键菜单新增列表排序功能，可调整单曲、多选后的歌曲的顺序
+- 我的列表右键菜单新增列表排序功能，可调整单曲、多选后的歌曲的顺序。注意：多选排序还将会按照选中歌曲时的顺序排序
 

From f00c6b1cb6727d673a257d900b25c40d82e25979 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 19 Dec 2020 15:39:33 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0Linux=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=AD=8C=E8=AF=8D=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FAQ.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FAQ.md b/FAQ.md
index 6d04931c..fb36f51b 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -98,7 +98,8 @@ Windows 7 未开启 Aero 效果时桌面歌词会有问题，详情看下面的
 
 ### Linux 系统下桌面歌词窗口异常
 
-目前在 Ubuntu 18.10 下第一次开启桌面歌词时歌词窗口会变白，需要关闭后再开启，
+`v1.2.1`以前的版本在 Ubuntu 18.10 下第一次开启桌面歌词时歌词窗口会变白，需要关闭后再开启，
+`v1.2.1`及之后的版本已修复该问题。
 
 其他 Linux 系统未测试，如有异常也是意料之中，目前不打算去处理 Linux 平台的桌面歌词问题。
 

From 06b453ebe7c6db51c1149ef910fc7f179844720e Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 23 Dec 2020 17:03:38 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=AD=8C=E6=9B=B2?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=A4=B1=E8=B4=A5FAQ?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FAQ.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/FAQ.md b/FAQ.md
index fb36f51b..9c17aaf2 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -103,6 +103,19 @@ Windows 7 未开启 Aero 效果时桌面歌词会有问题，详情看下面的
 
 其他 Linux 系统未测试，如有异常也是意料之中，目前不打算去处理 Linux 平台的桌面歌词问题。
 
+## 歌曲下载失败
+
+### 提示 `ENOENT: no such file or directory, mkdir`
+
+更换下载歌曲目录即可解决（一般是设置的歌曲下载目录没有读写入权限导致的）。
+
+### 提示 `请求异常` 或 `Fail`
+
+尝试更换网络，如切换到移动网络。
+
+### 其他错误
+
+按照前面的 "歌曲无法试听与下载" 方案解决。
 
 ## 软件安装包说明
 

From a58d65e8afbfeb6a5d94ec52f950f8a81b69ba65 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 24 Dec 2020 11:33:01 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E6=92=AD=E6=94=BE=E7=9A=84=E6=AD=8C=E6=9B=B2?=
 =?UTF-8?q?=E6=97=B6=E5=9C=A8=E9=9A=8F=E6=9C=BA=E6=92=AD=E6=94=BE=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E4=B8=8D=E6=8A=8A=E6=81=A2=E5=A4=8D=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E7=9A=84=E6=AD=8C=E6=9B=B2=E6=94=BE=E5=85=A5=E5=B7=B2?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E9=98=9F=E5=88=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                    | 3 +++
 src/renderer/components/core/Player.vue | 1 +
 2 files changed, 4 insertions(+)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index ae012b8b..195024ba 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -2,3 +2,6 @@
 
 - 我的列表右键菜单新增列表排序功能，可调整单曲、多选后的歌曲的顺序。注意：多选排序还将会按照选中歌曲时的顺序排序
 
+### 修复
+
+- 修复恢复上次播放的歌曲时在随机播放模式下不把恢复播放的歌曲放入已播放队列的问题（该问题会导致随机模式下会导致未播放完整个列表前就会再次随机到该歌曲，以及无法通过上一曲切回该歌曲）
diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue
index 21cab61f..44c24259 100644
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -264,6 +264,7 @@ export default {
         this.$nextTick(() => {
           this.sendProgressEvent(this.progress, 'paused')
         })
+        if (this.setting.player.togglePlayMethod == 'random') this.setPlayedList(musicInfo)
         window.restorePlayInfo = null
         return
       }

From 94c25b5dcb11c89acbc195471be021ca4a678291 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 24 Dec 2020 14:27:44 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=BC=B9=E7=AA=97=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/material/ListSortModal.vue     | 24 ++++++++++++++-----
 src/renderer/views/List.vue                   |  6 +++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/material/ListSortModal.vue b/src/renderer/components/material/ListSortModal.vue
index 79af530d..981ed4f5 100644
--- a/src/renderer/components/material/ListSortModal.vue
+++ b/src/renderer/components/material/ListSortModal.vue
@@ -2,8 +2,9 @@
 material-modal(:show="show" @close="handleClose")
   main(:class="$style.main")
     h2 {{selectedNum > 0 ? $t('material.list_sort_modal.title_multiple', { num: selectedNum }) : $t('material.list_sort_modal.title', { name: musicInfo ? musicInfo.name : '' })}}
-    material-input(:class="$style.input" type="number" v-model="sortNum" ref="input" :placeholder="$t('material.list_sort_modal.input_tip')" @keydown.native.enter="handleSubmit")
-    material-btn(:class="$style.btn" @click="handleSubmit") {{$t('material.list_sort_modal.btn_confirm')}}
+    material-input(:class="$style.input" type="number" v-model="sortNum" ref="input" @blur.native="verify" :placeholder="$t('material.list_sort_modal.input_tip')" @keydown.native.enter="handleSubmit")
+    div(:class="$style.footer")
+      material-btn(:class="$style.btn" @click="handleSubmit") {{$t('material.list_sort_modal.btn_confirm')}}
 </template>
 
 <script>
@@ -46,10 +47,14 @@ export default {
     handleClose() {
       this.$emit('close')
     },
-    handleSubmit() {
+    verify() {
       let num = /^[1-9]\d*/.exec(this.sortNum)
       num = num ? parseInt(num[0]) : ''
       this.sortNum = num.toString()
+      return num
+    },
+    handleSubmit() {
+      let num = this.verify()
       if (this.sortNum == '') return
       this.$emit('confirm', num)
     },
@@ -64,7 +69,7 @@ export default {
 .main {
   padding: 0 15px;
   max-width: 530px;
-  min-width: 320px;
+  min-width: 280px;
   display: flex;
   flex-flow: column nowrap;
   min-height: 0;
@@ -74,6 +79,7 @@ export default {
     font-size: 13px;
     color: @color-theme_2-font;
     line-height: 1.3;
+    word-break: break-all;
     // text-align: center;
     padding: 15px 0 8px;
   }
@@ -84,16 +90,22 @@ export default {
   // height: 26px;
   padding: 8px 8px;
 }
+.footer {
+  margin: 20px 0 15px auto;
+}
 .btn {
-  margin: 20px auto 15px;
   // box-sizing: border-box;
   // margin-left: 15px;
   // margin-bottom: 15px;
   // height: 36px;
   // line-height: 36px;
   // padding: 0 10px !important;
-  min-width: 100px;
+  min-width: 70px;
   // .mixin-ellipsis-1;
+
+  +.btn {
+    margin-left: 10px;
+  }
 }
 
 each(@themes, {
diff --git a/src/renderer/views/List.vue b/src/renderer/views/List.vue
index 445b69e6..9e2e888c 100644
--- a/src/renderer/views/List.vue
+++ b/src/renderer/views/List.vue
@@ -288,6 +288,12 @@ export default {
         this.handleDelayShow()
       })
     })
+    this.isShowDownload = false
+    this.isShowDownloadMultiple = false
+    this.isShowListAdd = false
+    this.isShowListAddMultiple = false
+    this.isShowListSortModal = false
+    this.listMenu.isShowItemMenu = false
     next()
   },
   // mounted() {

From 30e939c354477c8dea09d19fac11f0d8e2488164 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 24 Dec 2020 14:27:57 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0electron=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=88=B09.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 26 +++++++++++++-------------
 package.json      |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f207b79a..ad704f7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "1.5.0-beta",
+  "version": "1.6.0-beta",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -7239,9 +7239,9 @@
       }
     },
     "electron": {
-      "version": "9.3.3",
-      "resolved": "https://registry.npm.taobao.org/electron/download/electron-9.3.3.tgz",
-      "integrity": "sha1-maZhnV32j5dpel0dgu86imP83zY=",
+      "version": "9.4.0",
+      "resolved": "https://registry.npm.taobao.org/electron/download/electron-9.4.0.tgz?cache=0&sync_timestamp=1608583696623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-9.4.0.tgz",
+      "integrity": "sha1-w8YH41mCJt26r/i6vN/6i7IhCTY=",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -7250,9 +7250,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "12.19.8",
-          "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.19.8.tgz?cache=0&sync_timestamp=1607590769174&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.19.8.tgz",
-          "integrity": "sha1-79bRqQUlUZ/GCMnbFsinj3aTqXg=",
+          "version": "12.19.9",
+          "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.19.9.tgz?cache=0&sync_timestamp=1608047797419&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.19.9.tgz",
+          "integrity": "sha1-mQrWh62LJu9tzDSk9pwz1AyVtnk=",
           "dev": true
         }
       }
@@ -8686,7 +8686,7 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&sync_timestamp=1607566533140&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&sync_timestamp=1600502894812&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
           "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
           "dev": true,
           "requires": {
@@ -8695,7 +8695,7 @@
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&sync_timestamp=1607433842694&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
@@ -12103,9 +12103,9 @@
       "dev": true
     },
     "node-id3": {
-      "version": "0.1.21",
-      "resolved": "https://registry.npm.taobao.org/node-id3/download/node-id3-0.1.21.tgz",
-      "integrity": "sha1-bp+8x68J9lEUkJoR90otcLVFu/M=",
+      "version": "0.1.19",
+      "resolved": "https://registry.npm.taobao.org/node-id3/download/node-id3-0.1.19.tgz",
+      "integrity": "sha1-cQAMuCna3HYQAKSBAV5T88ydqto=",
       "requires": {
         "iconv-lite": "0.5.1"
       },
@@ -14770,7 +14770,7 @@
       "dependencies": {
         "type-fest": {
           "version": "0.13.1",
-          "resolved": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.13.1.tgz?cache=0&sync_timestamp=1606468844109&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftype-fest%2Fdownload%2Ftype-fest-0.13.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.13.1.tgz?cache=0&sync_timestamp=1602623859603&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftype-fest%2Fdownload%2Ftype-fest-0.13.1.tgz",
           "integrity": "sha1-AXLLW86AsL1ULqNI21DH4hg02TQ=",
           "dev": true,
           "optional": true
diff --git a/package.json b/package.json
index 85f0e190..ea143e7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "1.6.0",
+  "version": "1.6.0-beta",
   "description": "一个免费的音乐下载助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",
@@ -178,7 +178,7 @@
     "cross-env": "^7.0.3",
     "css-loader": "^4.3.0",
     "del": "^6.0.0",
-    "electron": "^9.3.3",
+    "electron": "^9.4.0",
     "electron-builder": "^22.9.1",
     "electron-debug": "^3.1.0",
     "electron-devtools-installer": "^3.1.1",

From 162fea6e2833edc92a2744d765e0d6e2aef68a35 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 24 Dec 2020 17:17:54 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/material/listAddModal.vue      | 201 ------------------
 .../material/listAddMultipleModal.vue         | 195 -----------------
 .../components/material/xmVerifyModal.vue     |  50 -----
 3 files changed, 446 deletions(-)
 delete mode 100644 src/renderer/components/material/listAddModal.vue
 delete mode 100644 src/renderer/components/material/listAddMultipleModal.vue
 delete mode 100644 src/renderer/components/material/xmVerifyModal.vue

diff --git a/src/renderer/components/material/listAddModal.vue b/src/renderer/components/material/listAddModal.vue
deleted file mode 100644
index c42c8de3..00000000
--- a/src/renderer/components/material/listAddModal.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template lang="pug">
-material-modal(:show="show" :bg-close="bgClose" @close="handleClose")
-  main(:class="$style.main")
-    h2
-      | {{$t('material.list_add_modal.' + (isMove ? 'title_first_move' : 'title_first_add'))}}&nbsp;
-      span(:class="$style.name") {{this.musicInfo && `${musicInfo.name}`}}
-      | &nbsp;{{$t('material.list_add_modal.title_last')}}
-    div.scroll(:class="$style.btnContent")
-      material-btn(:class="$style.btn" :tips="$t('material.list_add_modal.btn_title', { name: item.name })" :key="item.id" @click="handleClick(index)" v-for="(item, index) in lists") {{item.name}}
-      material-btn(:class="[$style.btn, $style.newList, isEditing ? $style.editing : null]" @click="handleEditing($event)" :tips="$t('view.list.lists_new_list_btn')")
-        svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 42 42' space='preserve')
-          use(xlink:href='#icon-addTo')
-        input.key-bind(:class="$style.newListInput" :value="newListName" type="text" :placeholder="$t('view.list.lists_new_list_input')" @keyup.enter="handleSaveList($event)" @blur="handleSaveList($event)")
-      span(:class="$style.btn" v-for="i in spaceNum")
-</template>
-
-<script>
-import { mapGetters, mapMutations } from 'vuex'
-export default {
-  props: {
-    show: {
-      type: Boolean,
-      default: false,
-    },
-    musicInfo: {
-      type: Object,
-    },
-    bgClose: {
-      type: Boolean,
-      default: true,
-    },
-    excludeListId: {
-      type: Array,
-      default() {
-        return []
-      },
-    },
-    listName: {
-      type: String,
-      default: '',
-    },
-    fromListId: {
-      type: String,
-      default: null,
-    },
-    isMove: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      isEditing: false,
-      newListName: '',
-    }
-  },
-  computed: {
-    ...mapGetters('list', ['defaultList', 'loveList', 'userList']),
-    lists() {
-      return [
-        this.defaultList,
-        this.loveList,
-        ...this.userList,
-      ].filter(l => l.id != this.excludeListId.includes(l.id))
-    },
-    spaceNum() {
-      return this.lists.length < 2 ? 0 : (3 - this.lists.length % 3 - 1)
-    },
-  },
-  methods: {
-    ...mapMutations('list', ['listAdd', 'listMove', 'createUserList']),
-    handleClick(index) {
-      this.isMove
-        ? this.listMove({ fromId: this.fromListId, toId: this.lists[index].id, musicInfo: this.musicInfo })
-        : this.listAdd({ id: this.lists[index].id, musicInfo: this.musicInfo })
-      this.$nextTick(() => {
-        this.handleClose()
-      })
-    },
-    handleClose() {
-      this.$emit('close')
-    },
-    handleEditing(event) {
-      if (this.isEditing) return
-      if (!this.newListName) this.newListName = this.listName
-      this.isEditing = true
-      this.$nextTick(() => event.currentTarget.querySelector('.' + this.$style.newListInput).focus())
-    },
-    handleSaveList(event) {
-      let name = event.target.value
-      this.newListName = event.target.value = ''
-      this.isEditing = false
-      if (!name) return
-      this.createUserList({ name })
-    },
-  },
-}
-</script>
-
-
-<style lang="less" module>
-@import '../../assets/styles/layout.less';
-
-.main {
-  // padding: 15px 0;
-  max-width: 530px;
-  min-width: 200px;
-  display: flex;
-  flex-flow: column nowrap;
-  justify-content: center;
-  min-height: 0;
-  // max-height: 100%;
-  // overflow: hidden;
-  h2 {
-    font-size: 13px;
-    color: @color-theme_2-font;
-    line-height: 1.3;
-    text-align: center;
-    padding: 15px;
-  }
-}
-
-.name {
-  color: @color-theme;
-}
-
-.btn-content {
-  flex: auto;
-  max-height: 100%;
-  padding-right: 15px;
-  display: flex;
-  flex-flow: row wrap;
-  justify-content: space-evenly;
-}
-
-.btn {
-  box-sizing: border-box;
-  margin-left: 15px;
-  margin-bottom: 15px;
-  height: 36px;
-  line-height: 36px;
-  padding: 0 10px !important;
-  width: 150px;
-  .mixin-ellipsis-1;
-}
-
-.newList {
-  border: 1px dashed @color-theme-hover;
-  background-color: @color-theme_2-background_2;
-  color: @color-theme-hover;
-  opacity: .7;
-
-  svg {
-    height: 18px;
-    margin-top: 9px;
-  }
-
-  &.editing {
-    opacity: 1;
-
-    svg {
-      display: none;
-    }
-    .newListInput {
-      display: block;
-    }
-  }
-}
-.newListInput {
-  width: 100%;
-  height: 34px;
-  border: none;
-  padding: 0;
-  line-height: 34px;
-  background: none;
-  outline: none;
-  font-size: 14px;
-  text-align: center;
-  font-family: inherit;
-  display: none;
-}
-
-each(@themes, {
-  :global(#container.@{value}) {
-    .main {
-      h2 {
-        color: ~'@{color-@{value}-theme_2-font}';
-      }
-    }
-    .name {
-      color: ~'@{color-@{value}-theme}';
-    }
-    .newList {
-      border-color: ~'@{color-@{value}-theme-hover}';
-      color: ~'@{color-@{value}-theme-hover}';
-      background-color: ~'@{color-@{value}-theme_2-background_2}';
-    }
-  }
-})
-
-</style>
diff --git a/src/renderer/components/material/listAddMultipleModal.vue b/src/renderer/components/material/listAddMultipleModal.vue
deleted file mode 100644
index 40a9e734..00000000
--- a/src/renderer/components/material/listAddMultipleModal.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template lang="pug">
-material-modal(:show="show" :bg-close="bgClose" @close="handleClose")
-  main(:class="$style.main")
-    h2 {{$t('material.list_add_multiple_modal.' + (isMove ? 'title_move' : 'title_add'), { num: musicList.length })}}
-    div.scroll(:class="$style.btnContent")
-      material-btn(:class="$style.btn" :tips="$t('material.list_add_multiple_modal.btn_title', { name: item.name })" :key="item.id" @click="handleClick(index)" v-for="(item, index) in lists") {{item.name}}
-      material-btn(:class="[$style.btn, $style.newList, isEditing ? $style.editing : null]" @click="handleEditing($event)" :tips="$t('view.list.lists_new_list_btn')")
-        svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' viewBox='0 0 42 42' space='preserve')
-          use(xlink:href='#icon-addTo')
-        input.key-bind(:class="$style.newListInput" :value="newListName" type="text" :placeholder="$t('view.list.lists_new_list_input')" @keyup.enter="handleSaveList($event)" @blur="handleSaveList($event)")
-      span(:class="$style.btn" v-for="i in spaceNum")
-</template>
-
-<script>
-import { mapGetters, mapMutations } from 'vuex'
-export default {
-  props: {
-    show: {
-      type: Boolean,
-      default: false,
-    },
-    musicList: {
-      type: Array,
-      default() {
-        return []
-      },
-    },
-    bgClose: {
-      type: Boolean,
-      default: true,
-    },
-    excludeListId: {
-      type: Array,
-      default() {
-        return []
-      },
-    },
-    listName: {
-      type: String,
-      default: '',
-    },
-    fromListId: {
-      type: String,
-      default: null,
-    },
-    isMove: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      isEditing: false,
-      newListName: '',
-    }
-  },
-  computed: {
-    ...mapGetters('list', ['defaultList', 'loveList', 'userList']),
-
-    lists() {
-      return [
-        this.defaultList,
-        this.loveList,
-        ...this.userList,
-      ].filter(l => l.id != this.excludeListId.includes(l.id))
-    },
-    spaceNum() {
-      return this.lists.length < 2 ? 0 : (3 - this.lists.length % 3 - 1)
-    },
-  },
-  methods: {
-    ...mapMutations('list', ['listAddMultiple', 'listMoveMultiple', 'createUserList']),
-    handleClick(index) {
-      this.isMove
-        ? this.listMoveMultiple({ fromId: this.fromListId, toId: this.lists[index].id, list: this.musicList })
-        : this.listAddMultiple({ id: this.lists[index].id, list: this.musicList })
-      this.$nextTick(() => {
-        this.handleClose(true)
-      })
-    },
-    handleClose(isSelect = false) {
-      this.$emit('close', isSelect)
-    },
-    handleEditing(event) {
-      if (this.isEditing) return
-      if (!this.newListName) this.newListName = this.listName
-      this.isEditing = true
-      this.$nextTick(() => event.currentTarget.querySelector('.' + this.$style.newListInput).focus())
-    },
-    handleSaveList(event) {
-      let name = event.target.value
-      this.newListName = event.target.value = ''
-      this.isEditing = false
-      if (!name) return
-      this.createUserList({ name })
-    },
-  },
-}
-</script>
-
-
-<style lang="less" module>
-@import '../../assets/styles/layout.less';
-
-.main {
-  // padding: 15px 0;
-  max-width: 530px;
-  min-width: 200px;
-  display: flex;
-  flex-flow: column nowrap;
-  justify-content: center;
-  min-height: 0;
-  // max-height: 100%;
-  // overflow: hidden;
-  h2 {
-    font-size: 13px;
-    color: @color-theme_2-font;
-    line-height: 1.3;
-    text-align: center;
-    padding: 15px;
-  }
-}
-
-.btn-content {
-  flex: auto;
-  max-height: 100%;
-  padding-right: 15px;
-  display: flex;
-  flex-flow: row wrap;
-  justify-content: space-evenly;
-}
-
-.btn {
-  box-sizing: border-box;
-  margin-left: 15px;
-  margin-bottom: 15px;
-  height: 36px;
-  line-height: 36px;
-  padding: 0 10px !important;
-  width: 150px;
-  .mixin-ellipsis-1;
-}
-
-.newList {
-  border: 1px dashed @color-theme-hover;
-  background-color: @color-theme_2-background_2;
-  color: @color-theme-hover;
-  opacity: .7;
-
-  svg {
-    height: 18px;
-    margin-top: 9px;
-  }
-
-  &.editing {
-    opacity: 1;
-
-    svg {
-      display: none;
-    }
-    .newListInput {
-      display: block;
-    }
-  }
-}
-.newListInput {
-  width: 100%;
-  height: 34px;
-  border: none;
-  padding: 0;
-  line-height: 34px;
-  background: none;
-  outline: none;
-  font-size: 14px;
-  text-align: center;
-  font-family: inherit;
-  display: none;
-}
-
-each(@themes, {
-  :global(#container.@{value}) {
-    .main {
-      h2 {
-        color: ~'@{color-@{value}-theme_2-font}';
-      }
-    }
-    .newList {
-      border-color: ~'@{color-@{value}-theme-hover}';
-      color: ~'@{color-@{value}-theme-hover}';
-      background-color: ~'@{color-@{value}-theme_2-background_2}';
-    }
-  }
-})
-
-</style>
diff --git a/src/renderer/components/material/xmVerifyModal.vue b/src/renderer/components/material/xmVerifyModal.vue
deleted file mode 100644
index 6a910c4c..00000000
--- a/src/renderer/components/material/xmVerifyModal.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template lang="pug">
-material-modal(:show="show" :bg-close="bgClose" @close="handleClose")
-  main.ignore-to-rem(:class="$style.main")
-    h2 {{$t('material.xm_verify_modal.title')}}
-</template>
-
-<script>
-export default {
-  props: {
-    show: {
-      type: Boolean,
-      default: false,
-    },
-    bgClose: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  methods: {
-    handleClose() {
-      this.$emit('close')
-    },
-  },
-}
-</script>
-
-
-<style lang="less" module>
-@import '../../assets/styles/layout.less';
-
-.main {
-  background: #fff !important;
-  &:global(.ignore-to-rem) {
-    padding: 15px;
-    width: 360px;
-    height: 330px;
-    h2 {
-      font-size: 16px;
-    }
-  }
-
-  h2 {
-    font-size: 13px;
-    color: @color-theme_2-font;
-    line-height: 1.3;
-    text-align: center;
-  }
-}
-
-</style>

From ad2acc2a16f354f3e63e0db6319b989f25e2bdb6 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 24 Dec 2020 17:20:27 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 195024ba..1f305c55 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -5,3 +5,4 @@
 ### 修复
 
 - 修复恢复上次播放的歌曲时在随机播放模式下不把恢复播放的歌曲放入已播放队列的问题（该问题会导致随机模式下会导致未播放完整个列表前就会再次随机到该歌曲，以及无法通过上一曲切回该歌曲）
+- 修复音乐嵌入的封面在 Mac 系统无法显示的问题