From 207427e99373b2edf549c22bc1c53dd9c701022d Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 13 Dec 2019 13:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9C=E7=A6=BB=E5=BC=80?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=95=8C=E9=9D=A2=E6=97=B6=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=88=97=E8=A1=A8=E2=80=9D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                     |  1 +
 src/renderer/components/core/Toolbar.vue | 17 +++++++++++++----
 src/renderer/utils/index.js              |  3 ++-
 src/renderer/views/Setting.vue           |  5 +++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index ae762557..b011d1f8 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -2,6 +2,7 @@
 
 - 新增搜索框搜索建议键盘上下方向键选择功能
 - 聚合搜索新增音源显示
+- 新增“离开搜索界面时清空搜索列表”设置选项，默认关闭，可到设置-强迫症设置开启
 
 ### 其他
 
diff --git a/src/renderer/components/core/Toolbar.vue b/src/renderer/components/core/Toolbar.vue
index a6de9205..8acf0429 100644
--- 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':
diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js
index 95b099f8..47d25e09 100644
--- 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',
diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue
index ef7d3439..9de39fab 100644
--- 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 部分数据
@@ -241,6 +245,7 @@ export default {
         },
         odc: {
           isAutoClearSearchInput: false,
+          isAutoClearSearchList: false,
         },
         windowSizeId: 1,
         themeId: 0,