From 843e453b2123f94fdf75b2ee1e9857444614a13b Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Mon, 7 Oct 2019 22:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84=E9=9F=B3?=
 =?UTF-8?q?=E4=B9=90=E5=88=97=E8=A1=A8=E6=AD=8C=E6=9B=B2=E6=BA=90=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md           |  1 +
 src/renderer/utils/index.js    |  3 ++-
 src/renderer/views/List.vue    | 26 +++++++++++++++++++++++++-
 src/renderer/views/Setting.vue |  5 +++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index b4ce8b20..032709f4 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -6,6 +6,7 @@
 - 新增咪咕源搜索
 - 新增咪咕源歌单
 - 新增咪咕源排行榜
+- 新增我的音乐列表歌曲源显示，默认关闭，可到**设置-列表设置**开启
 
 #### 优化
 
diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js
index 1800de46..938c78bc 100644
--- a/src/renderer/utils/index.js
+++ b/src/renderer/utils/index.js
@@ -164,7 +164,7 @@ export const isChildren = (parent, children) => {
  * @param {*} setting
  */
 export const updateSetting = setting => {
-  const defaultVersion = '1.0.11'
+  const defaultVersion = '1.0.12'
   const defaultSetting = {
     version: defaultVersion,
     player: {
@@ -175,6 +175,7 @@ export const updateSetting = setting => {
     },
     list: {
       isShowAlbumName: true,
+      isShowSource: false,
       scroll: {
         enable: true,
         locations: {},
diff --git a/src/renderer/views/List.vue b/src/renderer/views/List.vue
index b8f7d956..04a49e37 100644
--- a/src/renderer/views/List.vue
+++ b/src/renderer/views/List.vue
@@ -21,7 +21,9 @@
               @click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', (isAPITemp && item.source != 'kw') || item.source == 'wy' ? $style.disabled : '']")
               td.nobreak.center(style="width: 37px;" @click.stop)
                   material-checkbox(:id="index.toString()" v-model="selectdData" :value="item")
-              td.break(style="width: 25%;") {{item.name}}
+              td.break(style="width: 25%;")
+                | {{item.name}}
+                span(:class="$style.labelSource" v-if="isShowSource") {{item.source}}
                 //- span.badge.badge-light(v-if="item._types['128k']") 128K
                 //- span.badge.badge-light(v-if="item._types['192k']") 192K
                 //- span.badge.badge-secondary(v-if="item._types['320k']") 320K
@@ -104,6 +106,9 @@ export default {
     excludeListId() {
       return [this.listId]
     },
+    isShowSource() {
+      return this.setting.list.isShowSource
+    },
   },
   watch: {
     selectdData(n) {
@@ -279,6 +284,14 @@ export default {
       if (isSelect) this.resetSelect()
       this.isShowListAddMultiple = false
     },
+    getSource(source) {
+      switch (source) {
+        case 'kw':
+          return '酷我'
+        default:
+          break
+      }
+    },
     // handleScroll(e) {
     //   console.log(e.target.scrollTop)
     // },
@@ -328,6 +341,14 @@ export default {
   }
 }
 
+.labelSource {
+  color: @color-theme;
+  padding: 5px;
+  font-size: .8em;
+  line-height: 1;
+  opacity: .75;
+}
+
 .disabled {
   opacity: .5;
 }
@@ -355,6 +376,9 @@ each(@themes, {
         }
       }
     }
+    .labelSource {
+      color: ~'@{color-@{value}-theme}';
+    }
     .no-item {
       p {
         color: ~'@{color-@{value}-theme_2-font-label}';
diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue
index a75f3b1a..77ed1503 100644
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -36,6 +36,10 @@ div.scroll(:class="$style.setting")
       div
         material-checkbox(id="setting_player_showTaskProgess" v-model="current_setting.player.isShowTaskProgess" label="是否启用")
     dt 列表设置
+    dd(title='是否显示歌曲源')
+      h3 是否显示歌曲源（仅对我的音乐分类有效）
+      div
+        material-checkbox(id="setting_list_showSource_enable" v-model="current_setting.list.isShowSource" label="是否显示")
     dd(title='是否恢复播放列表滚动条位置')
       h3 恢复列表滚动位置（仅对我的音乐分类有效）
       div
@@ -197,6 +201,7 @@ export default {
         },
         list: {
           isShowAlbumName: true,
+          isShowSource: true,
           scroll: {
             enable: true,
             locations: {},