发布0.13.0版本

多修复选框不定状态到选中的Bug
移除Q音源的试听与下载
2019-12-15 21:33:46 +08:00 · 2019-12-15 21:23:52 +08:00 · 2019-12-15 21:03:19 +08:00 · 2019-12-15 19:18:31 +08:00 · 2019-12-14 14:01:53 +08:00 · 2019-12-14 13:54:22 +08:00
18 changed files with 703 additions and 522 deletions
--- a/.github/ISSUE_TEMPLATE/----.md
+++ b/.github/ISSUE_TEMPLATE/----.md
@@ -1,5 +1,5 @@
 ---
-name: 功能请求
+name: 功能请求(请先查看常见问题及搜索issue列表中有无你要提的问题)
 about: 为这个项目提出一个想法
 title: 例如：添加xxx功能、优化xxx功能
 labels: ''
--- a/.github/ISSUE_TEMPLATE/--bug.md
+++ b/.github/ISSUE_TEMPLATE/--bug.md
@@ -1,5 +1,5 @@
 ---
-name: 报告Bug
+name: 报告Bug(请先查看常见问题及搜索issue列表中有无你要提的问题)
 about: 创建报告以帮助我们改进
 title: 例如：音乐无法播放
 labels: ''
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,32 @@ 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.13.0](https://github.com/lyswhut/lx-music-desktop/compare/v0.12.1...v0.13.0) - 2019-12-15
+
+### 新增
+
+- 新增搜索框搜索建议键盘上下方向键选择功能
+- 聚合搜索新增音源显示
+- 新增“离开搜索界面时清空搜索列表”设置选项，默认关闭，可到设置-强迫症设置开启
+
+### 优化
+
+- 优化“信口雌黄”皮肤配色
+
+### 修复
+
+- 修复存在弹出层时，搜索建议列表被弹出层覆盖的问题
+- 修复搜索、排行榜、歌单列表多选框从不定状态到选中的Bug
+
+### 移除
+
+- 因Q音接口失效，移除Q音源的试听与下载
+
+### 其他
+
+- 更新electron到7.1.5
+- 更新vue到2.6.11
+
 ## [0.12.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.12.0...v0.12.1) - 2019-12-01

 ### 优化
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "lx-music-desktop",
-  "version": "0.12.1",
+  "version": "0.13.0",
  "description": "一个免费的音乐下载助手",
  "main": "./dist/electron/main.js",
  "productName": "lx-music-desktop",
@@ -49,7 +49,7 @@
    "lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-formatter-friendly --fix src"
  },
  "browserslist": [
-    "Chrome >= 76"
+    "Electron >= 7.1.3"
  ],
  "engines": {
    "node": ">= 12"
@@ -139,10 +139,10 @@
  },
  "homepage": "https://github.com/lyswhut/lx-music-desktop#readme",
  "devDependencies": {
-    "@babel/core": "^7.7.4",
+    "@babel/core": "^7.7.5",
    "@babel/plugin-syntax-dynamic-import": "^7.7.4",
    "@babel/polyfill": "^7.7.0",
-    "@babel/preset-env": "^7.7.4",
+    "@babel/preset-env": "^7.7.6",
    "autoprefixer": "^9.7.3",
    "babel-eslint": "^10.0.3",
    "babel-loader": "^8.0.6",
@@ -151,22 +151,22 @@
    "cfonts": "^2.4.5",
    "chalk": "^3.0.0",
    "changelog-parser": "^2.8.0",
-    "copy-webpack-plugin": "^5.0.5",
-    "core-js": "^3.4.5",
+    "copy-webpack-plugin": "^5.1.1",
+    "core-js": "^3.5.0",
    "cos-nodejs-sdk-v5": "^2.5.14",
    "cross-env": "^6.0.3",
-    "css-loader": "^3.2.0",
+    "css-loader": "^3.3.2",
    "del": "^5.1.0",
-    "electron": "^7.1.2",
+    "electron": "^7.1.5",
    "electron-builder": "^22.1.0",
    "electron-debug": "^3.0.1",
    "electron-devtools-installer": "^2.2.4",
    "eslint": "^6.7.2",
    "eslint-config-standard": "^14.1.0",
    "eslint-formatter-friendly": "^7.0.0",
-    "eslint-loader": "^3.0.2",
+    "eslint-loader": "^3.0.3",
    "eslint-plugin-html": "^6.0.0",
-    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-import": "^2.19.1",
    "eslint-plugin-node": "^10.0.0",
    "eslint-plugin-promise": "^4.2.1",
    "eslint-plugin-standard": "^4.0.1",
@@ -187,11 +187,11 @@
    "rimraf": "^3.0.0",
    "stylus": "^0.54.7",
    "stylus-loader": "^3.0.2",
-    "terser-webpack-plugin": "^2.2.1",
+    "terser-webpack-plugin": "^2.3.0",
    "url-loader": "^3.0.0",
    "vue-loader": "^15.7.2",
    "vue-style-loader": "^4.1.2",
-    "vue-template-compiler": "^2.6.10",
+    "vue-template-compiler": "^2.6.11",
    "webpack": "^4.41.2",
    "webpack-cli": "^3.3.10",
    "webpack-dev-server": "^3.9.0",
@@ -202,15 +202,15 @@
    "axios": "^0.19.0",
    "crypto-js": "^3.1.9-1",
    "dnscache": "^1.0.2",
-    "electron-log": "^3.0.9",
+    "electron-log": "^4.0.0",
    "electron-store": "^5.1.0",
    "electron-updater": "^4.2.0",
    "flac-metadata": "^0.1.1",
    "js-htmlencode": "^0.3.0",
-    "lrc-file-parser": "^0.1.14",
+    "lrc-file-parser": "^0.1.15",
    "node-id3": "^0.1.13",
    "request": "^2.88.0",
-    "vue": "^2.6.10",
+    "vue": "^2.6.11",
    "vue-electron": "^1.0.6",
    "vue-router": "^3.1.3",
    "vuex": "^3.1.2",
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,14 +1,23 @@
+### 新增
+
+- 新增搜索框搜索建议键盘上下方向键选择功能
+- 聚合搜索新增音源显示
+- 新增“离开搜索界面时清空搜索列表”设置选项，默认关闭，可到设置-强迫症设置开启
+
 ### 优化

- 优化定位歌曲时的列表滚动机制
- 优化链接点击效果
+- 优化“信口雌黄”皮肤配色

 ### 修复

- 修复使用酷我源下载歌曲时，当歌曲无封面时下载报错的问题
- 修复酷我源排行榜、歌单详情列表里的歌曲音质匹配问题（原来无论歌曲有无高品、无损都会显示有）
- 禁止外部链接在软件内打开，将所有外部链接从默认浏览器打开
+- 修复存在弹出层时，搜索建议列表被弹出层覆盖的问题
+- 修复搜索、排行榜、歌单列表多选框从不定状态到选中的Bug
+
+### 移除
+
+- 因Q音接口失效，移除Q音源的试听与下载

 ### 其他

- 更新electron到7.1.2
+- 更新electron到7.1.5
+- 更新vue到2.6.11
--- a/publish/version.json
+++ b/publish/version.json
@@ -1,7 +1,11 @@
 {
-  "version": "0.12.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<li>禁止外部链接在软件内打开，将所有外部链接从默认浏览器打开</li>\n</ul>\n<h3>其他</h3>\n<ul>\n<li>更新electron到7.1.2</li>\n</ul>\n",
+  "version": "0.13.0",
+  "desc": "<h3>新增</h3>\n<ul>\n<li>新增搜索框搜索建议键盘上下方向键选择功能</li>\n<li>聚合搜索新增音源显示</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>修复搜索、排行榜、歌单列表多选框从不定状态到选中的Bug</li>\n</ul>\n<h3>移除</h3>\n<ul>\n<li>因Q音接口失效，移除Q音源的试听与下载</li>\n</ul>\n<h3>其他</h3>\n<ul>\n<li>更新electron到7.1.5</li>\n<li>更新vue到2.6.11</li>\n</ul>\n",
  "history": [
+    {
+      "version": "0.12.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<li>禁止外部链接在软件内打开，将所有外部链接从默认浏览器打开</li>\n</ul>\n<h3>其他</h3>\n<ul>\n<li>更新electron到7.1.2</li>\n</ul>\n"
+    },
    {
      "version": "0.12.0",
      "desc": "<p>由于新下载库仍然没有完成，但下载功能已经可用，so 移除之前使用的第三方下载库，暂时把新下载库的下载模块直接加入本程序，若出现下载问题欢迎反馈！</p>\n<h3>新增</h3>\n<ul>\n<li>新增下载功能对代理设置的支持，现在若在软件设置了代理服务器，下载功能也将会走代理网络了</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>新下载模块将对恢复下载的任务进行字节校验，用于解决下载进度超过100%后仍然下载的问题</li>\n<li>注意：目前仍然无法暂停处于<strong>链接获取</strong>状态中的任务</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复Linux deb版本<code>.desktop</code>桌面文件缺少图标的问题，新增中文名称显示、软件分类，感谢@lowy的反馈！</li>\n<li>修复下载列表歌曲状态分类列表操作Bug</li>\n<li>修复歌曲封面下载失败时仍然执行嵌入封面操作导致报错的问题</li>\n<li>跳过重复添加<strong>相同歌曲名与扩展名的歌曲</strong>，例如你之前下载了A歌曲的128k音质，现在想要下载它的320k音质，但由于两者都是MP3格式，会因为重名导致之前的128k音质被覆盖但列表中仍然显示两种音质的问题（但实际上都是指向后面的320k音质）</li>\n</ul>\n"
--- a/src/renderer/assets/styles/variables.less
+++ b/src/renderer/assets/styles/variables.less
@@ -7,7 +7,7 @@
 // @color-theme: #03a678;
@color-theme: #4daf7c;
@color-theme-bgimg: none;
-@color-theme-bgposition: center center;
+@color-theme-bgposition: center;
@color-theme-bgsize: auto auto;
@color-theme-hover: fadeout(lighten(@color-theme, 10%), 30%);
@color-theme-active: fadeout(darken(@color-theme, 20%), 60%);
@@ -59,7 +59,7 @@

@color-green-theme: #4daf7c;
@color-green-theme-bgimg: none;
-@color-green-theme-bgposition: center center;
+@color-green-theme-bgposition: center;
@color-green-theme-bgsize: auto auto;
@color-green-theme-hover: fadeout(lighten(@color-green-theme, 10%), 30%);
@color-green-theme-active: fadeout(darken(@color-green-theme, 20%), 60%);
@@ -97,9 +97,9 @@
@color-green-tab-border-bottom: lighten(@color-green-theme, 5%);


-@color-yellow-theme: #f2d35b;
+@color-yellow-theme: #e9d460;
@color-yellow-theme-bgimg: none;
-@color-yellow-theme-bgposition: center center;
+@color-yellow-theme-bgposition: center;
@color-yellow-theme-bgsize: auto auto;
@color-yellow-theme-hover: fadeout(lighten(@color-yellow-theme, 10%), 30%);
@color-yellow-theme-active: fadeout(darken(@color-yellow-theme, 20%), 60%);
@@ -108,37 +108,37 @@
@color-yellow-theme_2: #fff;
@color-yellow-theme_2-background_1: #fff;
@color-yellow-theme_2-background_2: fadeout(@color-yellow-theme_2-background_1, 2%);
-@color-yellow-theme_2-hover: fadeout(lighten(@color-yellow-theme, 10%), 70%);
-@color-yellow-theme_2-active: fadeout(darken(@color-yellow-theme, 5%), 70%);
+@color-yellow-theme_2-hover: fadeout(lighten(@color-yellow-theme, 10%), 60%);
+@color-yellow-theme_2-active: fadeout(darken(@color-yellow-theme, 5%), 60%);
@color-yellow-theme_2-font: darken(@color-yellow-theme_2, 70%);
-@color-yellow-theme_2-font-label: fadeout(@color-yellow-theme_2-font, 50%);
-@color-yellow-theme_2-line: lighten(@color-yellow-theme, 35%);
+@color-yellow-theme_2-font-label: fadeout(@color-yellow-theme_2-font, 40%);
+@color-yellow-theme_2-line: lighten(@color-yellow-theme, 25%);
@color-yellow-theme-sidebar: @color-yellow-theme;
-@color-yellow-btn: fadeout(darken(@color-yellow-theme, 5%), 15%);
-@color-yellow-btn-background: fadeout(lighten(@color-yellow-theme, 25%), 70%);
+@color-yellow-btn: fadeout(darken(@color-yellow-theme, 5%), 5%);
+@color-yellow-btn-background: fadeout(lighten(@color-yellow-theme, 25%), 60%);
@color-yellow-pagination-background: fadeout(lighten(@color-yellow-theme, 30%), 30%);
@color-yellow-pagination-hover: fadeout(lighten(@color-yellow-theme, 5%), 70%);
@color-yellow-pagination-active: fadeout(darken(@color-yellow-theme, 5%), 70%);
@color-yellow-pagination-select: fadeout(lighten(@color-yellow-theme, 5%), 50%);
-@color-yellow-search-form-background: fadeout(lighten(@color-yellow-theme, 35%), 10%);
-@color-yellow-search-list-hover: fadeout(darken(@color-yellow-theme, 10%), 70%);
-@color-yellow-scrollbar-track: fadeout(@color-yellow-theme, 80%);
-@color-yellow-scrollbar-thumb: fadeout(@color-yellow-theme, 60%);
-@color-yellow-scrollbar-thumb-hover: fadeout(@color-yellow-theme, 40%);
+@color-yellow-search-form-background: fadeout(lighten(@color-yellow-theme, 25%), 10%);
+@color-yellow-search-list-hover: fadeout(darken(@color-yellow-theme, 10%), 60%);
+@color-yellow-scrollbar-track: fadeout(@color-yellow-theme, 60%);
+@color-yellow-scrollbar-thumb: fadeout(@color-yellow-theme, 45%);
+@color-yellow-scrollbar-thumb-hover: fadeout(@color-yellow-theme, 30%);
@color-yellow-player-pic-c1: fadeout(@color-yellow-theme_2, 50%);
@color-yellow-player-pic-c2: darken(@color-yellow-theme_2, 30%);
@color-yellow-player-progress: darken(@color-yellow-theme_2, 6%);
@color-yellow-player-progress-bar1: darken(@color-yellow-theme_2, 12%);
-@color-yellow-player-progress-bar2: lighten(@color-yellow-theme, 12%);
+@color-yellow-player-progress-bar2: lighten(@color-yellow-theme, 2%);
@color-yellow-player-status-text: lighten(@color-yellow-theme_2-font, 10%);
-@color-yellow-tab-btn-background: fadeout(lighten(@color-yellow-theme, 10%), 80%);
+@color-yellow-tab-btn-background: fadeout(lighten(@color-yellow-theme, 10%), 70%);
@color-yellow-tab-btn-background-hover: @color-yellow-theme_2-hover;
-@color-yellow-tab-border-top: fadeout(lighten(@color-yellow-theme, 5%), 50%);
-@color-yellow-tab-border-bottom: lighten(@color-yellow-theme, 5%);
+@color-yellow-tab-border-top: fadeout(lighten(@color-yellow-theme, 5%), 40%);
+@color-yellow-tab-border-bottom: @color-yellow-theme;

@color-orange-theme: #f5ab35;
@color-orange-theme-bgimg: none;
-@color-orange-theme-bgposition: center center;
+@color-orange-theme-bgposition: center;
@color-orange-theme-bgsize: auto auto;
@color-orange-theme-hover: fadeout(lighten(@color-orange-theme, 10%), 30%);
@color-orange-theme-active: fadeout(darken(@color-orange-theme, 20%), 60%);
@@ -177,7 +177,7 @@

@color-blue-theme: #3498db;
@color-blue-theme-bgimg: none;
-@color-blue-theme-bgposition: center center;
+@color-blue-theme-bgposition: center;
@color-blue-theme-bgsize: auto auto;
@color-blue-theme-hover: fadeout(lighten(@color-blue-theme, 10%), 30%);
@color-blue-theme-active: fadeout(darken(@color-blue-theme, 20%), 60%);
@@ -216,7 +216,7 @@

@color-red-theme: #d64541;
@color-red-theme-bgimg: none;
-@color-red-theme-bgposition: center center;
+@color-red-theme-bgposition: center;
@color-red-theme-bgsize: auto auto;
@color-red-theme-hover: fadeout(lighten(@color-red-theme, 10%), 30%);
@color-red-theme-active: fadeout(darken(@color-red-theme, 20%), 60%);
@@ -257,7 +257,7 @@

@color-purple-theme: #9b59b6;
@color-purple-theme-bgimg: none;
-@color-purple-theme-bgposition: center center;
+@color-purple-theme-bgposition: center;
@color-purple-theme-bgsize: auto auto;
@color-purple-theme-hover: fadeout(lighten(@color-purple-theme, 10%), 30%);
@color-purple-theme-active: fadeout(darken(@color-purple-theme, 20%), 60%);
@@ -296,7 +296,7 @@

@color-grey-theme: #6c7a89;
@color-grey-theme-bgimg: none;
-@color-grey-theme-bgposition: center center;
+@color-grey-theme-bgposition: center;
@color-grey-theme-bgsize: auto auto;
@color-grey-theme-hover: fadeout(lighten(@color-grey-theme, 10%), 30%);
@color-grey-theme-active: fadeout(darken(@color-grey-theme, 20%), 60%);
@@ -335,7 +335,7 @@

@color-midAutumn-theme: rgba(74, 55, 82, 1);
@color-midAutumn-theme-bgimg: url(../images/jqbg.jpg);
-@color-midAutumn-theme-bgposition: center center;
+@color-midAutumn-theme-bgposition: center;
@color-midAutumn-theme-bgsize: auto 100%;
@color-midAutumn-theme-hover: fadeout(lighten(@color-midAutumn-theme, 10%), 30%);
@color-midAutumn-theme-active: fadeout(lighten(@color-midAutumn-theme, 15%), 60%);
@@ -374,7 +374,7 @@

@color-dhHyrz-theme: rgb(87, 144, 167);
@color-dhHyrz-theme-bgimg: url(../images/hzwbg.jpeg);
-@color-dhHyrz-theme-bgposition: center center;
+@color-dhHyrz-theme-bgposition: center;
@color-dhHyrz-theme-bgsize: auto 100%;
@color-dhHyrz-theme-hover: fadeout(lighten(@color-dhHyrz-theme, 10%), 45%);
@color-dhHyrz-theme-active: fadeout(lighten(@color-dhHyrz-theme, 15%), 60%);
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -339,7 +339,7 @@ export default {
      } else if (this.isAPITemp) {
        list = this.list.filter(s => s.source == 'kw')
      } else {
-        list = this.list
+        list = this.list.filter(s => s.source != 'tx')
      }
      if (!list.length) return this.setPlayIndex(-1)
      let playIndex = this.list === list ? this.playIndex : list.indexOf(this.list[this.playIndex])
--- a/src/renderer/components/core/Toolbar.vue
+++ b/src/renderer/components/core/Toolbar.vue
@@ -13,7 +13,7 @@

 <script>
 import { rendererSend } from 'common/ipc'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import music from '../../utils/music'
 import { debounce } from '../../utils'
 export default {
@@ -34,15 +34,21 @@ export default {
    source() {
      return this.setting.search.tempSearchSource
    },
-    isAutoClearInput() {
+    isAutoClearSearchInput() {
      return this.setting.odc.isAutoClearSearchInput
    },
+    isAutoClearSearchList() {
+      return this.setting.odc.isAutoClearSearchList
+    },
  },
  watch: {
    route(n) {
-      if (this.isAutoClearInput && n.name != 'search' && this.searchText) this.searchText = ''
+      if (n.name != 'search') {
+        if (this.isAutoClearSearchInput && this.searchText) this.searchText = ''
+        if (this.isAutoClearSearchList) this.clearSearchList()
+      }
    },
-    'storeSearchText'(n) {
+    storeSearchText(n) {
      if (n !== this.searchText) this.searchText = n
    },
    searchText(n) {
@@ -62,6 +68,9 @@ export default {
    }, 50)
  },
  methods: {
+    ...mapMutations('search', {
+      clearSearchList: 'clearList',
+    }),
    handleEvent({ action, data }) {
      switch (action) {
        case 'focus':
@@ -127,7 +136,7 @@ export default {
  align-items: center;
  padding-left: 15px;
  -webkit-app-region: drag;
-  z-index: 1;
+  z-index: 100;
  position: relative;
 }
 .input {
--- a/src/renderer/components/material/Checkbox.vue
+++ b/src/renderer/components/material/Checkbox.vue
@@ -71,9 +71,9 @@ export default {
        let bool = this.bool
        if (this.indeterminate) {
          bool = true
-          // this.$nextTick(() => {
-          this.bool = true
-          // })
+          this.$nextTick(() => {
+            this.bool = bool
+          })
        }
        checked = bool
      } else {
--- a/src/renderer/components/material/SearchInput.vue
+++ b/src/renderer/components/material/SearchInput.vue
@@ -4,7 +4,9 @@ div(:class="[$style.search, focus ? $style.active : '', big ? $style.big : '', s
    input(:placeholder="placeholder" v-model.trim="text"
          @focus="handleFocus" @blur="handleBlur" @input="$emit('input', text)"
          @change="sendEvent('change')"
-          @keyup.enter="handleSearch")
+          @keyup.enter="handleSearch"
+          @keyup.40.prevent="handleKeyDown"
+          @keyup.38.prevent="handleKeyUp")
    button(type="button" @click="handleSearch")
      slot
        svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 30.239 30.239' space='preserve')
@@ -14,7 +16,7 @@ div(:class="[$style.search, focus ? $style.active : '', big ? $style.big : '', s
  //-             leave-active-class="animated flipOutX")
  div(v-if="list" :class="$style.list" :style="listStyle")
    ul(ref="dom_list")
-      li(v-for="(item, index) in list" :key="item" @click="handleTemplistClick(index)")
+      li(v-for="(item, index) in list" :key="item" :class="selectIndex === index ? $style.select : null" @mouseenter="selectIndex = index" @click="handleTemplistClick(index)")
        span {{item}}
 </template>

@@ -49,7 +51,7 @@ export default {
    return {
      isShow: false,
      text: '',
-      index: null,
+      selectIndex: -1,
      focus: false,
      listStyle: {
        height: 0,
@@ -59,6 +61,7 @@ export default {
  watch: {
    list(n) {
      if (!this.visibleList) return
+      if (this.selectIndex > -1) this.selectIndex = -1
      this.$nextTick(() => {
        this.listStyle.height = this.$refs.dom_list.scrollHeight + 'px'
      })
@@ -84,7 +87,8 @@ export default {
    },
    handleSearch() {
      this.hideList()
-      this.sendEvent('submit')
+      if (this.selectIndex < 0) return this.sendEvent('submit')
+      this.sendEvent('listClick', this.selectIndex)
    },
    showList() {
      this.isShow = true
@@ -93,6 +97,9 @@ export default {
    hideList() {
      this.isShow = false
      this.listStyle.height = 0
+      this.$nextTick(() => {
+        this.selectIndex = -1
+      })
    },
    sendEvent(action, data) {
      this.$emit('event', {
@@ -100,6 +107,12 @@ export default {
        data,
      })
    },
+    handleKeyDown() {
+      this.selectIndex = this.selectIndex + 1 < this.list.length ? this.selectIndex + 1 : 0
+    },
+    handleKeyUp() {
+      this.selectIndex = this.selectIndex - 1 < -1 ? this.list.length - 1 : this.selectIndex - 1
+    },
  },
 }
 </script>
@@ -187,7 +200,7 @@ export default {
        .mixin-ellipsis-2;
      }

-      &:hover {
+      &.select {
        background-color: @color-search-list-hover;
      }
      &:last-child {
@@ -239,7 +252,7 @@ each(@themes, {
      }
      .list {
        li {
-          &:hover {
+          &.select {
            background-color: ~'@{color-@{value}-search-list-hover}';
          }
        }
--- a/src/renderer/components/material/SongList.vue
+++ b/src/renderer/components/material/SongList.vue
@@ -29,9 +29,9 @@ div(:class="$style.songList")
              td(style="width: 20%; padding-left: 0; padding-right: 0;")
                material-list-buttons(:index="index" :search-btn="true"
                  :remove-btn="false" @btn-click="handleListBtnClick"
-                  :listAdd-btn="item.source == 'kw' || (!isAPITemp)"
-                  :play-btn="item.source == 'kw' || (!isAPITemp)"
-                  :download-btn="item.source == 'kw' || (!isAPITemp)")
+                  :listAdd-btn="item.source == 'kw' || !isAPITemp"
+                  :play-btn="item.source != 'tx' && (item.source == 'kw' || !isAPITemp)"
+                  :download-btn="item.source != 'tx' && (item.source == 'kw' || !isAPITemp)")
                //- 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)') ＋
@@ -40,7 +40,7 @@ div(:class="$style.songList")
          material-pagination(:count="total" :limit="limit" :page="page" @btn-click="handleTogglePage")
    div(v-else :class="$style.noitem")
      p(v-html="noItem")
-  material-flow-btn(:show="isShowEditBtn && (source == 'kw' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
+  material-flow-btn(:show="isShowEditBtn && source != 'tx' && (source == 'kw' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
 </template>

 <script>
@@ -140,7 +140,7 @@ export default {
        this.clickIndex = index
        return
      }
-      this.emitEvent((this.source == 'kw' || !this.isAPITemp) ? 'testPlay' : 'search', index)
+      this.emitEvent((this.source != 'tx' && (this.source == 'kw' || !this.isAPITemp)) ? 'testPlay' : 'search', index)
      this.clickTime = 0
      this.clickIndex = -1
    },
--- a/src/renderer/utils/index.js
+++ b/src/renderer/utils/index.js
@@ -177,7 +177,7 @@ export const isChildren = (parent, children) => {
 * @param {*} setting
 */
 export const updateSetting = setting => {
-  const defaultVersion = '1.0.13'
+  const defaultVersion = '1.0.14'
  const defaultSetting = {
    version: defaultVersion,
    player: {
@@ -215,6 +215,7 @@ export const updateSetting = setting => {
    },
    odc: {
      isAutoClearSearchInput: false,
+      isAutoClearSearchList: false,
    },
    search: {
      searchSource: 'kw',
--- a/src/renderer/views/List.vue
+++ b/src/renderer/views/List.vue
@@ -18,7 +18,7 @@
        table
          tbody
            tr(v-for='(item, index) in list' :key='item.songmid' :id="'mid_' + item.songmid"
-              @click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', (isAPITemp && item.source != 'kw') ? $style.disabled : '']")
+              @click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', (isAPITemp && item.source != 'kw') || item.source == 'tx' ? $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%;")
@@ -243,7 +243,7 @@ export default {
      this.clickIndex = -1
    },
    testPlay(index) {
-      if (this.isAPITemp && this.list[index].source != 'kw') return
+      if (this.list[index].source == 'tx' || (this.isAPITemp && this.list[index].source != 'kw')) return
      this.setPlayList({ list: this.list, listId: this.listId, index })
    },
    handleRemove(index) {
@@ -253,7 +253,7 @@ export default {
      switch (info.action) {
        case 'download': {
          const minfo = this.list[info.index]
-          if (this.isAPITemp && minfo.source != 'kw') return
+          if ((this.isAPITemp && minfo.source != 'kw') || minfo.source == 'tx') return
          this.musicInfo = minfo
          this.$nextTick(() => {
            this.isShowDownload = true
@@ -286,7 +286,7 @@ export default {
      this.selectdData = []
    },
    handleAddDownloadMultiple(type) {
-      const list = this.setting.apiSource == 'temp' ? this.selectdData.filter(s => s.source == 'kw') : [...this.selectdData]
+      const list = this.setting.apiSource == 'temp' ? this.selectdData.filter(s => s.source == 'kw') : this.selectdData.filter(s => s.source != 'tx')
      this.createDownloadMultiple({ list, type })
      this.resetSelect()
      this.isShowDownloadMultiple = false
--- a/src/renderer/views/Search.vue
+++ b/src/renderer/views/Search.vue
@@ -26,12 +26,13 @@
                | {{item.name}}
                span.badge.badge-info(v-if="item._types['320k']") 高品质
                span.badge.badge-success(v-if="item._types.ape || item._types.flac") 无损
+                span(:class="$style.labelSource" v-if="searchSourceId == 'all'") {{item.source}}
              td.break(style="width: 20%;") {{item.singer}}
              td.break(style="width: 25%;") {{item.albumName}}
              td(style="width: 15%; padding-left: 0; padding-right: 0;")
                material-list-buttons(:index="index" :remove-btn="false" :class="$style.listBtn"
-                  :play-btn="item.source == 'kw' || !isAPITemp"
-                  :download-btn="item.source == 'kw' || !isAPITemp"
+                  :play-btn="item.source != 'tx' && (item.source == 'kw' || !isAPITemp)"
+                  :download-btn="item.source != 'tx' && (item.source == 'kw' || !isAPITemp)"
                  @btn-click="handleListBtnClick")
              td(style="width: 10%;") {{item.interval || '--/--'}}
        div(:class="$style.pagination")
@@ -40,7 +41,7 @@
      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 && (searchSourceId == 'kw' || searchSourceId == 'all' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
+    material-flow-btn(:show="isShowEditBtn && searchSourceId != 'tx' && (searchSourceId == 'kw' || searchSourceId == 'all' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
    material-list-add-modal(:show="isShowListAdd" :musicInfo="musicInfo" @close="isShowListAdd = false")
    material-list-add-multiple-modal(:show="isShowListAddMultiple" :musicList="selectdData" @close="handleListAddModalClose")
 </template>
@@ -189,7 +190,7 @@ export default {
        targetSong = this.selectdData[0]
        this.listAddMultiple({ id: 'default', list: this.filterList(this.selectdData) })
      } else {
-        if (this.isAPITemp && this.listInfo.list[index].source != 'kw') return
+        if (this.listInfo.list[index].source == 'tx' || (this.isAPITemp && this.listInfo.list[index].source != 'kw')) return
        targetSong = this.listInfo.list[index]
        this.listAdd({ id: 'default', musicInfo: targetSong })
      }
@@ -238,7 +239,7 @@ export default {
      }
    },
    filterList(list) {
-      return this.setting.apiSource == 'temp' ? list.filter(s => s.source == 'kw') : [...list]
+      return this.setting.apiSource == 'temp' ? list.filter(s => s.source == 'kw') : list.filter(s => s.source != 'tx')
    },
    handleListAddModalClose(isSelect) {
      if (isSelect) this.resetSelect()
@@ -291,6 +292,13 @@ export default {
 .listBtn {
  min-height: 24px;
 }
+.labelSource {
+  color: @color-theme;
+  padding: 5px;
+  font-size: .8em;
+  line-height: 1;
+  opacity: .75;
+}
 .pagination {
  text-align: center;
  padding: 15px 0;
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -93,6 +93,10 @@ div.scroll(:class="$style.setting")
      h3 离开搜索界面时清空搜索框
      div
        material-checkbox(id="setting_odc_isAutoClearSearchInput" v-model="current_setting.odc.isAutoClearSearchInput" label="是否启用")
+    dd
+      h3 离开搜索界面时清空搜索列表
+      div
+        material-checkbox(id="setting_odc_isAutoClearSearchList" v-model="current_setting.odc.isAutoClearSearchList" label="是否启用")
    dt 备份与恢复
    dd
      h3 部分数据
@@ -108,7 +112,7 @@ div.scroll(:class="$style.setting")
        material-btn(:class="[$style.btn, $style.gapLeft]" min @click="handleExportAllData") 导出
    dt 其他
    dd
-      h3 缓存大小（清理缓存后图片等资源将需要重新下载，不建议清除，软件会自动将大小维持在200M左右）
+      h3 缓存大小（清理缓存后图片等资源将需要重新下载，不建议清理，软件会根据磁盘空间动态管理缓存大小）
      div
        p
          | 软件已使用缓存大小：
@@ -241,6 +245,7 @@ export default {
        },
        odc: {
          isAutoClearSearchInput: false,
+          isAutoClearSearchList: false,
        },
        windowSizeId: 1,
        themeId: 0,
@@ -267,25 +272,14 @@ export default {
        },
      ],
      apiSources: [
-        // {
-        //   id: 'messoer',
-        //   // label: '由 messoer 提供的接口（推荐，软件的所有功能都可用）',
-        //   label: '由 messoer 提供的接口（该接口已关闭）',
-        //   disabled: true,
-        // },
-        // {
-        //   id: 'internal',
-        //   label: '内置接口（只能试听或下载128k音质，该接口支持软件的所有功能）',
-        //   disabled: false,
-        // },
        {
          id: 'test',
-          label: '测试接口（几乎软件的所有功能都可用，该接口访问速度略慢）',
+          label: '测试接口（几乎软件的所有功能都可用）',
          disabled: false,
        },
        {
          id: 'temp',
-          label: '临时接口（软件的某些功能不可用，该接口比测试接口快一些，建议测试接口不可用再使用本接口）',
+          label: '临时接口（软件的某些功能不可用，建议测试接口不可用再使用本接口）',
          disabled: false,
        },
      ],
--- a/src/renderer/views/SongList.vue
+++ b/src/renderer/views/SongList.vue
@@ -183,10 +183,11 @@ export default {
      let targetSong
      if (index == null) {
        targetSong = this.selectdData[0]
-        this.listAddMultiple({ id: 'default', list: this.selectdData })
+        this.listAddMultiple({ id: 'default', list: this.filterList(this.selectdData) })
        this.resetSelect()
      } else {
        targetSong = this.listDetail.list[index]
+        if (targetSong.source == 'tx' || (this.isAPITemp && targetSong.source != 'kw')) return
        this.listAdd({ id: 'default', musicInfo: targetSong })
      }
      let targetIndex = this.defaultList.list.findIndex(
@@ -234,7 +235,7 @@ export default {
        case 'wy':
          type = '128k'
      }
-      this.createDownloadMultiple({ list: [...this.selectdData], type })
+      this.createDownloadMultiple({ list: this.filterList(this.selectdData), type })
      this.resetSelect()
      this.isShowDownloadMultiple = false
    },
@@ -345,6 +346,9 @@ export default {
      }
      this.importSongListText = text.replace(regx, '$1')
    },
+    filterList(list) {
+      return this.setting.apiSource == 'temp' ? list.filter(s => s.source == 'kw') : list.filter(s => s.source != 'tx')
+    },
    /*     addSongListDetail() {
      // this.detailLoading = true
      // this.getListDetailAll(this.selectListInfo.id).then(() => {
Author	SHA1	Message	Date
lyswhut	a126e5b4c8	发布0.13.0版本	2019-12-15 21:33:46 +08:00
lyswhut	033c3cd8e9	多修复选框不定状态到选中的Bug	2019-12-15 21:23:52 +08:00
lyswhut	50d029c671	移除Q音源的试听与下载	2019-12-15 21:03:19 +08:00
lyswhut	6a3f7e6150	修复搜索建议列表被弹出层覆盖的问题	2019-12-15 19:18:31 +08:00
lyswhut	aadfbefbe9	更新electron及vue到最新	2019-12-14 14:01:53 +08:00
lyswhut	edbcaf0f90	优化“信口雌黄”皮肤配色	2019-12-14 13:54:22 +08:00
lyswhut	207427e993	新增“离开搜索界面时清空搜索列表”设置	2019-12-13 13:34:35 +08:00
lyswhut	e109dd876a	修正缓存描述	2019-12-13 13:09:44 +08:00
lyswhut	64ac69c48b	聚合搜索新增音源显示	2019-12-11 16:05:07 +08:00
lyswhut	652b06c116	更新依赖到最新	2019-12-06 20:55:12 +08:00
lyswhut	654035a469	update issue template	2019-12-04 10:45:31 +08:00
lyswhut	cd50e0086b	update issue template	2019-12-03 13:03:09 +08:00
lyswhut	66a119e9dc	新增搜索框搜索建议键盘上下方向键选择功能	2019-12-02 20:46:27 +08:00
lyswhut	14ec7d48f6	更新接口文字描述	2019-12-01 14:29:26 +08:00