From ffc3300fe487211a8fe8aae9b075d5fa37a0f911 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 26 Jun 2020 01:12:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/events/_name.js             | 1 -
 src/main/events/winLyric.js          | 4 ----
 src/main/modules/winLyric/event.js   | 1 -
 src/renderer/App.vue                 | 8 ++------
 src/renderer/event/index.js          | 2 +-
 src/renderer/store/modules/search.js | 3 +--
 6 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/main/events/_name.js b/src/main/events/_name.js
index ebdf1937..4eb8650f 100644
--- a/src/main/events/_name.js
+++ b/src/main/events/_name.js
@@ -22,7 +22,6 @@ exports.winLyric = {
   name: 'winLyric',
   create: 'create',
   close: 'close',
-  inited: 'inited',
 }
 
 exports.hotKey = {
diff --git a/src/main/events/winLyric.js b/src/main/events/winLyric.js
index 88e496f7..66772945 100644
--- a/src/main/events/winLyric.js
+++ b/src/main/events/winLyric.js
@@ -10,10 +10,6 @@ class WinLyric extends EventEmitter {
   close() {
     this.emit(WIN_LYRIC_EVENT_NAME.close)
   }
-
-  inited() {
-    this.emit(WIN_LYRIC_EVENT_NAME.inited)
-  }
 }
 
 module.exports = WinLyric
diff --git a/src/main/modules/winLyric/event.js b/src/main/modules/winLyric/event.js
index 49912d91..d9f19b7b 100644
--- a/src/main/modules/winLyric/event.js
+++ b/src/main/modules/winLyric/event.js
@@ -38,7 +38,6 @@ global.lx_event.common.on(COMMON_EVENT_NAME.config, name => {
   if (WIN_LYRIC_EVENT_NAME.name === name) return
   setLrcConfig(false)
 })
-// global.lx_event.winLyric.on(WIN_LYRIC_EVENT_NAME.inited, () => setLrcConfig(true))
 
 global.lx_event.mainWindow.on(MAIN_WINDOW_EVENT_NAME.setLyricInfo, info => {
   if (!global.modules.lyricWindow) return
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 3bb38f4d..e417c65f 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-#container(v-if="isProd && !isNt" :class="[theme, nd ? 'nd' : '']" @mouseenter="enableIgnoreMouseEvents" @mouseleave="dieableIgnoreMouseEvents")
+#container(v-if="isProd && !isNt" :class="theme" @mouseenter="enableIgnoreMouseEvents" @mouseleave="dieableIgnoreMouseEvents")
   core-aside#left
   #right
     core-toolbar#toolbar
@@ -9,7 +9,7 @@
   material-xm-verify-modal(v-show="globalObj.xm.isShowVerify" :show="globalObj.xm.isShowVerify" :bg-close="false" @close="handleXMVerifyModalClose")
   material-version-modal(v-show="version.showModal")
   material-pact-modal(v-show="!setting.isAgreePact || globalObj.isShowPact")
-#container(v-else :class="[theme, nd ? 'nd' : '']")
+#container(v-else :class="theme")
   core-aside#left
   #right
     core-toolbar#toolbar
@@ -58,7 +58,6 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('player', ['isShowPlayerDetail']),
     ...mapGetters(['setting', 'theme', 'version', 'windowSizeActive']),
     ...mapGetters('list', ['defaultList', 'loveList', 'userList']),
     ...mapGetters('download', {
@@ -68,9 +67,6 @@ export default {
     ...mapGetters('search', {
       searchHistoryList: 'historyList',
     }),
-    nd() {
-      return this.isShowPlayerDetail
-    },
   },
   created() {
     this.saveDefaultList = throttle(n => {
diff --git a/src/renderer/event/index.js b/src/renderer/event/index.js
index bec763e4..495d4085 100644
--- a/src/renderer/event/index.js
+++ b/src/renderer/event/index.js
@@ -62,7 +62,7 @@ rendererOn(NAMES.mainWindow.focus, () => {
   eventHub.$emit(baseName.focus)
 })
 rendererOn(NAMES.mainWindow.key_down, (event, { type, key }) => {
-  console.log(appHotKeyConfig.global.keys[key])
+  // console.log(appHotKeyConfig.global.keys[key])
   if (appHotKeyConfig.global.keys[key]) {
     window.eventHub.$emit(appHotKeyConfig.global.keys[key].action)
   }
diff --git a/src/renderer/store/modules/search.js b/src/renderer/store/modules/search.js
index 4490e824..f8b06b80 100644
--- a/src/renderer/store/modules/search.js
+++ b/src/renderer/store/modules/search.js
@@ -179,12 +179,11 @@ const mutations = {
       total += source.total
       limit += source.limit
     }
-    list = handleSortList(list, state.text)
     state.allPage = Math.max(...pages)
     state.total = total
     state.limit = limit
     state.page = page
-    state.list = list
+    state.list = handleSortList(list, state.text)
   },
   clearList(state) {
     for (const source of Object.keys(state.sourceList)) {