From 289d7e0b8b6804833e0b57ea49cce6cc25adcdb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=81=8C=E7=B3=96=E5=8C=85=E5=AD=90?=
 <colorfulsweet@icloud.com>
Date: Thu, 26 Jan 2023 06:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=8C=E8=AF=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/aplayer/components/aplayer-lrc.vue    | 24 +++++++------------
 src/views/api/aplayer/vue-aplayer.vue         |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/views/api/aplayer/components/aplayer-lrc.vue b/src/views/api/aplayer/components/aplayer-lrc.vue
index 8833a12..41efce1 100644
--- a/src/views/api/aplayer/components/aplayer-lrc.vue
+++ b/src/views/api/aplayer/components/aplayer-lrc.vue
@@ -18,10 +18,10 @@
 <script lang="ts" setup>
 import { computed, watch, ref } from 'vue'
 import { parseLrc } from '../utils'
-import { MusicPlayerItem, StatType } from '@/model/api/music'
+import { StatType } from '@/model/api/music'
 
 const props = defineProps<{
-  currentMusic: MusicPlayerItem,
+  lrcSource: string,
   playStat: StatType
 }>()
 
@@ -37,22 +37,14 @@ const transformStyle = computed(() => {
   }
 })
 
-const applyLrc = (lrc: string) => {
-  if (/^https?:\/\//.test(lrc)) {
-    fetch(lrc)
-      .then(response => response.text())
-      .then((lrc) => displayLrc.value = lrc)
-  } else {
-    displayLrc.value = lrc
-  }
-}
-
-watch(props.currentMusic, (music: MusicPlayerItem) => {
+watch(() => props.lrcSource, (lrcSource: string) => {
   currentLineIndex.value = 0
-  if (music.lrc) {
-    applyLrc(music.lrc)
+  if (/^https?:\/\//.test(lrcSource)) {
+    fetch(lrcSource)
+      .then(response => response.text())
+      .then(lrc => displayLrc.value = lrc)
   } else {
-    displayLrc.value = ''
+    displayLrc.value = lrcSource
   }
 }, { immediate: true })
 
diff --git a/src/views/api/aplayer/vue-aplayer.vue b/src/views/api/aplayer/vue-aplayer.vue
index 37347b1..cd361bc 100644
--- a/src/views/api/aplayer/vue-aplayer.vue
+++ b/src/views/api/aplayer/vue-aplayer.vue
@@ -26,7 +26,7 @@
           <span class="aplayer-author">{{ currentMusic.artist || currentMusic.author || 'Unknown' }}</span>
         </div>
         <slot name="display" :current-music="currentMusic" :play-stat="playStat">
-          <lyrics :current-music="currentMusic" :play-stat="playStat" v-if="showLrc && currentMusic.lrc" />
+          <lyrics :lrc-source="currentMusic.lrc" :play-stat="playStat" v-if="showLrc && currentMusic.lrc" />
         </slot>
         <controls
           :shuffle="shouldShuffle"