diff --git a/package-lock.json b/package-lock.json index 1a0ac63d..0095e4f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "0.15.0", + "version": "0.16.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2704,8 +2704,7 @@ "@types/node": { "version": "10.14.12", "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-10.14.12.tgz?cache=0&sync_timestamp=1563323059673&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-10.14.12.tgz", - "integrity": "sha1-DuwxVaRubE2x8nw+WIogX3Z9Yi8=", - "dev": true + "integrity": "sha1-DuwxVaRubE2x8nw+WIogX3Z9Yi8=" }, "@types/q": { "version": "1.5.2", @@ -2714,9 +2713,12 @@ "dev": true }, "@types/semver": { - "version": "6.2.0", - "resolved": "https://registry.npm.taobao.org/@types/semver/download/@types/semver-6.2.0.tgz?cache=0&sync_timestamp=1572034910183&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fsemver%2Fdownload%2F%40types%2Fsemver-6.2.0.tgz", - "integrity": "sha1-1ojVdEANlsWwEUlocFNm9DGDHho=" + "version": "7.1.0", + "resolved": "https://registry.npm.taobao.org/@types/semver/download/@types/semver-7.1.0.tgz?cache=0&sync_timestamp=1580871311074&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fsemver%2Fdownload%2F%40types%2Fsemver-7.1.0.tgz", + "integrity": "sha1-yMYw1MGM0ya+/3dASIdZb5ZAhAg=", + "requires": { + "@types/node": "*" + } }, "@vue/component-compiler-utils": { "version": "3.1.1", @@ -4831,9 +4833,9 @@ } }, "builder-util-runtime": { - "version": "8.4.0", - "resolved": "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.4.0.tgz?cache=0&sync_timestamp=1574846206242&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util-runtime%2Fdownload%2Fbuilder-util-runtime-8.4.0.tgz", - "integrity": "sha1-MWP//AeOa4891bbrEqg0VXNZBoI=", + "version": "8.6.0", + "resolved": "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.6.0.tgz", + "integrity": "sha1-twB8MBJtqakOmZMhKNKSLIwXhkk=", "requires": { "debug": "^4.1.1", "sax": "^1.2.4" @@ -5046,9 +5048,9 @@ } }, "cfonts": { - "version": "2.6.1", - "resolved": "https://registry.npm.taobao.org/cfonts/download/cfonts-2.6.1.tgz", - "integrity": "sha1-uErzJQD/JxsKY0HeQ6I9RkrRun8=", + "version": "2.7.0", + "resolved": "https://registry.npm.taobao.org/cfonts/download/cfonts-2.7.0.tgz", + "integrity": "sha1-tFGO2mUUJH/8yPZv+Ch9TaqIVd4=", "dev": true, "requires": { "chalk": "^3.0.0", @@ -7036,24 +7038,29 @@ "dev": true }, "electron-updater": { - "version": "4.2.0", - "resolved": "https://registry.npm.taobao.org/electron-updater/download/electron-updater-4.2.0.tgz", - "integrity": "sha1-+ez8ZX9l6tc31Cue/s9ijTdWtVA=", + "version": "4.2.2", + "resolved": "https://registry.npm.taobao.org/electron-updater/download/electron-updater-4.2.2.tgz", + "integrity": "sha1-V+EGv/rRb3Gx/6OWilKhtxyBR+Y=", "requires": { - "@types/semver": "^6.0.2", - "builder-util-runtime": "8.4.0", + "@types/semver": "^7.1.0", + "builder-util-runtime": "8.6.0", "fs-extra": "^8.1.0", "js-yaml": "^3.13.1", "lazy-val": "^1.0.4", "lodash.isequal": "^4.5.0", - "pako": "^1.0.10", - "semver": "^6.3.0" + "pako": "^1.0.11", + "semver": "^7.1.3" }, "dependencies": { + "pako": { + "version": "1.0.11", + "resolved": "https://registry.npm.taobao.org/pako/download/pako-1.0.11.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpako%2Fdownload%2Fpako-1.0.11.tgz", + "integrity": "sha1-bJWZ00DVTf05RjgCUqNXBaa5kr8=" + }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1565627380363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz", - "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=" + "version": "7.1.3", + "resolved": "https://registry.npm.taobao.org/semver/download/semver-7.1.3.tgz?cache=0&sync_timestamp=1581458063470&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.1.3.tgz", + "integrity": "sha1-5DRc5zBxxT8zZEXPwZ77HDEd8qY=" } } }, @@ -12264,7 +12271,8 @@ "pako": { "version": "1.0.10", "resolved": "https://registry.npm.taobao.org/pako/download/pako-1.0.10.tgz", - "integrity": "sha1-Qyi621CGpCaqkPVBl31JVdpclzI=" + "integrity": "sha1-Qyi621CGpCaqkPVBl31JVdpclzI=", + "dev": true }, "parallel-transform": { "version": "1.1.0", @@ -16084,6 +16092,11 @@ "integrity": "sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=", "dev": true }, + "vue-i18n": { + "version": "8.15.3", + "resolved": "https://registry.npm.taobao.org/vue-i18n/download/vue-i18n-8.15.3.tgz?cache=0&sync_timestamp=1576684265396&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-i18n%2Fdownload%2Fvue-i18n-8.15.3.tgz", + "integrity": "sha1-n5R4Atm3NPy5LiznJNplTy+fwPQ=" + }, "vue-loader": { "version": "15.9.0", "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.9.0.tgz?cache=0&sync_timestamp=1581493732642&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-15.9.0.tgz", diff --git a/package.json b/package.json index f0e4273d..b75ac6da 100644 --- a/package.json +++ b/package.json @@ -151,7 +151,7 @@ "babel-minify-webpack-plugin": "^0.3.1", "babel-preset-minify": "^0.5.1", "browserslist": "^4.8.7", - "cfonts": "^2.6.1", + "cfonts": "^2.7.0", "chalk": "^3.0.0", "changelog-parser": "^2.8.0", "copy-webpack-plugin": "^5.1.1", @@ -206,7 +206,7 @@ "dnscache": "^1.0.2", "electron-log": "^4.0.6", "electron-store": "^5.1.0", - "electron-updater": "^4.2.0", + "electron-updater": "^4.2.2", "flac-metadata": "^0.1.1", "js-htmlencode": "^0.3.0", "lrc-file-parser": "^1.0.0", @@ -215,6 +215,7 @@ "request": "^2.88.2", "vue": "^2.6.11", "vue-electron": "^1.0.6", + "vue-i18n": "^8.15.3", "vue-router": "^3.1.5", "vuex": "^3.1.2", "vuex-electron": "^1.0.3", diff --git a/publish/changeLog.md b/publish/changeLog.md index 421f4cfc..2f189f75 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,25 +1,3 @@ ### 新增 -- 允许选中列表内歌曲名、歌手名、专辑名内的文字,选中后可使用键盘快捷键进行复制 -- 新增在列表可选内容区域**鼠标右击**时自动复制列表已选文字的功能 -- 新增在搜索框**鼠标右击**时自动粘贴剪贴板的文本到搜索框中 -- 任务下载失败时将显示搜索按钮,方便在其他源搜索该歌曲 - -### 优化 - -- 优化木叶之村主题翻页器背景颜色 -- 优化各个主题音质标签颜色 -- 优化其他一些界面细节及用户交互效果 - -### 修复 - -- 修复启用透明窗口鼠标不穿透的bug -- 修复大窗口时设置的音乐来源选项不换行的问题 -- 修复某些情况下暂停任务会自动开始任务的问题 -- 修复移除暂停、错误的任务时不删除未下载完成的文件的问题 -- 修复酷狗源歌单热门标签歌单列表无法加载问题 -- 修复QQ源歌单热门标签歌单列表无法加载问题 - -### 其他 - -- 更新electron到 8.0.1 +- 新增多语言设置,目前软件内置了简体中文、繁体中文、英语三种语言,欢迎提交PR翻译更多语言! diff --git a/src/common/config.js b/src/common/config.js index 7afc83f3..f0afd072 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -2,21 +2,21 @@ module.exports = { windowSizeList: [ { id: 1, - name: '小', + name: 'small', width: 920, height: 590, tabList: '645px', }, { id: 2, - name: '中', + name: 'medium', width: 1012, height: 650, tabList: '719px', }, { id: 3, - name: '大', + name: 'big', width: 1104, height: 708, tabList: '792px', diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 123dba4a..9ce01883 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -55,6 +55,7 @@ export default { }), }, created() { + this.$i18n.locale = this.setting.langId this.saveSetting = throttle(n => { window.electronStore_config.set('setting', n) }) diff --git a/src/renderer/components/core/Aside.vue b/src/renderer/components/core/Aside.vue index c91d667f..07146070 100644 --- a/src/renderer/components/core/Aside.vue +++ b/src/renderer/components/core/Aside.vue @@ -6,25 +6,25 @@ div(:class="$style.aside") div(:class="$style.menu") dl - dt 在线音乐 + dt {{$t('core.aside.online_music')}} dd - router-link(:active-class="$style.active" to="search") 搜索 + router-link(:active-class="$style.active" to="search") {{$t('core.aside.search')}} dd - router-link(:active-class="$style.active" to="songList") 歌单 + router-link(:active-class="$style.active" to="songList") {{$t('core.aside.song_list')}} dd - router-link(:active-class="$style.active" to="leaderboard") 排行榜 + router-link(:active-class="$style.active" to="leaderboard") {{$t('core.aside.leaderboard')}} dl - dt 我的音乐 + dt {{$t('core.aside.my_music')}} dd - router-link(:active-class="($route.query.id === defaultList.id || $route.query.id == '') ? $style.active : ''" :to="`list?id=${defaultList.id || ''}`") {{defaultList.name}} - router-link(:active-class="$route.query.id === loveList.id ? $style.active : ''" :to="`list?id=${loveList.id}`") {{loveList.name}} + router-link(:active-class="($route.query.id === defaultList.id || $route.query.id == '') ? $style.active : ''" :to="`list?id=${defaultList.id || ''}`") {{$t('core.aside.default_list')}} + router-link(:active-class="$route.query.id === loveList.id ? $style.active : ''" :to="`list?id=${loveList.id}`") {{$t('core.aside.love_list')}} router-link(:active-class="$route.query.id === item.id ? $style.active : ''" v-for="item in userList" :to="`list?id=${item._id}`" :key="item._id") {{item.name}} dl - dt 其他 + dt {{$t('core.aside.other')}} dd - router-link(:active-class="$style.active" to="download") 下载管理 + router-link(:active-class="$style.active" to="download") {{$t('core.aside.download')}} dd - router-link(:active-class="$style.active" to="setting") 设置 + router-link(:active-class="$style.active" to="setting") {{$t('core.aside.setting')}} diff --git a/src/renderer/views/SongList.vue b/src/renderer/views/SongList.vue index 8911b4cd..0e97ac26 100644 --- a/src/renderer/views/SongList.vue +++ b/src/renderer/views/SongList.vue @@ -15,7 +15,7 @@ //- material-btn(:class="$style.closeDetailButton" :disabled="detailLoading" @click="playSongListDetail") 播放 //- |   material-btn(:class="$style.closeDetailButton" @click="hideListDetail") 返回 - material-song-list(v-model="selectdData" @action="handleSongListAction" :source="source" :page="listDetail.page" :limit="listDetail.limit" :total="listDetail.total" :list="listDetail.list") + material-song-list(v-model="selectdData" @action="handleSongListAction" :source="source" :page="listDetail.page" :limit="listDetail.limit" :total="listDetail.total" :noItem="$t('material.song_list.loding_list')" :list="listDetail.list") transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut") div(:class="$style.songListContainer" v-if="!isVisibleListDetail") div(:class="$style.header") @@ -44,7 +44,7 @@ use(xlink:href='#icon-right') transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut") div(v-show="!listData.list.length" :class="$style.noitem") - p 列表加载中... + p {{$t('material.song_list.loding_list')}} material-download-modal(:show="isShowDownload" :musicInfo="musicInfo" @select="handleAddDownload" @close="isShowDownload = false") material-download-multiple-modal(:show="isShowDownloadMultiple" :list="selectdData" @select="handleAddDownloadMultiple" @close="isShowDownloadMultiple = false") material-list-add-modal(:show="isShowListAdd" :musicInfo="musicInfo" @close="isShowListAdd = false")