From d557149326fe717e1380e21af5da8e11a3aef7dd Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 15 Feb 2020 18:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=96=B0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=97=B6=E6=B8=85=E7=A9=BA=E5=BD=93=E5=89=8D=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                          |  2 +-
 src/renderer/components/material/SongList.vue | 12 ++++++++----
 src/renderer/store/modules/leaderboard.js     |  5 +++++
 src/renderer/views/SongList.vue               |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index bb769c0c..266b289c 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -9,7 +9,7 @@
 
 - 优化木叶之村主题翻页器背景颜色
 - 优化各个主题音质标签颜色
-- 优化其他一些界面细节
+- 优化其他一些界面细节及用户交互效果
 
 ### 修复
 
diff --git a/src/renderer/components/material/SongList.vue b/src/renderer/components/material/SongList.vue
index 89a61152..ff0642a0 100644
--- a/src/renderer/components/material/SongList.vue
+++ b/src/renderer/components/material/SongList.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 div(:class="$style.songList")
-  transition(enter-active-class="animated fadeIn" leave-active-class="animated fadeOut")
-    div(v-if="list.length" :class="$style.list")
+  transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut")
+    div(v-show="list.length" :class="$style.list")
       div(:class="$style.thead")
         table
           thead
@@ -41,7 +41,8 @@ div(:class="$style.songList")
                 span(:class="$style.time") {{item.interval || '--/--'}}
         div(:class="$style.pagination")
           material-pagination(:count="total" :limit="limit" :page="page" @btn-click="handleTogglePage")
-    div(v-else :class="$style.noitem")
+  transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut")
+    div(v-show="!list.length" :class="$style.noitem")
       p(v-html="noItem")
   material-flow-btn(:show="isShowEditBtn && (source == 'kw' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
 </template>
@@ -234,8 +235,11 @@ export default {
   // transform: translateX(-50%);
 }
 .noitem {
-  position: relative;
+  position: absolute;
+  top: 0;
+  left: 0;
   height: 100%;
+  width: 100%;
   display: flex;
   flex-flow: column nowrap;
   justify-content: center;
diff --git a/src/renderer/store/modules/leaderboard.js b/src/renderer/store/modules/leaderboard.js
index a5916d39..1a623131 100644
--- a/src/renderer/store/modules/leaderboard.js
+++ b/src/renderer/store/modules/leaderboard.js
@@ -39,6 +39,7 @@ const actions = {
     let tabId = rootState.setting.leaderboard.tabId
     let key = `${source}${tabId}${page}}`
     if (state.list.length && state.key == key) return true
+    commit('clearList')
     return music[source].leaderboard.getList(tabId, page).then(result => commit('setList', { result, key }))
   },
 }
@@ -52,6 +53,10 @@ const mutations = {
     state.page = result.page
     state.key = key
   },
+  clearList(state) {
+    state.list = []
+    state.total = 0
+  },
 }
 
 export default {
diff --git a/src/renderer/views/SongList.vue b/src/renderer/views/SongList.vue
index abcade1a..8911b4cd 100644
--- a/src/renderer/views/SongList.vue
+++ b/src/renderer/views/SongList.vue
@@ -319,7 +319,7 @@ export default {
       })
     },
     parseImportSongListInputText() {
-      if (!/[?&:/]/.test(this.importSongListText)) return
+      if (!(/[?&:/]/.test(this.importSongListText))) return
       const text = this.importSongListText
       let regx
       switch (this.source) {