diff --git a/publish/changeLog.md b/publish/changeLog.md index 7a583d97..47de8749 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,4 +1,4 @@ -特别说明一下,Scheme URL其实是支持Linux系统的,但好像需要deb之类的安装包创建出`.desktop`文件才行。 +特别说明:Scheme URL其实是支持Linux系统的,但好像需要deb之类的安装包创建出`.desktop`文件才行。 ### 新增 @@ -16,7 +16,7 @@ - 修复Linux无法全屏的问题 - 修复播放下载列表的歌曲时,使用Windows任务栏缩略图工具栏控制按钮的收藏按钮收藏歌曲时的异常问题 -- 修复不启用热门搜索时,搜索历史不显示的问题 +- 修复启用搜索历史但不启用热门搜索时,搜索历史不显示的问题 ### 变更 diff --git a/src/renderer/store/modules/leaderboard.js b/src/renderer/store/modules/leaderboard.js index ef25b2d8..3dd6bc69 100644 --- a/src/renderer/store/modules/leaderboard.js +++ b/src/renderer/store/modules/leaderboard.js @@ -30,6 +30,9 @@ const getters = { sources(state, getters, rootState, { sourceNames }) { return sources.map(item => ({ id: item.id, name: sourceNames[item.id] })) }, + sourceIds() { + return sources.map(item => item.id) + }, boards(state) { return state.boards }, diff --git a/src/renderer/store/modules/songList.js b/src/renderer/store/modules/songList.js index a86e043b..31514254 100644 --- a/src/renderer/store/modules/songList.js +++ b/src/renderer/store/modules/songList.js @@ -52,7 +52,7 @@ sources.forEach(source => { // getters const getters = { sourceInfo(state, getters, rootState, { sourceNames }) { - return { sources: sources.map(item => ({ id: item.id, name: sourceNames[item.id] })), sortList } + return { sourceIds: sources.map(item => item.id), sources: sources.map(item => ({ id: item.id, name: sourceNames[item.id] })), sortList } }, tags: state => state.tags, isVisibleListDetail: state => state.isVisibleListDetail, diff --git a/src/renderer/views/Leaderboard.vue b/src/renderer/views/Leaderboard.vue index 01e0d6ea..7c7f2e5c 100644 --- a/src/renderer/views/Leaderboard.vue +++ b/src/renderer/views/Leaderboard.vue @@ -78,7 +78,7 @@ export default { }, computed: { ...mapGetters(['setting']), - ...mapGetters('leaderboard', ['sources', 'boards', 'info']), + ...mapGetters('leaderboard', ['sources', 'sourceIds', 'boards', 'info']), boardList() { return this.source && this.boards[this.source] ? this.boards[this.source] : [] }, @@ -129,6 +129,7 @@ export default { }, mounted() { this.source = this.setting.leaderboard.source + if (!this.sourceIds.includes(this.source)) this.source = this.sourceIds[0] this.tabId = this.setting.leaderboard.tabId this.page = this.listInfo.page }, diff --git a/src/renderer/views/songList/SongList.vue b/src/renderer/views/songList/SongList.vue index 4b3e0472..a2ce214e 100644 --- a/src/renderer/views/songList/SongList.vue +++ b/src/renderer/views/songList/SongList.vue @@ -97,7 +97,7 @@ export default { case 'tx': case 'mg': case 'kg': - case 'xm': + // case 'xm': list.push({ name: this.$t('songlist__open_list', { name: this.sourceInfo.sources.find(s => s.id == this.source).name }), id: 'importSongList', @@ -164,6 +164,7 @@ export default { }, mounted() { this.source = this.setting.songList.source + if (!this.sourceInfo.sourceIds.includes(this.source)) this.source = this.sourceInfo.sourceIds[0] this.isToggleSource = true this.tagInfo = this.setting.songList.tagInfo this.sortId = this.setting.songList.sortId