From dafe494ce912c98af86048fe999e6c6af96e4ad9 Mon Sep 17 00:00:00 2001
From: Miao_Spring <539943419@qq.com>
Date: Fri, 27 Sep 2024 15:51:52 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../miaoMusicPlayer/miaoMusicPlayerDemo.vue   |  8 --
 .../miaoMusicPlayer/src/aplayerListNew.vue    | 89 ++++++++++++-------
 src/plugins/miaoMusicPlayer/types/ap.ts       |  2 +-
 3 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/src/plugins/miaoMusicPlayer/miaoMusicPlayerDemo.vue b/src/plugins/miaoMusicPlayer/miaoMusicPlayerDemo.vue
index 59e12ce..378d1eb 100644
--- a/src/plugins/miaoMusicPlayer/miaoMusicPlayerDemo.vue
+++ b/src/plugins/miaoMusicPlayer/miaoMusicPlayerDemo.vue
@@ -101,13 +101,5 @@ onUnmounted(() => {
     position: fixed;
     bottom: 10px;
     width: -webkit-fill-available;
-
-    .aplayer-list {
-        max-height: 444px !important;
-
-        ol {
-            max-height: inherit !important;
-        }
-    }
 }
 </style>
\ No newline at end of file
diff --git a/src/plugins/miaoMusicPlayer/src/aplayerListNew.vue b/src/plugins/miaoMusicPlayer/src/aplayerListNew.vue
index b9ac741..6fffbde 100644
--- a/src/plugins/miaoMusicPlayer/src/aplayerListNew.vue
+++ b/src/plugins/miaoMusicPlayer/src/aplayerListNew.vue
@@ -1,36 +1,46 @@
 <template>
-    <ol :style="{ maxHeight: ap.options.listMaxHeight }" :key="refreshKey" >
-        <VueDraggable v-model="ap.list.audios" @start="onDragStart" @end="onDragEnd" item-key="id" handle=".aplayer-list-control-btn-reorder">
-            <!-- <template #item="{ element, index }"> -->
-                <li v-for="(element, index) in ap.list.audios" :class="activeAudioIndex == index ? 'aplayer-list-light' : ''"
-                    class="aplayer-list-new" @click="switchAudio(index)" :key="element.id">
-                    <span class="aplayer-list-cur" :style="{ backgroundColor: apTheme }"></span>
-                    <span class="aplayer-list-index">{{ index + 1 }}</span>
-                    <span class="aplayer-list-title">{{ element.name }}</span>
-                    <span class="aplayer-list-author" v-show="element.artist">{{ element.artist }}</span>
-                    <div class="aplayer-list-control">
-                        <div class="aplayer-list-control-btn" @click.stop="listAudioUp(index)" v-if="false">
-                            <ChevronUpOutline class="aplayer-list-control-btn-svg" />
-                        </div>
-                        <div class="aplayer-list-control-btn" @click.stop="listAudioDown(index)" v-if="false">
-                            <ChevronDownOutline class="aplayer-list-control-btn-svg" />
-                        </div>
-                        <div class="aplayer-list-control-btn" @click.stop="listAudioRemove(index)">
-                            <CloseOutline class="aplayer-list-control-btn-svg" />
-                        </div>
-                        <div class="aplayer-list-control-btn aplayer-list-control-btn-reorder">
-                            <ReorderFourOutline class="aplayer-list-control-btn-svg" />
-                        </div>
+    <ol :style="{ maxHeight: ap.options.listMaxHeight }" :key="refreshKey">
+        <VueDraggable v-model="ap.list.audios" @start="onDragStart" @end="onDragEnd" item-key="id"
+            handle=".aplayer-list-control-btn-reorder" ghostClass="iSDragging">
+            <li v-for="(element, index) in ap.list.audios"
+                :class="activeAudioIndex == index ? 'aplayer-list-light' : ''" class="aplayer-list-new"
+                :key="element.id">
+                <span class="aplayer-list-cur" :style="{ backgroundColor: apTheme }"></span>
+                <span class="aplayer-list-index">{{ index + 1 }}</span>
+                <span class="aplayer-list-title">{{ element.name }}</span>
+                <div class="aplayer-list-control">
+                    <div class="aplayer-list-control-btn aplayer-list-control-btn-hover aplayer-list-control-btn-play"
+                        @click.stop="switchAudio(index)" v-if="activeAudioIndex !== index">
+                        <PlayOutline class="aplayer-list-control-btn-svg" />
                     </div>
-                </li>
-            <!-- </template> -->
+                    <div class="aplayer-list-control-btn aplayer-list-control-btn-hover"
+                        @click.stop="switchAudio(index)" v-if="false">
+                        <HeartOutline class="aplayer-list-control-btn-svg" />
+                    </div>
+                    <div class="aplayer-list-control-btn" @click.stop="listAudioUp(index)" v-if="false">
+                        <ChevronUpOutline class="aplayer-list-control-btn-svg" />
+                    </div>
+                    <div class="aplayer-list-control-btn" @click.stop="listAudioDown(index)" v-if="false">
+                        <ChevronDownOutline class="aplayer-list-control-btn-svg" />
+                    </div>
+                    <div class="aplayer-list-control-btn aplayer-list-control-btn-hover"
+                        @click.stop="listAudioRemove(index)">
+                        <CloseOutline class="aplayer-list-control-btn-svg" />
+                    </div>
+                    <div class="aplayer-list-control-btn aplayer-list-control-btn-reorder">
+                        <ReorderFourOutline class="aplayer-list-control-btn-svg" />
+                    </div>
+                </div>
+                <span class="aplayer-list-author" v-show="element.artist !== 'Audio artist1'">{{ element.artist
+                    }}</span>
+            </li>
         </VueDraggable>
     </ol>
 </template>
 
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue';
-import { ChevronUpOutline, ChevronDownOutline, CloseOutline, ReorderFourOutline } from '@vicons/ionicons5';
+import { ChevronUpOutline, ChevronDownOutline, CloseOutline, ReorderFourOutline, PlayOutline, HeartOutline } from '@vicons/ionicons5';
 import { VueDraggable } from 'vue-draggable-plus'
 import apType, { audioType } from '../types/ap';
 
@@ -65,10 +75,10 @@ const switchAudio = (index: number) => {
     props.ap.list.switch(index)
 }
 const listRefreshIndex = (curr: audioType) => {
-    for(let index in props.ap.list.audios){
-        if(props.ap.list.audios[index] === curr) {
+    for (let index in props.ap.list.audios) {
+        if (props.ap.list.audios[index] === curr) {
             props.ap.list.index = parseInt(index)
-            return 
+            return
         }
     }
 }
@@ -107,7 +117,7 @@ const listAudioDown = (index: number) => {
 const listAudioRemove = (index: number) => {
     props.ap.list.remove(index)
 }
-const {onDragStart, onDragEnd} = (() => {
+const { onDragStart, onDragEnd } = (() => {
     let curr: audioType
     return {
         onDragStart: () => {
@@ -131,10 +141,19 @@ onMounted(() => {
 <style lang="scss" scoped>
 .aplayer-list-new {
     height: fit-content !important;
+    cursor: default !important;
+
     .aplayer-list-cur {
-        height: calc( 100% - 8px ) !important;
+        height: calc(100% - 8px) !important;
+    }
+
+    .aplayer-list-index {
+        display: inline-block;
+        width: 20px;
+        margin-right: 4px !important;
     }
 }
+
 .aplayer-list-control {
     float: right;
     height: 32px;
@@ -147,12 +166,17 @@ onMounted(() => {
         display: flex;
         justify-content: center;
         align-items: center;
+        cursor: pointer;
 
         &-svg {
             width: 20px;
             aspect-ratio: 1;
             transition: all .1s ease;
+        }
+    }
 
+    &-btn-hover {
+        .aplayer-list-control-btn-svg {
             &:hover {
                 width: 24px;
             }
@@ -166,4 +190,9 @@ onMounted(() => {
 .aplayer .aplayer-list-new svg path {
     fill: #ffffff00;
 }
+
+.iSDragging {
+    opacity: 0.5;
+    background: #60e8a2 !important;
+}
 </style>
diff --git a/src/plugins/miaoMusicPlayer/types/ap.ts b/src/plugins/miaoMusicPlayer/types/ap.ts
index 231d1ee..9762101 100644
--- a/src/plugins/miaoMusicPlayer/types/ap.ts
+++ b/src/plugins/miaoMusicPlayer/types/ap.ts
@@ -1,6 +1,6 @@
 export type audioType = {
     url: string
-    artist: string
+    artist?: string
     cover?: string
     name: string
     theme?: string