更新依赖包到最新，发布0.5.3版本

CHANGELOG.md

@@ -6,6 +6,37 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [0.5.3](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.2...v0.5.3) - 2019-09-09
+
+### 优化
+
+- 更新所有依赖包到最新
+
+### 修复
+
+- 修复试听酷狗源的音乐仍然获取320k音质导致获取失败的Bug
+
+## [0.5.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.1...v0.5.2) - 2019-09-09
+
+### 新增
+
+- 新增强迫症设置-离开搜索界面时是否清空搜索框
+- 设置-关于板块新增常见问题链接
+- 歌单左上角的分类按钮添加一个**向下图标**，方便识别该按钮为下拉框（该按钮可选择歌单类型，请自行尝试）
+
+### 优化
+
+- 略微优化最小化按钮字符
+- 优化试听列表的加载体验，当歌曲数过多时列表将延迟加载
+
+### 修复
+
+- 修复下载管理的一些Bug
+
+### 移除
+
+- 因接口失效，移除网易云音源，酷狗音源仅支持播放128k音质
+
 ## [0.5.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.5.0...v0.5.1) - 2019-09-05
 
 ### 新增

README.md

@@ -44,19 +44,10 @@
 - Mac OS
 - Linux
 
-注意：win7需要开启**透明效果**软件才可使用
-
 软件变化请查看：[更新日志](https://github.com/lyswhut/lx-music-desktop/blob/master/CHANGELOG.md)<br>
 软件下载请转到：[发布页面](https://github.com/lyswhut/lx-music-desktop/releases)<br>
-或者到网盘下载（网盘内有MAC、windows版）：`https://www.lanzous.com/b906260/` 密码：`glqw`
-
-#### 关于软件更新
-
-软件启动时若发现新版本时会自动从本仓库下载安装包，下载完毕会弹窗提示更新。<br>
-若下载未完成时软件被关闭，下次启动软件会再次自动下载。<br>
-目前暂未添加跳过更新某个版本的功能。<br>
-注意：**绿色版**的软件更新功能**不可用**，为了能及时地获取更新，建议使用安装版！！<br>
-注意：**Mac版**、**Linux deb**版不支持自动更新！
+或者到网盘下载（网盘内有MAC、windows版）：`https://www.lanzous.com/b906260/` 密码：`glqw`<br>
+使用常见问题请转至：[常见问题](https://github.com/lyswhut/lx-music-desktop#常见问题)
 
 #### TODO
 
@@ -83,6 +74,29 @@ npm run pack
 
 <p><a href="https://github.com/lyswhut/lx-music-desktop"><img width="100%" src="https://github.com/lyswhut/lx-music-desktop/blob/master/doc/images/app.png" alt="lx-music UI"></a></p>
 
+### 常见问题
+
+#### 歌曲无法试听与下载
+
+该问题解决顺序如下：
+
+1. 尝试更新到最新版本
+2. 尝试切换其他歌曲（或直接搜索该歌曲），若全部歌曲都无法试听与下载则进行下一步
+3. 尝试切换网络（比如切到移动网络）
+4. 若还不行请到这个链接查看详情：<https://github.com/lyswhut/lx-music-desktop/issues/5>
+
+#### Windows 7 下界面异常
+
+当 win7 没有开启**透明效果**时界面将会显示异常，开启方法请自行百度
+
+#### 软件更新
+
+软件启动时若发现新版本时会自动从本仓库下载安装包，下载完毕会弹窗提示更新。<br>
+若下载未完成时软件被关闭，下次启动软件会再次自动下载。<br>
+若还是更新失败，可能是无法访问GitHub导致的，这时需要手动更新，即下载最新安装包直接覆盖安装即可。<br>
+注意：**绿色版**的软件更新功能**不可用**，为了能及时地获取更新，建议使用安装版！！<br>
+注意：**Mac版**、**Linux deb**版不支持自动更新！
+
 ### 致谢
 
 感谢 [@messoer](https://github.com/messoer) 曾经提供的部分音乐API！
@@ -91,7 +105,8 @@ npm run pack
 
 本项目**不开发或者破解直接获取音频数据**的功能，所有音频数据均来自**第三方接口**！<br>
 本软件仅用于**测试 `electron 6.x` 在各种系统上的兼容性**及用于**对比各大音乐平台歌单、排行榜等数据列表的差异性**，使用本软件产生的**任何涉及版权相关的数据**请于**24小时内删除**。<br>
-使用本软件所造成的的后果由使用者承担！
+本软件仅用于学习交流使用，禁止用于商业用途，使用本软件所造成的的后果由使用者承担！<br>
+若对此有疑问请 mail to: lyswhut@qq.com
 
 ### 许可证
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "一个免费的音乐下载助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",
@@ -134,41 +134,41 @@
   },
   "homepage": "https://github.com/lyswhut/lx-music-desktop#readme",
   "devDependencies": {
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.6.0",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/polyfill": "^7.4.4",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/polyfill": "^7.6.0",
+    "@babel/preset-env": "^7.6.0",
     "autoprefixer": "^9.6.1",
-    "babel-eslint": "^10.0.2",
+    "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
     "babel-minify-webpack-plugin": "^0.3.1",
-    "babel-preset-minify": "^0.5.0",
-    "cfonts": "^2.4.4",
+    "babel-preset-minify": "^0.5.1",
+    "cfonts": "^2.4.5",
     "chalk": "^2.4.2",
     "changelog-parser": "^2.8.0",
     "copy-webpack-plugin": "^5.0.4",
     "core-js": "^3.2.1",
-    "cos-nodejs-sdk-v5": "^2.5.11",
-    "cross-env": "^5.2.0",
+    "cos-nodejs-sdk-v5": "^2.5.12",
+    "cross-env": "^5.2.1",
     "css-loader": "^3.2.0",
-    "del": "^3.0.0",
-    "electron": "^6.0.2",
+    "del": "^5.1.0",
+    "electron": "^6.0.7",
     "electron-builder": "^21.2.0",
     "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^2.2.4",
-    "eslint": "^6.1.0",
-    "eslint-config-standard": "^13.0.1",
+    "eslint": "^6.3.0",
+    "eslint-config-standard": "^14.1.0",
     "eslint-formatter-friendly": "^7.0.0",
-    "eslint-loader": "^2.2.1",
+    "eslint-loader": "^3.0.0",
     "eslint-plugin-html": "^6.0.0",
     "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-node": "^9.1.0",
+    "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.0",
+    "eslint-plugin-standard": "^4.0.1",
     "file-loader": "^4.2.0",
     "friendly-errors-webpack-plugin": "^1.7.0",
     "html-webpack-plugin": "^3.2.0",
-    "less": "^3.9.0",
+    "less": "^3.10.3",
     "less-loader": "^5.0.0",
     "markdown-it": "^9.1.0",
     "mini-css-extract-plugin": "^0.8.0",
@@ -180,18 +180,18 @@
     "pug-plain-loader": "^1.0.0",
     "raw-loader": "^3.1.0",
     "rimraf": "^3.0.0",
-    "stylus": "^0.54.5",
+    "stylus": "^0.54.7",
     "stylus-loader": "^3.0.2",
-    "terser-webpack-plugin": "^1.4.1",
+    "terser-webpack-plugin": "^2.0.1",
     "url-loader": "^2.1.0",
     "vue-loader": "^15.7.1",
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.6.10",
-    "webpack": "^4.39.2",
-    "webpack-cli": "^3.3.6",
+    "webpack": "^4.39.3",
+    "webpack-cli": "^3.3.8",
     "webpack-dev-server": "^3.8.0",
     "webpack-hot-middleware": "^2.25.0",
-    "webpack-merge": "^4.2.1"
+    "webpack-merge": "^4.2.2"
   },
   "dependencies": {
     "axios": "^0.19.0",
@@ -202,12 +202,12 @@
     "flac-metadata": "^0.1.1",
     "js-htmlencode": "^0.3.0",
     "lrc-file-parser": "^0.1.12",
-    "node-downloader-helper": "^1.0.10",
+    "node-downloader-helper": "^1.0.11",
     "node-id3": "^0.1.11",
     "request": "^2.88.0",
     "vue": "^2.6.10",
     "vue-electron": "^1.0.6",
-    "vue-router": "^3.1.2",
+    "vue-router": "^3.1.3",
     "vuex": "^3.1.1",
     "vuex-electron": "^1.0.3",
     "vuex-router-sync": "^5.0.0"

publish/changeLog.md

@@ -1,9 +1,7 @@
-### 新增
+### 优化
 
-- 新增右上角最小化/关闭按钮鼠标滑过符号
-- 新增下载列表定位文件按钮
+- 更新所有依赖包到最新
 
 ### 修复
 
-- 修复百度源歌单全部分类无法加载的问题
-- 修复更新弹窗无法弹出的问题
+- 修复试听酷狗源的音乐仍然获取320k音质导致获取失败的Bug

publish/version.json

@@ -1,7 +1,15 @@
 {
-  "version": "0.5.1",
-  "desc": "<h3>新增</h3>\n<ul>\n<li>新增右上角最小化/关闭按钮鼠标滑过符号</li>\n<li>新增下载列表定位文件按钮</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复百度源歌单全部分类无法加载的问题</li>\n<li>修复更新弹窗无法弹出的问题</li>\n</ul>\n",
+  "version": "0.5.3",
+  "desc": "<h3>优化</h3>\n<ul>\n<li>更新所有依赖包到最新</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复试听酷狗源的音乐仍然获取320k音质导致获取失败的Bug</li>\n</ul>\n",
   "history": [
+    {
+      "version": "0.5.2",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增强迫症设置-离开搜索界面时是否清空搜索框</li>\n<li>设置-关于板块新增常见问题链接</li>\n<li>歌单左上角的分类按钮添加一个<strong>向下图标</strong>，方便识别该按钮为下拉框（该按钮可选择歌单类型，请自行尝试）</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>略微优化最小化按钮字符</li>\n<li>优化试听列表的加载体验，当歌曲数过多时列表将延迟加载</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复下载管理的一些Bug</li>\n</ul>\n<h3>移除</h3>\n<ul>\n<li>因接口失效，移除网易云音源，酷狗音源仅支持播放128k音质</li>\n</ul>\n"
+    },
+    {
+      "version": "0.5.1",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增右上角最小化/关闭按钮鼠标滑过符号</li>\n<li>新增下载列表定位文件按钮</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复百度源歌单全部分类无法加载的问题</li>\n<li>修复更新弹窗无法弹出的问题</li>\n</ul>\n"
+    },
     {
       "version": "0.5.0",
       "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>封面嵌入</strong>（默认开启，可到设置-下载设置关闭）</li>\n<li>新增<strong>歌词下载</strong>（默认关闭，可到设置-下载设置开启）</li>\n<li>新增单例应用功能（实现软件单开功能，禁止软件多开）</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>优化歌单列表动画</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复歌单无法翻页的问题</li>\n<li>修复在某些情况下，添加下载歌曲导致下载列表崩溃的问题</li>\n<li>修复版本更新弹窗Bug</li>\n<li>修复酷狗歌单推荐歌单出现在其他分类中的Bug</li>\n</ul>\n"

src/common/utils.js

@@ -1,4 +1,8 @@
-export const isLinux = process.platform == 'linux'
-export const isWin = process.platform == 'win32'
-export const isMac = process.platform == 'darwin'
+const log = require('electron-log')
 
+exports.isLinux = process.platform == 'linux'
+exports.isWin = process.platform == 'win32'
+exports.isMac = process.platform == 'darwin'
+
+
+exports.log = log

src/main/events/trafficLight.js

@@ -1,3 +1,4 @@
+// const { app } = require('electron')
 const { mainOn } = require('../../common/icp')
 
 module.exports = win => {
@@ -14,6 +15,8 @@ module.exports = win => {
   mainOn('close', event => {
     if (win) {
       // window.destroy()
+      // console.log('close')
+      // app.quit()
       win.close()
     }
   })

src/main/index.js

@@ -33,7 +33,7 @@ let winURL
 
 if (isDev) {
   global.__static = path.join(__dirname, '../static')
-  winURL = `http://localhost:9080`
+  winURL = 'http://localhost:9080'
 } else {
   global.__static = path.join(__dirname, '/static')
   winURL = `file://${__dirname}/index.html`
@@ -63,7 +63,7 @@ function createWindow() {
   mainWindow.loadURL(winURL)
 
   mainWindow.on('closed', () => {
-    mainWindow = null
+    if (!isMac) mainWindow = null
   })
 
   // mainWindow.webContents.openDevTools()
@@ -94,9 +94,7 @@ if (isMac) {
 app.on('ready', createWindow)
 
 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
+  if (!isMac) app.quit()
 })
 
 app.on('activate', () => {

src/main/utils/autoUpdate.js

@@ -1,4 +1,4 @@
-const log = require('electron-log')
+const { log } = require('../../common/utils')
 const { autoUpdater } = require('electron-updater')
 const { mainOn } = require('../../common/icp')
 

src/renderer/assets/styles/index.less

@@ -103,6 +103,10 @@ strong {
   font-weight: bold;
 }
 
+.underline {
+  text-decoration: underline;
+}
+
 svg {
   transition: @transition-theme;
   transition-property: fill;

src/renderer/components/core/Icons.vue

@@ -66,5 +66,8 @@ svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/19
       path(fill='currentColor' d='m240 346.5c0 8.269531 6.730469 15 15 15s15-6.730469 15-15v-15.25h-15c-7.960938 0-15 6.324219-15 15.25zm0 0')
       path(fill='currentColor' d='m295 150.5c-30.328125 0-55-24.746094-55-55.167969v-95.332031h-185c-30.328125 0-55 24.746094-55 55.167969v401.667969c0 30.417968 24.671875 55.164062 55 55.164062h280c30.328125 0 55-24.746094 55-55.167969v-306.332031zm5 196c0 24.8125-20.1875 45-45 45s-45-20.1875-45-45c0-25.507812 20.53125-45.25 45-45.25h15v-56.144531l-90 22.59375v108.925781c0 24.8125-20.1875 45-45 45s-45-20.1875-45-45c0-25.507812 20.53125-45.25 45-45.25h15v-75.375c0-6.878906 4.675781-12.875 11.347656-14.546875l120-30.125c9.46875-2.382813 18.652344 4.796875 18.652344 14.546875zm0 0')
       path(fill='currentColor' d='m120 376.625c0 8.269531 6.730469 15 15 15s15-6.730469 15-15v-15.25h-15c-7.960938 0-15 6.324219-15 15.25zm0 0')
+    g#icon-down
+      // 0 0 451.847 451.847
+      path(fill='currentColor' d='M225.923,354.706c-8.098,0-16.195-3.092-22.369-9.263L9.27,151.157c-12.359-12.359-12.359-32.397,0-44.751c12.354-12.354,32.388-12.354,44.748,0l171.905,171.915l171.906-171.909c12.359-12.354,32.391-12.354,44.744,0c12.365,12.354,12.365,32.392,0,44.751L248.292,345.449C242.115,351.621,234.018,354.706,225.923,354.706z')
 </template>
 

src/renderer/components/core/Player.vue

@@ -370,7 +370,7 @@ export default {
     getPlayType(highQuality, songInfo) {
       switch (songInfo.source) {
         case 'wy':
-        // case 'kg':
+        case 'kg':
           return '128k'
       }
       let type = songInfo._types['192k'] ? '192k' : '128k'

src/renderer/components/core/Toolbar.vue

@@ -88,7 +88,7 @@ each(@themes, {
       opacity: 1;
     }
   }
-  
+
   button {
     position: relative;
     width: @height-toolbar;
@@ -105,20 +105,14 @@ each(@themes, {
       content: ' ';
       display: block;
       border-radius: 50%;
-      width: 13px;
-      height: 13px;
+      width: 14px;
+      height: 14px;
       transition: background-color 0.2s ease-in-out;
     }
 
     &:before {
       display: block;
       position: absolute;
-      left: 50%;
-      top: 50%;
-      transform: translate(-50%, -50%);
-      font-size: 14px;
-      line-height: 1;
-      color: #fff;
       opacity: 0;
       transition: opacity @transition-theme;
     }
@@ -147,13 +141,23 @@ each(@themes, {
 }
 .min {
   &:before {
-    content: '－';
-    font-size: 15px;
+    content: ' ';
+    width: 8px;
+    height: 2px;
+    left: @height-toolbar / 2 - 4;
+    top: @height-toolbar / 2 - 1;
+    background-color: #fff;
   }
 }
 .close {
   &:before {
     content: '×';
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    font-size: 14px;
+    line-height: 1;
+    color: #fff;
   }
 }
 </style>

src/renderer/components/material/DownloadModal.vue

@@ -5,7 +5,7 @@ material-modal(:show="show" :bg-close="bgClose" @close="handleClose")
       | {{ info.name }}
       br
       | {{ info.singer }}
-    material-btn(:class="$style.btn" :title="!checkSource(type.type) && '目前网易云音源仅支持下载128k音质'" :disabled="!checkSource(type.type)" :key="type.type" @click="handleClick(type.type)" v-for="type in info.types") {{getTypeName(type.type)}} {{ type.type.toUpperCase() }}{{ type.size && ` - ${type.size.toUpperCase()}` }}
+    material-btn(:class="$style.btn" :title="!checkSource(type.type) && '目前酷狗音源仅支持下载128k音质'" :disabled="!checkSource(type.type)" :key="type.type" @click="handleClick(type.type)" v-for="type in info.types") {{getTypeName(type.type)}} {{ type.type.toUpperCase() }}{{ type.size && ` - ${type.size.toUpperCase()}` }}
 
 </template>
 
@@ -52,7 +52,7 @@ export default {
     checkSource(type) {
       switch (this.musicInfo.source) {
         case 'wy':
-        // case 'kg':
+        case 'kg':
           return type == '128k'
 
         default:

src/renderer/components/material/SearchInput.vue

@@ -34,8 +34,11 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['source']),
+    ...mapGetters(['source', 'route', 'setting']),
     ...mapGetters('search', ['info']),
+    isAutoClearInput() {
+      return this.setting.odc.isAutoClearSearchInput
+    },
   },
   watch: {
     list(n) {
@@ -46,6 +49,9 @@ export default {
     'info.text'(n) {
       if (n !== this.text) this.text = n
     },
+    route(n) {
+      if (this.isAutoClearInput && n.name != 'search' && this.text) this.text = ''
+    },
   },
   methods: {
     handleTemplistClick(index) {

src/renderer/components/material/SongList.vue

@@ -27,7 +27,7 @@ div(:class="$style.songList")
               td.break(style="width: 20%;") {{item.singer}}
               td.break(style="width: 22%;") {{item.albumName}}
               td(style="width: 18%;")
-                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="handleListBtnClick")
+                material-list-buttons(:index="index" :search-btn="true" :play-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx' && item.source != 'wy')" :download-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx' && item.source != 'wy')" :remove-btn="false" @btn-click="handleListBtnClick")
                 //- 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)') ＋
@@ -136,7 +136,7 @@ export default {
         this.clickIndex = index
         return
       }
-      this.emitEvent((this.source == 'kw' || (!this.isAPITemp && this.list[index].source != 'tx')) ? 'testPlay' : 'search', index)
+      this.emitEvent((this.source == 'kw' || (!this.isAPITemp && this.list[index].source != 'tx' && this.list[index].source != 'wy')) ? 'testPlay' : 'search', index)
       this.clickTime = 0
       this.clickIndex = -1
     },

src/renderer/components/material/TagList.vue

@@ -1,6 +1,10 @@
 <template lang="pug">
   div(:class="$style.tagList")
-    div(:class="$style.label" ref="dom_btn" @click="handleShow") {{value.name}}
+    div(:class="$style.label" ref="dom_btn" @click="handleShow")
+      span {{value.name}}
+      div(:class="[$style.icon, show ? $style.active : '']")
+        svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 451.847 451.847' space='preserve')
+          use(xlink:href='#icon-down')
     div.scroll(:class="$style.list" @click.stop ref="dom_list" :style="listStyle")
       div(:class="$style.tag" @click="handleClick(null)") 默认
       dl(v-for="type in list")
@@ -9,7 +13,7 @@
 </template>
 
 <script>
-// import { isChildren } from '../../utils'
+import { isChildren } from '../../utils'
 export default {
   props: {
     list: {
@@ -58,7 +62,7 @@ export default {
   methods: {
     handleHide(e) {
       // if (e && e.target.parentNode != this.$refs.dom_list && this.show) return this.show = false
-      if (e && e.target == this.$refs.dom_btn) return
+      if (e && (e.target == this.$refs.dom_btn || isChildren(this.$refs.dom_btn, e.target))) return
       setTimeout(() => {
         this.show = false
       }, 50)
@@ -103,6 +107,27 @@ export default {
   color: @color-btn;
   cursor: pointer;
 
+  display: flex;
+
+  span {
+    flex: auto;
+  }
+  .icon {
+    flex: none;
+    margin-left: 7px;
+    line-height: 0;
+    svg {
+      width: 1em;
+      transition: transform .2s ease;
+      transform: rotate(0);
+    }
+    &.active {
+      svg{
+        transform: rotate(180deg);
+      }
+    }
+  }
+
   &:hover {
     background-color: @color-theme_2-hover;
   }

src/renderer/main.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-// import { sync } from 'vuex-router-sync'
+import { sync } from 'vuex-router-sync'
 
 // Components
 import './components'
@@ -11,7 +11,7 @@ import App from './App'
 import router from './route'
 import store from './store'
 
-// sync(store, router)
+sync(store, router)
 
 if (!process.env.IS_WEB) {
 

src/renderer/store/getters.js

@@ -31,4 +31,7 @@ export default {
   version(state) {
     return state.version
   },
+  route(state) {
+    return state.route
+  },
 }

src/renderer/utils/index.js

@@ -163,7 +163,7 @@ export const isChildren = (parent, children) => {
  * @param {*} setting
  */
 export const updateSetting = setting => {
-  const defaultVersion = '1.0.6'
+  const defaultVersion = '1.0.7'
   const defaultSetting = {
     version: defaultVersion,
     player: {
@@ -194,6 +194,9 @@ export const updateSetting = setting => {
         id: null,
       },
     },
+    odc: {
+      isAutoClearSearchInput: false,
+    },
     themeId: 0,
     sourceId: 'kw',
     apiSource: 'test',

src/renderer/utils/music/bd/leaderboard.js

@@ -85,7 +85,7 @@ export default {
           size,
         }
         types.push({ type: 'flac', size })
-        _types['flac'] = {
+        _types.flac = {
           size,
         }
       }

src/renderer/utils/music/bd/songList.js

@@ -215,7 +215,7 @@ export default {
       }
       if (itemTypes.includes('flac')) {
         types.push({ type: 'flac', size })
-        _types['flac'] = {
+        _types.flac = {
           size,
         }
       }

src/renderer/utils/music/kg/songList.js

@@ -39,7 +39,7 @@ export default {
   getInfoUrl(tagId) {
     return tagId
       ? `http://www2.kugou.kugou.com/yueku/v9/special/getSpecial?is_smarty=1&cdn=cdn&t=5&c=${tagId}`
-      : `http://www2.kugou.kugou.com/yueku/v9/special/getSpecial?is_smarty=1&`
+      : 'http://www2.kugou.kugou.com/yueku/v9/special/getSpecial?is_smarty=1&'
   },
   getSongListUrl(sortId, tagId, page) {
     if (tagId == null) tagId = ''

src/renderer/utils/music/kw/leaderboard.js

@@ -133,13 +133,13 @@ export default {
       }
       if (formats.indexOf('AL')) {
         types.push({ type: 'ape', size: null })
-        _types['ape'] = {
+        _types.ape = {
           size: null,
         }
       }
       if (formats.indexOf('ALFLAC')) {
         types.push({ type: 'flac', size: null })
-        _types['flac'] = {
+        _types.flac = {
           size: null,
         }
       }

src/renderer/utils/music/kw/songList.js

@@ -183,7 +183,7 @@ export default {
       }
       if (formats.indexOf('ALFLAC')) {
         types.push({ type: 'flac', size: null })
-        _types['flac'] = {
+        _types.flac = {
           size: null,
         }
       }

src/renderer/utils/music/utils.js

@@ -7,7 +7,7 @@
 const types = ['flac', 'ape', '320k', '192k', '128k']
 export const getMusicType = (info, type) => {
   switch (window.globalObj.apiSource) {
-    // case 'kg':
+    case 'kg':
     case 'wy':
       return '128k'
   }

src/renderer/utils/music/wy/leaderboard.js

@@ -98,7 +98,7 @@ export default {
         case 999000:
           size = null
           types.push({ type: 'flac', size })
-          _types['flac'] = {
+          _types.flac = {
             size,
           }
         case 320000:

src/renderer/views/Download.vue

@@ -127,6 +127,7 @@ export default {
           break
         case 'remove':
           this.removeTask(info.index)
+          break
         case 'file':
           this.handleOpenFolder(info.index)
           break
@@ -149,7 +150,7 @@ export default {
             this.handleStartTask(index)
           })
           break
-        case 'pause':
+        case 'pause': {
           let runs = []
           this.selectdData.forEach(item => {
             if (item.isComplate || item.status == this.downloadStatus.PAUSE) return
@@ -165,6 +166,7 @@ export default {
             this.handlePauseTask(index)
           })
           break
+        }
         case 'remove':
           this.removeTaskMultiple(this.selectdData)
           break
@@ -172,7 +174,9 @@ export default {
       this.resetSelect()
     },
     handleOpenFolder(index) {
-      openDirInExplorer(this.list[index].filePath)
+      let path = this.list[index].filePath
+      if (!checkPath(path)) return
+      openDirInExplorer(path)
     },
   },
 }

src/renderer/views/Leaderboard.vue

@@ -117,7 +117,7 @@ export default {
     },
     handleAddDownloadMultiple(type) {
       switch (this.source) {
-        // case 'kg':
+        case 'kg':
         case 'wy':
           type = '128k'
       }

src/renderer/views/List.vue

@@ -1,7 +1,7 @@
 <template lang="pug">
   div(:class="$style.list")
     //- transition
-    div(v-if="list.length" :class="$style.content")
+    div(v-if="delayShow && list.length" :class="$style.content")
       div(:class="$style.thead")
         table
           thead
@@ -18,7 +18,7 @@
         table
           tbody
             tr(v-for='(item, index) in list' :key='item.songmid'
-              @click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', (isAPITemp && item.source != 'kw') || item.source == 'tx' ? $style.disabled : '']")
+              @click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', (isAPITemp && item.source != 'kw') || item.source == 'tx' || item.source == 'wy' ? $style.disabled : '']")
               td.nobreak.center(style="width: 37px;" @click.stop)
                   material-checkbox(:id="index.toString()" v-model="selectdData" :value="item")
               td.break(style="width: 25%;") {{item.name}}
@@ -37,6 +37,7 @@
                 //- button.btn-success(type='button' v-if="(item._types['128k'] || item._types['192k'] || item._types['320k']) && userInfo" @click.stop='showListModal(index)') ＋
               td(style="width: 10%;") {{item.interval || '--/--'}}
     div(:class="$style.noItem" v-else)
+      p 加载中...
     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-flow-btn(:show="isShowEditBtn" :add-btn="false" :play-btn="false" @btn-click="handleFlowBtnClick")
@@ -57,6 +58,7 @@ export default {
       isIndeterminate: false,
       isShowEditBtn: false,
       isShowDownloadMultiple: false,
+      delayShow: false,
     }
   },
   computed: {
@@ -119,6 +121,11 @@ export default {
   //   this.handleSearch(this.text, this.page)
   // }
   // },
+  mounted() {
+    if (this.list.length > 150) {
+      setTimeout(() => this.delayShow = true, 200)
+    } else this.delayShow = true
+  },
   methods: {
     ...mapMutations('list', ['defaultListRemove', 'defaultListRemoveMultiple']),
     ...mapActions('download', ['createDownload', 'createDownloadMultiple']),
@@ -137,7 +144,7 @@ export default {
       this.clickIndex = -1
     },
     testPlay(index) {
-      if ((this.isAPITemp && this.list[index].source != 'kw') || this.list[index].source == 'tx') return
+      if ((this.isAPITemp && this.list[index].source != 'kw') || this.list[index].source == 'tx' || this.list[index].source == 'wy') return
       this.setList({ list: this.list, listId: 'test', index })
     },
     handleRemove(index) {
@@ -145,14 +152,15 @@ export default {
     },
     handleListBtnClick(info) {
       switch (info.action) {
-        case 'download':
+        case 'download': {
           const minfo = this.list[info.index]
-          if ((this.isAPITemp && minfo.source != 'kw') || minfo.source == 'tx') return
+          if ((this.isAPITemp && minfo.source != 'kw') || minfo.source == 'tx' || minfo.source == 'wy') return
           this.musicInfo = minfo
           this.$nextTick(() => {
             this.isShowDownload = true
           })
           break
+        }
         case 'play':
           this.testPlay(info.index)
           break
@@ -173,7 +181,7 @@ export default {
       this.selectdData = []
     },
     handleAddDownloadMultiple(type) {
-      const list = this.setting.apiSource == 'temp' ? this.selectdData.filter(s => s.source == 'kw') : this.selectdData.filter(s => s.source != 'tx')
+      const list = this.setting.apiSource == 'temp' ? this.selectdData.filter(s => s.source == 'kw') : this.selectdData.filter(s => s.source != 'tx' && s.source != 'wy')
       this.createDownloadMultiple({ list, type })
       this.resetSelect()
       this.isShowDownloadMultiple = false
@@ -239,6 +247,20 @@ export default {
   opacity: .5;
 }
 
+.no-item {
+  position: relative;
+  height: 100%;
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: center;
+  align-items: center;
+
+  p {
+    font-size: 24px;
+    color: #ccc;
+  }
+}
+
 each(@themes, {
   :global(#container.@{value}) {
     .tbody {

src/renderer/views/Setting.vue

@@ -32,7 +32,7 @@ div.scroll(:class="$style.setting")
       div
         material-checkbox(id="setting_player_highQuality" v-model="current_setting.player.highQuality" label="是否启用")
     dd(title='在任务栏上显示当前歌曲播放进度')
-      h3 是否启用任务栏播放进度条
+      h3 任务栏播放进度条
       div
         material-checkbox(id="setting_player_showTaskProgess" v-model="current_setting.player.isShowTaskProgess" label="是否启用")
     dt 下载设置
@@ -49,12 +49,12 @@ div.scroll(:class="$style.setting")
       div
         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")
-    dd(title='封面嵌入')
-      h3 是否将封面嵌入音频文件中（只支持MP3格式）
+    dd(title='是否将封面嵌入音频文件中')
+      h3 封面嵌入（只支持MP3格式）
       div
         material-checkbox(id="setting_download_isEmbedPic" v-model="current_setting.download.isEmbedPic" label="是否启用")
-    dd(title='歌词下载')
-      h3 是否同时下载歌词文件
+    dd(title='是否同时下载歌词文件')
+      h3 歌词下载
       div
         material-checkbox(id="setting_download_isDownloadLrc" v-model="current_setting.download.isDownloadLrc" label="是否启用")
     //- dt 列表设置
@@ -62,6 +62,11 @@ div.scroll(:class="$style.setting")
       h3 专辑栏
       div
         material-checkbox(id="setting_list_showalbum" v-model="current_setting.list.isShowAlbumName" label="是否显示专辑栏")
+    dt 强迫症设置
+    dd
+      h3 离开搜索界面时清空搜索框
+      div
+        material-checkbox(id="setting_odc_isAutoClearSearchInput" v-model="current_setting.odc.isAutoClearSearchInput" label="是否启用")
     dt 备份与恢复
     dd
       h3 部分数据
@@ -89,12 +94,32 @@ div.scroll(:class="$style.setting")
     dd
       p.small
         | 本软件完全免费，代码已开源，开源地址：
-        span.hover(title="点击打开" @click="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop#readme')") https://github.com/lyswhut/lx-music-desktop
+        span.hover.underline(title="点击打开" @click="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop#readme')") https://github.com/lyswhut/lx-music-desktop
       p.small
-        | 最新版网盘下载地址（网盘内有MAC、windows版）：
-        span.hover(title="点击打开" @click="handleOpenUrl('https://www.lanzous.com/b906260/')") https://www.lanzous.com/b906260/
+        | 最新版网盘下载地址（网盘内有Windows、MAC版）：
+        span.hover.underline(title="点击打开" @click="handleOpenUrl('https://www.lanzous.com/b906260/')") 网盘地址
         |   密码：
         span.hover(title="点击复制" @click="clipboardWriteText('glqw')") glqw
+      p.small
+        | 软件的常见问题可转至：
+        span.hover.underline(title="点击打开" @click="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop#常见问题')") 常见问题
+      //- p.small
+          | 怀念曾经的
+          strong @messoer
+          | ，非常感谢曾经为本软件提供数据源！
+      p.small
+        | 阅读常见问题后仍有问题可 mail to：
+        span.hover(title="点击复制" @click="clipboardWriteText('lyswhut@qq.com')") lyswhut@qq.com
+        |  或到 GitHub 提交 
+        span.hover.underline(title="点击打开" @click="handleOpenUrl('https://github.com/lyswhut/lx-music-desktop/issues')") issue
+      p.small
+        | 若觉得好用的话可以去 GitHub 点个
+        strong star
+        | 支持作者哦~~🍻
+      p
+        span 如果你资金充裕，还可以
+        material-btn(@click="handleOpenUrl('https://cdn.stsky.cn/qrc.png')" min title="土豪，你好 🙂") 打赏下作者
+        span ，以帮我分担点服务器费用~❤️
       p.small
         |  本软件仅用于学习交流使用，禁止将本软件用于
         strong 非法用途
@@ -105,19 +130,6 @@ div.scroll(:class="$style.setting")
           | 使用本软件造成的一切后果由
           strong 使用者
           | 承担！
-      p.small
-          | 怀念曾经的
-          strong @messoer
-          | ，非常感谢曾经为本软件提供数据源！
-      p.small 若有问题可 mail to：lyswhut@qq.com 或到 GitHub 提交 issue
-      p.small
-        | 若觉得好用的话可以去 GitHub 点个
-        strong star
-        | 支持作者哦~~🍻
-      p
-        span 如果你资金充裕，还可以
-        material-btn(@click="handleOpenUrl('https://cdn.stsky.cn/qrc.png')" min title="土豪，你好 🙂") 打赏下作者
-        span ，以帮我分担点服务器费用~❤️
       p
         small By：
         | 落雪无痕
@@ -157,6 +169,9 @@ export default {
           isDownloadLrc: false,
           isEmbedPic: true,
         },
+        odc: {
+          isAutoClearSearchInput: false,
+        },
         themeId: 0,
         sourceId: 0,
         randomAnimate: true,

src/renderer/views/SongList.vue

@@ -191,7 +191,7 @@ export default {
     },
     handleAddDownloadMultiple(type) {
       switch (this.source) {
-        // case 'kg':
+        case 'kg':
         case 'wy':
           type = '128k'
       }