From 8e5b144f005cfe63d30235e24536e8dcdda70470 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 10 Feb 2022 12:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9C=E5=8F=8C=E5=87=BB?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=87=8C=E7=9A=84=E6=AD=8C=E6=9B=B2=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2=E5=88=B0=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=92=AD=E6=94=BE=E2=80=9D=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/common/defaultSetting.js | 3 ++- src/lang/en-us.json | 1 + src/lang/zh-cn.json | 1 + src/lang/zh-tw.json | 1 + .../components/material/OnlineList/index.vue | 10 ++++++---- .../components/material/OnlineList/usePlay.js | 8 ++++++-- src/renderer/views/Leaderboard.vue | 14 +++++++++++--- .../views/setting/components/SettingList.vue | 2 ++ src/renderer/views/songList/SongList.vue | 8 ++++---- 10 files changed, 35 insertions(+), 14 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index d8426554..febf8b95 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,6 +1,7 @@ ### 优化 - 过滤tx源某些不支持播放的歌曲，解决播放此类内容会导致意外的问题 +- 新增“双击列表里的歌曲时自动切换到当前列表播放”设置，此功能仅对歌单、排行榜有效，默认关闭 ### 修复 diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js index 306a30f4..965c9686 100644 --- a/src/common/defaultSetting.js +++ b/src/common/defaultSetting.js @@ -2,7 +2,7 @@ const path = require('path') const os = require('os') const defaultSetting = { - version: '1.0.48', + version: '1.0.49', player: { togglePlayMethod: 'listLoop', highQuality: false, @@ -36,6 +36,7 @@ const defaultSetting = { }, }, list: { + isClickPlayList: false, isShowAlbumName: true, isShowSource: true, isSaveScrollLocation: true, diff --git a/src/lang/en-us.json b/src/lang/en-us.json index efa873e6..cd171e66 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -284,6 +284,7 @@ "setting__list_add_music_location_type": "Position when adding a song to the list", "setting__list_add_music_location_type_bottom": "Bottom", "setting__list_add_music_location_type_top": "Top", + "setting__list_click_action": "Automatically switch to the current list when double-clicking a song in the list (only valid for playlists and rankings)", "setting__list_scroll": "Remember the position of the scroll bar of the playlist (only valid for my music classification)", "setting__list_source": "Show song source (only valid for my music category)", "setting__network": "Network", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index 0a4f33b4..de13f05a 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -284,6 +284,7 @@ "setting__list_add_music_location_type": "添加歌曲到列表时的位置", "setting__list_add_music_location_type_bottom": "底部", "setting__list_add_music_location_type_top": "顶部", + "setting__list_click_action": "双击列表里的歌曲时自动切换到当前列表播放（仅对歌单、排行榜有效）", "setting__list_scroll": "记住播放列表滚动条位置（仅对我的音乐分类有效）", "setting__list_source": "显示歌曲源（仅对我的音乐分类有效）", "setting__network": "网络设置", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index bd2f2660..6bbd1c33 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -284,6 +284,7 @@ "setting__list_add_music_location_type": "添加歌曲到列表時的位置", "setting__list_add_music_location_type_bottom": "底部", "setting__list_add_music_location_type_top": "頂部", + "setting__list_click_action": "雙擊列表裡的歌曲時自動切換到當前列表播放（僅對歌單、排行榜有效）", "setting__list_scroll": "記住播放列表滾動條位置（僅對我的音樂分類有效）", "setting__list_source": "顯示歌曲源（僅對我的音樂分類有效）", "setting__network": "網絡設置", diff --git a/src/renderer/components/material/OnlineList/index.vue b/src/renderer/components/material/OnlineList/index.vue index 1fd225f6..29ee173e 100644 --- a/src/renderer/components/material/OnlineList/index.vue +++ b/src/renderer/components/material/OnlineList/index.vue @@ -50,7 +50,7 @@ div(:class="$style.songList") diff --git a/src/renderer/views/setting/components/SettingList.vue b/src/renderer/views/setting/components/SettingList.vue index ce4416fe..3e39325e 100644 --- a/src/renderer/views/setting/components/SettingList.vue +++ b/src/renderer/views/setting/components/SettingList.vue @@ -5,6 +5,8 @@ dd base-checkbox(id="setting_list_showSource_enable" v-model="currentStting.list.isShowSource" :label="$t('setting__list_source')") .gap-top base-checkbox(id="setting_list_scroll_enable" v-model="currentStting.list.isSaveScrollLocation" :label="$t('setting__list_scroll')") + .gap-top + base-checkbox(id="setting_list_clickAction_enable" v-model="currentStting.list.isClickPlayList" :label="$t('setting__list_click_action')") dd(:tips="$t('setting__basic_sourcename_title')") h3#list_addMusicLocationType {{$t('setting__list_add_music_location_type')}} div diff --git a/src/renderer/views/songList/SongList.vue b/src/renderer/views/songList/SongList.vue index 1350566e..de422a63 100644 --- a/src/renderer/views/songList/SongList.vue +++ b/src/renderer/views/songList/SongList.vue @@ -14,7 +14,7 @@ div(:class="$style.container") base-btn(:class="$style.headerRightBtn" :disabled="detailLoading" @click="playSongListDetail") {{$t('list__play')}} base-btn(:class="$style.headerRightBtn" :disabled="detailLoading" @click="addSongListDetail") {{$t('list__collect')}} base-btn(:class="$style.headerRightBtn" @click="hideListDetail") {{$t('back')}} - material-online-list(ref="songList" @toggle-page="handleToggleListDetailPage" :page="listDetail.page" :limit="listDetail.limit" :total="listDetail.total" + material-online-list(ref="songList" @play-list="playSongListDetail" @toggle-page="handleToggleListDetailPage" :page="listDetail.page" :limit="listDetail.limit" :total="listDetail.total" :list="listDetail.list" :noItem="isGetDetailFailed ? $t('list__load_failed') : $t('list__loading')") transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut") div(:class="$style.songListContainer" v-show="!isVisibleListDetail") @@ -315,14 +315,14 @@ export default { sourceListId: this.listDetail.id, }) }, - async playSongListDetail() { + async playSongListDetail(index = 0) { if (!this.listDetail.info.name) return const id = `${this.listDetail.source}__${this.listDetail.id}` let isPlayingList = false if (this.listDetail.list?.length) { this.setTempList({ list: [...this.listDetail.list], - index: 0, + index, id, }) isPlayingList = true @@ -339,7 +339,7 @@ export default { } else { this.setTempList({ list, - index: 0, + index, id, }) }