From f3076f21b2cec5116a58b2e97661b950b8fca5d9 Mon Sep 17 00:00:00 2001
From: qier222 <qier222@outlook.com>
Date: Wed, 9 Jun 2021 20:53:33 +0800
Subject: [PATCH] fix: bugs

---
 src/App.vue                                | 8 ++++++--
 src/components/ContextMenu.vue             | 6 ++----
 src/components/ModalAddTrackToPlaylist.vue | 5 ++---
 src/components/ModalNewPlaylist.vue        | 5 ++---
 src/store/mutations.js                     | 8 +++++---
 src/store/state.js                         | 1 +
 src/utils/db.js                            | 2 +-
 src/utils/ui.js                            | 7 -------
 src/views/album.vue                        | 5 ++---
 src/views/artist.vue                       | 5 ++---
 src/views/lyrics.vue                       | 5 ++---
 src/views/playlist.vue                     | 5 ++---
 src/views/settings.vue                     | 6 +++++-
 13 files changed, 32 insertions(+), 36 deletions(-)
 delete mode 100644 src/utils/ui.js

diff --git a/src/App.vue b/src/App.vue
index cca5d67..b9d7d41 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,11 @@
   <div id="app" :class="{ 'user-select-none': userSelectNone }">
     <Scrollbar v-show="!showLyrics" ref="scrollbar" />
     <Navbar v-show="showNavbar" ref="navbar" />
-    <main ref="main" @scroll="handleScroll">
+    <main
+      ref="main"
+      :style="{ overflow: enableScrolling ? 'auto' : 'hidden' }"
+      @scroll="handleScroll"
+    >
       <keep-alive>
         <router-view v-if="$route.meta.keepAlive"></router-view>
       </keep-alive>
@@ -50,7 +54,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(['showLyrics', 'settings', 'player']),
+    ...mapState(['showLyrics', 'settings', 'player', 'enableScrolling']),
     isAccountLoggedIn() {
       return isAccountLoggedIn();
     },
diff --git a/src/components/ContextMenu.vue b/src/components/ContextMenu.vue
index 5311627..dd6365b 100644
--- a/src/components/ContextMenu.vue
+++ b/src/components/ContextMenu.vue
@@ -15,8 +15,6 @@
 </template>
 
 <script>
-import { disableScrolling, enableScrolling } from '@/utils/ui';
-
 export default {
   name: 'ContextMenu',
   data() {
@@ -42,7 +40,7 @@ export default {
       if (this.$parent.closeMenu !== undefined) {
         this.$parent.closeMenu();
       }
-      enableScrolling();
+      this.$store.commit('enableScrolling', true);
     },
 
     openMenu(e) {
@@ -54,7 +52,7 @@ export default {
         }.bind(this)
       );
       e.preventDefault();
-      disableScrolling();
+      this.$store.commit('enableScrolling', false);
     },
   },
 };
diff --git a/src/components/ModalAddTrackToPlaylist.vue b/src/components/ModalAddTrackToPlaylist.vue
index f1dbfa9..193bcd4 100644
--- a/src/components/ModalAddTrackToPlaylist.vue
+++ b/src/components/ModalAddTrackToPlaylist.vue
@@ -32,7 +32,6 @@ import { mapActions, mapMutations, mapState } from 'vuex';
 import Modal from '@/components/Modal.vue';
 import locale from '@/locale';
 import { addOrRemoveTrackFromPlaylist } from '@/api/playlist';
-import { disableScrolling, enableScrolling } from '@/utils/ui';
 
 export default {
   name: 'ModalAddTrackToPlaylist',
@@ -57,9 +56,9 @@ export default {
           value,
         });
         if (value) {
-          disableScrolling();
+          this.$store.commit('enableScrolling', false);
         } else {
-          enableScrolling();
+          this.$store.commit('enableScrolling', true);
         }
       },
     },
diff --git a/src/components/ModalNewPlaylist.vue b/src/components/ModalNewPlaylist.vue
index 9e89896..29e997e 100644
--- a/src/components/ModalNewPlaylist.vue
+++ b/src/components/ModalNewPlaylist.vue
@@ -33,7 +33,6 @@ import Modal from '@/components/Modal.vue';
 import locale from '@/locale';
 import { mapMutations, mapState, mapActions } from 'vuex';
 import { createPlaylist, addOrRemoveTrackFromPlaylist } from '@/api/playlist';
-import { disableScrolling, enableScrolling } from '@/utils/ui';
 
 export default {
   name: 'ModalNewPlaylist',
@@ -59,9 +58,9 @@ export default {
           value,
         });
         if (value) {
-          disableScrolling();
+          this.$store.commit('enableScrolling', false);
         } else {
-          enableScrolling();
+          this.$store.commit('enableScrolling', true);
         }
       },
     },
diff --git a/src/store/mutations.js b/src/store/mutations.js
index b1ac036..42c3c8e 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -1,4 +1,3 @@
-import { disableScrolling, enableScrolling } from '@/utils/ui';
 import shortcuts from '@/utils/shortcuts';
 import cloneDeep from 'lodash/cloneDeep';
 
@@ -47,8 +46,8 @@ export default {
     if (key === 'show') {
       // 100ms的延迟是为等待右键菜单blur之后再disableScrolling
       value === true
-        ? setTimeout(() => disableScrolling(), 100)
-        : enableScrolling();
+        ? setTimeout(() => (state.enableScrolling = false), 100)
+        : (state.enableScrolling = true);
     }
   },
   toggleLyrics(state) {
@@ -71,4 +70,7 @@ export default {
   restoreDefaultShortcuts(state) {
     state.settings.shortcuts = cloneDeep(shortcuts);
   },
+  enableScrolling(state, status = null) {
+    state.enableScrolling = status ? status : !state.enableScrolling;
+  },
 };
diff --git a/src/store/state.js b/src/store/state.js
index a0e04b1..4de913a 100644
--- a/src/store/state.js
+++ b/src/store/state.js
@@ -12,6 +12,7 @@ updateApp();
 
 export default {
   showLyrics: false,
+  enableScrolling: true,
   liked: {
     songs: [],
     songsWithDetails: [], // 只有前12首
diff --git a/src/utils/db.js b/src/utils/db.js
index e966fa5..9edd2c2 100644
--- a/src/utils/db.js
+++ b/src/utils/db.js
@@ -137,7 +137,7 @@ export function getLyricFromCache(id) {
 
 export function cacheAlbum(id, album) {
   db.album.put({
-    id,
+    id: Number(id),
     album,
     updateTime: new Date().getTime(),
   });
diff --git a/src/utils/ui.js b/src/utils/ui.js
deleted file mode 100644
index d005bb8..0000000
--- a/src/utils/ui.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export function disableScrolling() {
-  document.documentElement.style.setProperty('--html-overflow-y', 'hidden');
-}
-
-export function enableScrolling() {
-  document.documentElement.style.setProperty('--html-overflow-y', 'overlay');
-}
diff --git a/src/views/album.vue b/src/views/album.vue
index f953b25..cfda084 100644
--- a/src/views/album.vue
+++ b/src/views/album.vue
@@ -137,7 +137,6 @@ import locale from '@/locale';
 import { splitSoundtrackAlbumTitle, splitAlbumTitle } from '@/utils/common';
 import NProgress from 'nprogress';
 import { isAccountLoggedIn } from '@/utils/auth';
-import { disableScrolling, enableScrolling } from '@/utils/ui';
 
 import ExplicitSymbol from '@/components/ExplicitSymbol.vue';
 import ButtonTwoTone from '@/components/ButtonTwoTone.vue';
@@ -279,9 +278,9 @@ export default {
     toggleFullDescription() {
       this.showFullDescription = !this.showFullDescription;
       if (this.showFullDescription) {
-        disableScrolling();
+        this.$store.commit('enableScrolling', false);
       } else {
-        enableScrolling();
+        this.$store.commit('enableScrolling', true);
       }
     },
     openMenu(e) {
diff --git a/src/views/artist.vue b/src/views/artist.vue
index a290ea9..586a13e 100644
--- a/src/views/artist.vue
+++ b/src/views/artist.vue
@@ -184,7 +184,6 @@ import {
 } from '@/api/artist';
 import locale from '@/locale';
 import { isAccountLoggedIn } from '@/utils/auth';
-import { disableScrolling, enableScrolling } from '@/utils/ui';
 import NProgress from 'nprogress';
 
 import ButtonTwoTone from '@/components/ButtonTwoTone.vue';
@@ -330,9 +329,9 @@ export default {
     toggleFullDescription() {
       this.showFullDescription = !this.showFullDescription;
       if (this.showFullDescription) {
-        disableScrolling();
+        this.$store.commit('enableScrolling', false);
       } else {
-        enableScrolling();
+        this.$store.commit('enableScrolling', true);
       }
     },
     openMenu(e) {
diff --git a/src/views/lyrics.vue b/src/views/lyrics.vue
index 6a476d2..73ddd6a 100644
--- a/src/views/lyrics.vue
+++ b/src/views/lyrics.vue
@@ -204,7 +204,6 @@ import VueSlider from 'vue-slider-component';
 import { formatTrackTime } from '@/utils/common';
 import { getLyric } from '@/api/track';
 import { lyricParser } from '@/utils/lyrics';
-import { disableScrolling, enableScrolling } from '@/utils/ui';
 import ButtonIcon from '@/components/ButtonIcon.vue';
 import * as Vibrant from 'node-vibrant';
 import Color from 'color';
@@ -295,10 +294,10 @@ export default {
     showLyrics(show) {
       if (show) {
         this.setLyricsInterval();
-        disableScrolling();
+        this.$store.commit('enableScrolling', false);
       } else {
         clearInterval(this.lyricsInterval);
-        enableScrolling();
+        this.$store.commit('enableScrolling', true);
       }
     },
   },
diff --git a/src/views/playlist.vue b/src/views/playlist.vue
index 93cdba0..53b04d4 100644
--- a/src/views/playlist.vue
+++ b/src/views/playlist.vue
@@ -231,7 +231,6 @@ import { getTrackDetail } from '@/api/track';
 import { isAccountLoggedIn } from '@/utils/auth';
 import nativeAlert from '@/utils/nativeAlert';
 import locale from '@/locale';
-import { disableScrolling, enableScrolling } from '@/utils/ui';
 
 import ButtonTwoTone from '@/components/ButtonTwoTone.vue';
 import ContextMenu from '@/components/ContextMenu.vue';
@@ -534,9 +533,9 @@ export default {
     toggleFullDescription() {
       this.showFullDescription = !this.showFullDescription;
       if (this.showFullDescription) {
-        disableScrolling();
+        this.$store.commit('enableScrolling', false);
       } else {
-        enableScrolling();
+        this.$store.commit('enableScrolling', true);
       }
     },
   },
diff --git a/src/views/settings.vue b/src/views/settings.vue
index c890cb0..dc9c44f 100644
--- a/src/views/settings.vue
+++ b/src/views/settings.vue
@@ -445,7 +445,8 @@
                 :class="{
                   active:
                     shortcutInput.id === shortcut.id &&
-                    shortcutInput.type === 'globalShortcut',
+                    shortcutInput.type === 'globalShortcut' &&
+                    enableGlobalShortcut,
                 }"
                 @click.stop="
                   readyToRecordShortcut(shortcut.id, 'globalShortcut')
@@ -927,6 +928,9 @@ export default {
       return shortcut.replace('CommandOrControl', 'Ctrl');
     },
     readyToRecordShortcut(id, type) {
+      if (type === 'globalShortcut' && this.enableGlobalShortcut === false) {
+        return;
+      }
       this.shortcutInput = { id, type, recording: true };
       this.recordedShortcut = [];
       ipcRenderer.send('switchGlobalShortcutStatusTemporary', 'disable');