ion/Melo
1
0
Fork 0
Code Issues Pull Requests Actions 11 Packages Projects Releases Wiki Activity

更新到0.1.4版本

Browse Source
This commit is contained in:
lyswhut
2019-08-18 20:36:17 +08:00
parent ba8991a034
commit a580cedcb1
22 changed files with 306 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/views/Leaderboard.vue
+5 -2
View File
@@ -25,7 +25,7 @@
td.break(style="width: 20%;") {{item.singer}}
td.break(style="width: 25%;") {{item.albumName}}
td(style="width: 18%;")
material-list-buttons(:index="index" :search-btn="true" :play-btn="item.source == 'kw'" :download-btn="item.source == 'kw'" :remove-btn="false" @btn-click="handleBtnClick")
material-list-buttons(:index="index" :search-btn="true" :play-btn="item.source == 'kw' || (!isAPITemp && item.source == 'tx')" :download-btn="item.source == 'kw' || (!isAPITemp && item.source == 'tx')" :remove-btn="false" @btn-click="handleBtnClick")
//- button.btn-info(type='button' v-if="item._types['128k'] || item._types['192k'] || item._types['320k'] || item._types.flac" @click.stop='openDownloadModal(index)') 下载
//- button.btn-secondary(type='button' v-if="item._types['128k'] || item._types['192k'] || item._types['320k']" @click.stop='testPlay(index)') 试听
//- button.btn-success(type='button' v-if="(item._types['128k'] || item._types['192k'] || item._types['320k']) && userInfo" @click.stop='showListModal(index)') ＋
@@ -59,6 +59,9 @@ export default {
types() {
return this.source ? this.sourceInfo.sourceList[this.source] : []
},
isAPITemp() {
return this.setting.apiSource == 'temp'
},
},
watch: {
tabId(n, o) {
@@ -94,7 +97,7 @@ export default {
this.clickIndex = index
return
}
(this.source == 'kw') ? this.testPlay(index) : this.handleSearch(index)
(this.source == 'kw' || (!this.isAPITemp && this.source == 'tx')) ? this.testPlay(index) : this.handleSearch(index)
this.clickTime = 0
this.clickIndex = -1
},
src/renderer/views/List.vue
+10 -1
View File
@@ -14,7 +14,8 @@
div.scroll(:class="$style.tbody")
table
tbody
tr(v-for='(item, index) in list' :key='item.songmid' @click="handleDoubleClick(index)" :class="isPlayList && playIndex === index ? $style.active : ''")
tr(v-for='(item, index) in list' :key='item.songmid'
@click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', isAPITemp && item.source != 'kw' ? $style.disabled : '']")
td.break(style="width: 25%;") {{item.name}}
//- span.badge.badge-light(v-if="item._types['128k']") 128K
//- span.badge.badge-light(v-if="item._types['192k']") 192K
@@ -61,6 +62,9 @@ export default {
? this.defaultList.list
: this.userList.find(l => l._id == this.$route.query.id) || []
},
isAPITemp() {
return this.setting.apiSource == 'temp'
},
},
// beforeRouteUpdate(to, from, next) {
// // if (to.query.id === undefined) return
@@ -105,6 +109,7 @@ export default {
this.clickIndex = -1
},
testPlay(index) {
if (this.isAPITemp && this.list[index].source != 'kw') return
this.setList({ list: this.list, listId: 'test', index })
},
handleRemove(index) {
@@ -178,6 +183,10 @@ export default {
}
}
.disabled {
opacity: .5;
}
each(@themes, {
:global(#container.@{value}) {
.tbody {
src/renderer/views/Search.vue
+2 -1
View File
@@ -7,7 +7,8 @@
thead
tr
th.nobreak.center(style="width: 37px;")
material-checkbox(id="search_select_all" v-model="isSelectAll" @change="handleSelectAllData" :indeterminate="isIndeterminate")
material-checkbox(id="search_select_all" v-model="isSelectAll" @change="handleSelectAllData"
:indeterminate="isIndeterminate" :title="isSelectAll && !isIndeterminate ? '全不选' : '全选'")
th.nobreak(style="width: 25%;") 歌曲名
th.nobreak(style="width: 20%;") 歌手
th.nobreak(style="width: 25%;") 专辑
src/renderer/views/Setting.vue
+37 -10
View File
@@ -15,11 +15,17 @@ div.scroll(:class="$style.setting")
div
material-checkbox(id="setting_animate" v-model="current_setting.randomAnimate" label="是否启用")
dd(title='选择音乐来源')
h3 音乐来源
div
material-checkbox(v-for="item in apiSources" :id="`setting_api_source_${item.id}`" @change="handleAPISourceChange(item.id)" :class="$style.gapTop"
need v-model="current_setting.apiSource" :value="item.id" :label="item.label" :key="item.id")
dt 播放设置
dd(title="都不选时播放完当前歌曲就停止播放")
h3 歌曲切换方式
div
material-checkbox(:id="`setting_player_togglePlay_${item.value}`" :class="$style.gap" :value="item.value" :key="item.value"
material-checkbox(:id="`setting_player_togglePlay_${item.value}`" :class="$style.gapLeft" :value="item.value" :key="item.value"
v-model="current_setting.player.togglePlayMethod" v-for="item in togglePlayMethods" :label="item.name")
dd(title='启用时将优先播放320K品质的歌曲')
h3 优先播放高品质音乐
@@ -37,7 +43,7 @@ div.scroll(:class="$style.setting")
dd(title='下载歌曲时的命名方式')
h3 文件命名方式
div
material-checkbox(:id="`setting_download_musicName_${item.value}`" :class="$style.gap" name="setting_download_musicName" :value="item.value" :key="item.value" need
material-checkbox(:id="`setting_download_musicName_${item.value}`" :class="$style.gapLeft" name="setting_download_musicName" :value="item.value" :key="item.value" need
v-model="current_setting.download.fileName" v-for="item in musicNames" :label="item.name")
dt 列表设置
dd(title='播放列表是否显示专辑栏')
@@ -48,15 +54,15 @@ div.scroll(:class="$style.setting")
dd
h3 部分数据
div
material-btn(:class="[$style.btn, $style.gap]" min @click="handleImportPlayList") 导入列表
material-btn(:class="[$style.btn, $style.gap]" min @click="handleExportPlayList") 导出列表
material-btn(:class="[$style.btn, $style.gap]" min @click="handleImportSetting") 导入设置
material-btn(:class="[$style.btn, $style.gap]" min @click="handleExportSetting") 导出设置
material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleImportPlayList") 导入列表
material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleExportPlayList") 导出列表
material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleImportSetting") 导入设置
material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleExportSetting") 导出设置
dd
h3 所有数据（设置与试听列表）
div
material-btn(:class="[$style.btn, $style.gap]" min @click="handleImportAllData") 导入
material-btn(:class="[$style.btn, $style.gap]" min @click="handleExportAllData") 导出
material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleImportAllData") 导入
material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleExportAllData") 导出
dt 关于洛雪音乐
dd
p.small
@@ -113,6 +119,7 @@ export default {
themeId: 0,
sourceId: 0,
randomAnimate: true,
apiSource: 'messoer',
},
togglePlayMethods: [
{
@@ -132,6 +139,16 @@ export default {
value: 'singleLoop',
},
],
apiSources: [
{
id: 'messoer',
label: '由 messoer 提供的接口（推荐，软件的所有功能都可用）',
},
{
id: 'temp',
label: '临时接口（软件的某些功能将不可用，建议在messoer不可用时再切换到本选项）',
},
],
musicNames: [
{
name: '歌名 - 歌手',
@@ -310,6 +327,11 @@ export default {
handleOpenUrl(url) {
openUrl(url)
},
handleAPISourceChange(id) {
this.$nextTick(() => {
window.globalObj.apiSource = id
})
},
},
}
</script>
@@ -357,11 +379,16 @@ export default {
}
.gap {
+ .gap {
.gap-left {
+ .gap-left {
margin-left: 20px;
}
}
.gap-top {
+ .gap-top {
margin-top: 10px;
}
}
.theme {
display: flex;