fix: the lyrics are not displayed properly under the Electron platform

radishes-music · Nov 28, 2020 · 77fd0af · 77fd0af
1 parent 3f8a71f
commit 77fd0af
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/src/components/process-bar/block.less b/src/components/process-bar/block.less
@@ -4,6 +4,7 @@
   left: 0;
   width: 100%;
   height: 100%;
+  overflow: hidden;
   > div {
     position: absolute;
     height: 100%;

diff --git a/src/electron/event/ipc-renderer/index.ts b/src/electron/event/ipc-renderer/index.ts
@@ -23,10 +23,10 @@ export function sendAsyncIpcRendererEvent(
   ipcRenderer.send(action, message)
 }
 
-export function sendSyncIpcRendererEvent(
+export function sendSyncIpcRendererEvent<T>(
   action: ActionType,
   message?: Message
-) {
+): T {
   return ipcRenderer.sendSync(action, message)
 }
 

diff --git a/src/pages/footer/component/lyrice-flash/browser-lyrice.tsx b/src/pages/footer/component/lyrice-flash/browser-lyrice.tsx
@@ -1,4 +1,11 @@
-import { defineComponent, computed, toRefs, watch, toRaw } from 'vue'
+import {
+  defineComponent,
+  computed,
+  toRefs,
+  watch,
+  toRaw,
+  watchEffect
+} from 'vue'
 import { uesModuleStore } from '@/hooks/index'
 import { toFixed } from '@/utils/index'
 import {
@@ -89,9 +96,7 @@ export const BrowserLyriceFlash = defineComponent({
       })
       watch(index, v => {
         ipcUpdateLyrice(UpdateType.UPDATE_INDEX, v)
-      })
-      watch(lyrice, v => {
-        ipcUpdateLyrice(UpdateType.UPDATE_LYRICE, v)
+        ipcUpdateLyrice(UpdateType.UPDATE_LYRICE, lyrice.value)
       })
       watch(playing, v => {
         ipcUpdateLyrice(UpdateType.UPDATE_PLAYING, v)

diff --git a/src/pages/footer/component/lyrice-flash/electron-lyrice.tsx b/src/pages/footer/component/lyrice-flash/electron-lyrice.tsx
@@ -8,6 +8,7 @@ import {
   UpdateType
 } from '@/electron/event/action-types'
 import { ErrorBoundary } from '@/components/error-boundary/index'
+import { isEqual } from 'lodash'
 
 import { ipcRenderer } from 'electron'
 
@@ -63,7 +64,11 @@ export default defineComponent({
             postData.index = payload as PostData['index']
             break
           case UpdateType.UPDATE_LYRICE:
-            if ((payload as PostData['lyrice']).length !== 0) {
+            if (
+              (payload as PostData['lyrice']).length !== 0 &&
+              !isEqual(payload, postData.lyrice)
+            ) {
+              console.log(payload)
               postData.lyrice = payload as PostData['lyrice']
             }
             break