From 093bfd26a3a3d01f322936c8bfa811845cb2ae50 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 6 Jan 2021 15:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=88=97=E8=A1=A8=E5=8F=B3?= =?UTF-8?q?=E9=94=AE=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=AD=8C=E6=9B=B2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/renderer/components/core/Player.vue | 6 ++-- src/renderer/lang/en-us/view/list.json | 1 + src/renderer/lang/zh-cn/view/list.json | 1 + src/renderer/lang/zh-tw/view/list.json | 1 + src/renderer/views/List.vue | 45 ++++++++++++++++++------- 6 files changed, 39 insertions(+), 16 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 792f4dfe..eaf6d780 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -5,6 +5,7 @@ - 添加鼠标指向歌曲封面的提示（对于进度条左边的歌曲封面，你可能不知道的操作->右击在“我的列表”定位当前播放的歌曲） - 隐藏播放详情页按钮添加快速隐藏详情页提示（你可能不知道的操作->在播放详情页内的任意非窗口可拖动区域右键双击可以快速隐藏详情页） - 添加桌面歌词字体、透明度调整按钮微调提示（你可能不知道的操作->对于字体、透明度可右击微调） +- 我的列表右键菜单添加搜索当前歌曲功能 ### 修复 diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index f068bdf6..debac354 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -469,7 +469,7 @@ export default { }, async play() { console.log('play', this.playIndex) - this.checkDelayNextTimeout() + this.clearDelayNextTimeout() let targetSong = this.targetSong = this.list[this.playIndex] if (this.setting.player.togglePlayMethod == 'random') this.setPlayedList(targetSong) this.retryNum = 0 @@ -506,7 +506,7 @@ export default { album: this.musicInfo.album, }) }, - checkDelayNextTimeout() { + clearDelayNextTimeout() { // console.log(this.delayNextTimeout) if (this.delayNextTimeout) { clearTimeout(this.delayNextTimeout) @@ -514,7 +514,7 @@ export default { } }, addDelayNextTimeout() { - this.checkDelayNextTimeout() + this.clearDelayNextTimeout() this.delayNextTimeout = setTimeout(() => { this.delayNextTimeout = null this.handleNext() diff --git a/src/renderer/lang/en-us/view/list.json b/src/renderer/lang/en-us/view/list.json index 37d039d6..0bb795de 100644 --- a/src/renderer/lang/en-us/view/list.json +++ b/src/renderer/lang/en-us/view/list.json @@ -12,6 +12,7 @@ "list_move_to": "Move to ...", "list_sort": "Adjust position", "list_download": "Download", + "list_search": "Search", "list_remove": "Remove", "list_source_detail": "Song Page", "default_list": "Recently Played", diff --git a/src/renderer/lang/zh-cn/view/list.json b/src/renderer/lang/zh-cn/view/list.json index 3fbbf6bb..ae8507eb 100644 --- a/src/renderer/lang/zh-cn/view/list.json +++ b/src/renderer/lang/zh-cn/view/list.json @@ -13,6 +13,7 @@ "list_move_to": "移动到...", "list_sort": "调整位置", "list_download": "下载", + "list_search": "搜索", "list_remove": "删除", "default_list": "试听列表", "love_list": "收藏", diff --git a/src/renderer/lang/zh-tw/view/list.json b/src/renderer/lang/zh-tw/view/list.json index 68b7f9fe..fbdf37f9 100644 --- a/src/renderer/lang/zh-tw/view/list.json +++ b/src/renderer/lang/zh-tw/view/list.json @@ -12,6 +12,7 @@ "list_move_to": "移動到...", "list_sort": "調整位置", "list_download": "下載", + "list_search": "搜索", "list_remove": "刪除", "list_source_detail": "歌曲詳情頁", "default_list": "試聽列表", diff --git a/src/renderer/views/List.vue b/src/renderer/views/List.vue index 9e2e888c..b875cbaf 100644 --- a/src/renderer/views/List.vue +++ b/src/renderer/views/List.vue @@ -127,6 +127,7 @@ export default { moveTo: true, sort: true, download: true, + search: true, remove: true, sourceDetail: true, }, @@ -222,6 +223,21 @@ export default { action: 'download', disabled: !this.listMenu.itemMenuControl.download, }, + { + name: this.$t('view.list.list_add_to'), + action: 'addTo', + disabled: !this.listMenu.itemMenuControl.addTo, + }, + { + name: this.$t('view.list.list_move_to'), + action: 'moveTo', + disabled: !this.listMenu.itemMenuControl.moveTo, + }, + { + name: this.$t('view.list.list_sort'), + action: 'sort', + disabled: !this.listMenu.itemMenuControl.sort, + }, { name: this.$t('view.list.list_copy_name'), action: 'copyName', @@ -233,19 +249,9 @@ export default { 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', - disabled: !this.listMenu.itemMenuControl.addTo, - }, - { - name: this.$t('view.list.list_move_to'), - action: 'moveTo', - disabled: !this.listMenu.itemMenuControl.moveTo, + name: this.$t('view.list.list_search'), + action: 'search', + disabled: !this.listMenu.itemMenuControl.search, }, { name: this.$t('view.list.list_remove'), @@ -653,6 +659,7 @@ export default { return assertApiSupport(source) }, handleContainerClick(event) { + if (!this.$refs.dom_lists) return let isFocusList = event.target == this.$refs.dom_lists || this.$refs.dom_lists.contains(event.target) this.focusTarget = isFocusList ? 'list' : 'listDetail' }, @@ -838,6 +845,10 @@ export default { // }) // } break + case 'search': + minfo = this.list[index] + this.handleSearch(minfo) + break case 'remove': if (this.selectdListDetailData.length) { this.listRemoveMultiple({ id: this.listId, list: this.selectdListDetailData }) @@ -899,6 +910,14 @@ export default { this.removeAllSelectListDetail() this.isShowListSortModal = false }, + handleSearch(musicInfo) { + this.$router.push({ + path: 'search', + query: { + text: `${musicInfo.name} ${musicInfo.singer}`, + }, + }) + }, }, }