From 461f216cab4c130583561a174c16048feb0ae6d7 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Wed, 20 Dec 2023 10:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0=E6=AD=8C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto-imports.d.ts                       | 123 +++++++++++++-----------
 components.d.ts                         |   3 -
 electron-builder.yml                    |   2 -
 src/components/Modal/AddPlaylist.vue    |   4 +-
 src/components/Player/MainControl.vue   |   4 +-
 src/components/Player/PlayerControl.vue |   4 +-
 src/utils/formatData.js                 |   1 +
 src/views/Local/albums.vue              |   2 +-
 src/views/Local/artists.vue             |   2 +-
 9 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 61d5571..c5b8cec 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -5,65 +5,74 @@
 // Generated by unplugin-auto-import
 export {}
 declare global {
-  const EffectScope: typeof import('vue')['EffectScope']
-  const computed: typeof import('vue')['computed']
-  const createApp: typeof import('vue')['createApp']
-  const customRef: typeof import('vue')['customRef']
-  const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
-  const defineComponent: typeof import('vue')['defineComponent']
-  const effectScope: typeof import('vue')['effectScope']
-  const getCurrentInstance: typeof import('vue')['getCurrentInstance']
-  const getCurrentScope: typeof import('vue')['getCurrentScope']
-  const h: typeof import('vue')['h']
-  const inject: typeof import('vue')['inject']
-  const isProxy: typeof import('vue')['isProxy']
-  const isReactive: typeof import('vue')['isReactive']
-  const isReadonly: typeof import('vue')['isReadonly']
-  const isRef: typeof import('vue')['isRef']
-  const markRaw: typeof import('vue')['markRaw']
-  const nextTick: typeof import('vue')['nextTick']
-  const onActivated: typeof import('vue')['onActivated']
-  const onBeforeMount: typeof import('vue')['onBeforeMount']
-  const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
-  const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
-  const onDeactivated: typeof import('vue')['onDeactivated']
-  const onErrorCaptured: typeof import('vue')['onErrorCaptured']
-  const onMounted: typeof import('vue')['onMounted']
-  const onRenderTracked: typeof import('vue')['onRenderTracked']
-  const onRenderTriggered: typeof import('vue')['onRenderTriggered']
-  const onScopeDispose: typeof import('vue')['onScopeDispose']
-  const onServerPrefetch: typeof import('vue')['onServerPrefetch']
-  const onUnmounted: typeof import('vue')['onUnmounted']
-  const onUpdated: typeof import('vue')['onUpdated']
-  const provide: typeof import('vue')['provide']
-  const reactive: typeof import('vue')['reactive']
-  const readonly: typeof import('vue')['readonly']
-  const ref: typeof import('vue')['ref']
-  const resolveComponent: typeof import('vue')['resolveComponent']
-  const shallowReactive: typeof import('vue')['shallowReactive']
-  const shallowReadonly: typeof import('vue')['shallowReadonly']
-  const shallowRef: typeof import('vue')['shallowRef']
-  const toRaw: typeof import('vue')['toRaw']
-  const toRef: typeof import('vue')['toRef']
-  const toRefs: typeof import('vue')['toRefs']
-  const toValue: typeof import('vue')['toValue']
-  const triggerRef: typeof import('vue')['triggerRef']
-  const unref: typeof import('vue')['unref']
-  const useAttrs: typeof import('vue')['useAttrs']
-  const useCssModule: typeof import('vue')['useCssModule']
-  const useCssVars: typeof import('vue')['useCssVars']
-  const useDialog: typeof import('naive-ui')['useDialog']
-  const useLoadingBar: typeof import('naive-ui')['useLoadingBar']
-  const useMessage: typeof import('naive-ui')['useMessage']
-  const useNotification: typeof import('naive-ui')['useNotification']
-  const useSlots: typeof import('vue')['useSlots']
-  const watch: typeof import('vue')['watch']
-  const watchEffect: typeof import('vue')['watchEffect']
-  const watchPostEffect: typeof import('vue')['watchPostEffect']
-  const watchSyncEffect: typeof import('vue')['watchSyncEffect']
+  const EffectScope: (typeof import("vue"))["EffectScope"];
+  const computed: (typeof import("vue"))["computed"];
+  const createApp: (typeof import("vue"))["createApp"];
+  const customRef: (typeof import("vue"))["customRef"];
+  const defineAsyncComponent: (typeof import("vue"))["defineAsyncComponent"];
+  const defineComponent: (typeof import("vue"))["defineComponent"];
+  const effectScope: (typeof import("vue"))["effectScope"];
+  const getCurrentInstance: (typeof import("vue"))["getCurrentInstance"];
+  const getCurrentScope: (typeof import("vue"))["getCurrentScope"];
+  const h: (typeof import("vue"))["h"];
+  const inject: (typeof import("vue"))["inject"];
+  const isProxy: (typeof import("vue"))["isProxy"];
+  const isReactive: (typeof import("vue"))["isReactive"];
+  const isReadonly: (typeof import("vue"))["isReadonly"];
+  const isRef: (typeof import("vue"))["isRef"];
+  const markRaw: (typeof import("vue"))["markRaw"];
+  const nextTick: (typeof import("vue"))["nextTick"];
+  const onActivated: (typeof import("vue"))["onActivated"];
+  const onBeforeMount: (typeof import("vue"))["onBeforeMount"];
+  const onBeforeUnmount: (typeof import("vue"))["onBeforeUnmount"];
+  const onBeforeUpdate: (typeof import("vue"))["onBeforeUpdate"];
+  const onDeactivated: (typeof import("vue"))["onDeactivated"];
+  const onErrorCaptured: (typeof import("vue"))["onErrorCaptured"];
+  const onMounted: (typeof import("vue"))["onMounted"];
+  const onRenderTracked: (typeof import("vue"))["onRenderTracked"];
+  const onRenderTriggered: (typeof import("vue"))["onRenderTriggered"];
+  const onScopeDispose: (typeof import("vue"))["onScopeDispose"];
+  const onServerPrefetch: (typeof import("vue"))["onServerPrefetch"];
+  const onUnmounted: (typeof import("vue"))["onUnmounted"];
+  const onUpdated: (typeof import("vue"))["onUpdated"];
+  const provide: (typeof import("vue"))["provide"];
+  const reactive: (typeof import("vue"))["reactive"];
+  const readonly: (typeof import("vue"))["readonly"];
+  const ref: (typeof import("vue"))["ref"];
+  const resolveComponent: (typeof import("vue"))["resolveComponent"];
+  const shallowReactive: (typeof import("vue"))["shallowReactive"];
+  const shallowReadonly: (typeof import("vue"))["shallowReadonly"];
+  const shallowRef: (typeof import("vue"))["shallowRef"];
+  const toRaw: (typeof import("vue"))["toRaw"];
+  const toRef: (typeof import("vue"))["toRef"];
+  const toRefs: (typeof import("vue"))["toRefs"];
+  const toValue: (typeof import("vue"))["toValue"];
+  const triggerRef: (typeof import("vue"))["triggerRef"];
+  const unref: (typeof import("vue"))["unref"];
+  const useAttrs: (typeof import("vue"))["useAttrs"];
+  const useCssModule: (typeof import("vue"))["useCssModule"];
+  const useCssVars: (typeof import("vue"))["useCssVars"];
+  const useDialog: (typeof import("naive-ui"))["useDialog"];
+  const useLoadingBar: (typeof import("naive-ui"))["useLoadingBar"];
+  const useMessage: (typeof import("naive-ui"))["useMessage"];
+  const useNotification: (typeof import("naive-ui"))["useNotification"];
+  const useSlots: (typeof import("vue"))["useSlots"];
+  const watch: (typeof import("vue"))["watch"];
+  const watchEffect: (typeof import("vue"))["watchEffect"];
+  const watchPostEffect: (typeof import("vue"))["watchPostEffect"];
+  const watchSyncEffect: (typeof import("vue"))["watchSyncEffect"];
 }
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  export type {
+    Component,
+    ComponentPublicInstance,
+    ComputedRef,
+    InjectionKey,
+    PropType,
+    Ref,
+    VNode,
+    WritableComputedRef,
+  } from "vue";
 }
diff --git a/components.d.ts b/components.d.ts
index 6c135da..171031b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -10,7 +10,6 @@ declare module 'vue' {
     AddPlaylist: typeof import('./src/components/Modal/AddPlaylist.vue')['default']
     CloudSongMatch: typeof import('./src/components/Modal/CloudSongMatch.vue')['default']
     CommentList: typeof import('./src/components/List/CommentList.vue')['default']
-    copy: typeof import('./src/components/Global/Playlist copy.vue')['default']
     CountDown: typeof import('./src/components/Player/CountDown.vue')['default']
     CoverDropdown: typeof import('./src/components/Cover/CoverDropdown.vue')['default']
     CreatePlaylist: typeof import('./src/components/Modal/CreatePlaylist.vue')['default']
@@ -32,7 +31,6 @@ declare module 'vue' {
     NCard: typeof import('naive-ui')['NCard']
     NCheckbox: typeof import('naive-ui')['NCheckbox']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
-    NDataTable: typeof import('naive-ui')['NDataTable']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDivider: typeof import('naive-ui')['NDivider']
     NDrawer: typeof import('naive-ui')['NDrawer']
@@ -90,7 +88,6 @@ declare module 'vue' {
     PlayerControl: typeof import('./src/components/Player/PlayerControl.vue')['default']
     PlayerCover: typeof import('./src/components/Player/PlayerCover.vue')['default']
     Playlist: typeof import('./src/components/Global/Playlist.vue')['default']
-    PlaylistOld: typeof import('./src/components/Global/Playlist-old.vue')['default']
     PlaylistUpdate: typeof import('./src/components/Modal/PlaylistUpdate.vue')['default']
     PrivateFm: typeof import('./src/components/Player/PrivateFm.vue')['default']
     Provider: typeof import('./src/components/Global/Provider.vue')['default']
diff --git a/electron-builder.yml b/electron-builder.yml
index cd6d027..648c5ef 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -24,8 +24,6 @@ win:
   icon: public/images/icons/favicon-512x512.png
   # 构建类型
   target: nsis
-  # 管理员权限
-  requestedExecutionLevel: highestAvailable
 # NSIS 安装器配置
 nsis:
   # 一键式安装程序还是辅助安装程序
diff --git a/src/components/Modal/AddPlaylist.vue b/src/components/Modal/AddPlaylist.vue
index 3ee2c4d..01bfb4e 100644
--- a/src/components/Modal/AddPlaylist.vue
+++ b/src/components/Modal/AddPlaylist.vue
@@ -32,7 +32,7 @@
         >
           <template #prefix>
             <n-image
-              :src="item.coverImgUrl.replace(/^http:/, 'https:') + '?param=100y100'"
+              :src="item?.coverSize?.s || '/images/pic/album.jpg?assest'"
               class="cover"
               preview-disabled
               lazy
@@ -51,7 +51,7 @@
           </template>
           <n-thing :title="item.name">
             <template #description>
-              <n-text depth="3" class="size">{{ item.trackCount }} 首音乐</n-text>
+              <n-text depth="3" class="size">{{ item.count }} 首音乐</n-text>
             </template>
           </n-thing>
         </n-list-item>
diff --git a/src/components/Player/MainControl.vue b/src/components/Player/MainControl.vue
index 18920cd..b198b7d 100644
--- a/src/components/Player/MainControl.vue
+++ b/src/components/Player/MainControl.vue
@@ -535,12 +535,12 @@ watch(
       border-radius: 25px;
       .vue-slider-process {
         background-color: var(--main-color);
-        transition: none !important;
+        // transition: none !important;
       }
       .vue-slider-dot {
         width: 12px !important;
         height: 12px !important;
-        transition: none !important;
+        // transition: none !important;
       }
       .vue-slider-dot-handle {
         transition: box-shadow 0.3s;
diff --git a/src/components/Player/PlayerControl.vue b/src/components/Player/PlayerControl.vue
index 6566566..ee9368b 100644
--- a/src/components/Player/PlayerControl.vue
+++ b/src/components/Player/PlayerControl.vue
@@ -346,12 +346,12 @@ const controlMove = (e) => {
           background-color: var(--cover-second-color);
           .vue-slider-process {
             background-color: var(--cover-main-color);
-            transition: none !important;
+            // transition: none !important;
           }
           .vue-slider-dot {
             width: 10px !important;
             height: 10px !important;
-            transition: none !important;
+            // transition: none !important;
             .vue-slider-dot-handle {
               background-color: var(--cover-main-color);
             }
diff --git a/src/utils/formatData.js b/src/utils/formatData.js
index 5b5a691..f64590f 100644
--- a/src/utils/formatData.js
+++ b/src/utils/formatData.js
@@ -20,6 +20,7 @@ const formatData = (data, type = "playlist", noTracks = false) => {
       (v.picUrl ||
         v.coverUrl ||
         v.coverImgUrl ||
+        v.imgurl ||
         v.cover ||
         (v.album && v.album.picUrl) ||
         (v.al && (v.al.picUrl || v.al.xInfo?.picUrl)));
diff --git a/src/views/Local/albums.vue b/src/views/Local/albums.vue
index 90c2f9f..dd6f5e4 100644
--- a/src/views/Local/albums.vue
+++ b/src/views/Local/albums.vue
@@ -5,7 +5,7 @@
       v-if="allAlbumData"
       :style="{
         height: `calc(100vh - ${
-          Object.keys(music.playSongData)?.length && status.showPlayBar ? 345 : 265
+          Object.keys(music.playSongData)?.length && status.showPlayBar ? 380 : 300
         }px)`,
       }"
       class="local-album"
diff --git a/src/views/Local/artists.vue b/src/views/Local/artists.vue
index 0fa0d54..d4d54cb 100644
--- a/src/views/Local/artists.vue
+++ b/src/views/Local/artists.vue
@@ -6,7 +6,7 @@
     class="local-artists"
     :style="{
       height: `calc(100vh - ${
-        Object.keys(music.playSongData)?.length && status.showPlayBar ? 345 : 265
+        Object.keys(music.playSongData)?.length && status.showPlayBar ? 380 : 300
       }px)`,
     }"
     type="card"