From 1493ab73176ece097acbe7d574b840657e9edf38 Mon Sep 17 00:00:00 2001
From: alger <algerkc@qq.com>
Date: Sun, 26 Jan 2025 00:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E5=BC=B1=E5=8C=96=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=9F=E8=83=BD=20=E9=BB=98=E8=AE=A4=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E4=B8=8B=E8=BD=BD=E5=88=97=E8=A1=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=20=E5=9C=A8=E8=AE=BE=E7=BD=AE=E4=B8=AD=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/set.json                             |  3 ++-
 .../components/common/DownloadDrawer.vue      | 24 +++++++++++++++----
 src/renderer/layout/AppLayout.vue             |  9 ++++++-
 src/renderer/store/index.ts                   |  9 +++++--
 src/renderer/utils/request.ts                 |  3 ---
 src/renderer/views/set/index.vue              | 18 ++++++++++++++
 6 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/main/set.json b/src/main/set.json
index 05dbb39..c230cde 100644
--- a/src/main/set.json
+++ b/src/main/set.json
@@ -18,5 +18,6 @@
   "fontFamily": "system-ui",
   "fontScope": "global",
   "autoPlay": false,
-  "downloadPath": ""
+  "downloadPath": "",
+  "alwaysShowDownloadButton": false
 }
diff --git a/src/renderer/components/common/DownloadDrawer.vue b/src/renderer/components/common/DownloadDrawer.vue
index 56dd0bb..96b798e 100644
--- a/src/renderer/components/common/DownloadDrawer.vue
+++ b/src/renderer/components/common/DownloadDrawer.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="download-drawer-trigger">
     <n-badge :value="downloadingCount" :max="99" :show="downloadingCount > 0">
-      <n-button circle @click="showDrawer = true">
+      <n-button circle @click="store.commit('setShowDownloadDrawer', true)">
         <template #icon>
           <i class="iconfont ri-download-cloud-2-line"></i>
         </template>
@@ -9,7 +9,12 @@
     </n-badge>
   </div>
 
-  <n-drawer v-model:show="showDrawer" :height="'80%'" placement="bottom">
+  <n-drawer
+    v-model:show="showDrawer"
+    :height="'80%'"
+    placement="bottom"
+    @after-leave="handleDrawerClose"
+  >
     <n-drawer-content title="下载管理" closable :native-scrollbar="false">
       <div class="drawer-container">
         <n-tabs type="line" animated class="h-full">
@@ -159,8 +164,8 @@
 import type { ProgressStatus } from 'naive-ui';
 import { useMessage } from 'naive-ui';
 import { computed, onMounted, ref } from 'vue';
+import { useStore } from 'vuex';
 
-// import { useStore } from 'vuex';
 import { getMusicDetail } from '@/api/music';
 // import { audioService } from '@/services/audioService';
 import { getImgUrl } from '@/utils';
@@ -185,9 +190,14 @@ interface DownloadedItem {
   ar: { name: string }[];
 }
 
-// const store = useStore();
 const message = useMessage();
-const showDrawer = ref(false);
+const store = useStore();
+
+const showDrawer = computed({
+  get: () => store.state.showDownloadDrawer,
+  set: (val) => store.commit('setShowDownloadDrawer', val)
+});
+
 const downloadList = ref<DownloadItem[]>([]);
 const downloadedList = ref<DownloadedItem[]>(
   JSON.parse(localStorage.getItem('downloadedList') || '[]')
@@ -491,6 +501,10 @@ onMounted(() => {
     }
   });
 });
+
+const handleDrawerClose = () => {
+  store.commit('setShowDownloadDrawer', false);
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/renderer/layout/AppLayout.vue b/src/renderer/layout/AppLayout.vue
index d7f9fd9..a152fce 100644
--- a/src/renderer/layout/AppLayout.vue
+++ b/src/renderer/layout/AppLayout.vue
@@ -27,7 +27,14 @@
       <!-- 底部音乐播放 -->
       <play-bar v-show="isPlay" :style="isMobile && store.state.musicFull ? 'bottom: 0;' : ''" />
       <!-- 下载管理抽屉 -->
-      <download-drawer v-if="isElectron" />
+      <download-drawer
+        v-if="
+          isElectron &&
+          (store.state.setData?.alwaysShowDownloadButton ||
+            store.state.showDownloadDrawer ||
+            store.state.hasDownloadingTasks)
+        "
+      />
     </div>
     <install-app-modal v-if="!isElectron"></install-app-modal>
     <update-modal v-if="isElectron" />
diff --git a/src/renderer/store/index.ts b/src/renderer/store/index.ts
index 18847f0..889fccc 100644
--- a/src/renderer/store/index.ts
+++ b/src/renderer/store/index.ts
@@ -80,7 +80,7 @@ export interface State {
   user: any;
   playList: SongResult[];
   playListIndex: number;
-  setData: any;
+  setData: typeof defaultSettings;
   lyric: any;
   isMobile: boolean;
   searchValue: string;
@@ -93,6 +93,7 @@ export interface State {
   showArtistDrawer: boolean;
   currentArtistId: number | null;
   systemFonts: { label: string; value: string }[];
+  showDownloadDrawer: boolean;
 }
 
 const state: State = {
@@ -116,7 +117,8 @@ const state: State = {
   showUpdateModal: false,
   showArtistDrawer: false,
   currentArtistId: null,
-  systemFonts: [{ label: '系统默认', value: 'system-ui' }]
+  systemFonts: [{ label: '系统默认', value: 'system-ui' }],
+  showDownloadDrawer: false
 };
 
 const { handlePlayMusic, nextPlay, prevPlay } = useMusicListHook();
@@ -255,6 +257,9 @@ const mutations = {
         value: font
       }))
     ];
+  },
+  setShowDownloadDrawer(state: State, show: boolean) {
+    state.showDownloadDrawer = show;
   }
 };
 
diff --git a/src/renderer/utils/request.ts b/src/renderer/utils/request.ts
index a8d3a02..ed5eaeb 100644
--- a/src/renderer/utils/request.ts
+++ b/src/renderer/utils/request.ts
@@ -1,12 +1,9 @@
 import axios, { InternalAxiosRequestConfig } from 'axios';
-import { createDiscreteApi } from 'naive-ui';
 
 import store from '@/store';
 
 import { isElectron } from '.';
 
-const { notification } = createDiscreteApi(['notification']);
-
 let setData: any = null;
 const getSetData = () => {
   if (window.electron) {
diff --git a/src/renderer/views/set/index.vue b/src/renderer/views/set/index.vue
index b382a3f..ef4e3cd 100644
--- a/src/renderer/views/set/index.vue
+++ b/src/renderer/views/set/index.vue
@@ -180,6 +180,24 @@
               <n-button size="small" @click="showShortcutModal = true">配置</n-button>
             </div>
 
+            <div v-if="isElectron" class="set-item">
+              <div>
+                <div class="set-item-title">下载管理</div>
+                <div class="set-item-content">
+                  <n-switch v-model:value="setData.alwaysShowDownloadButton" class="mr-2">
+                    <template #checked>显示</template>
+                    <template #unchecked>隐藏</template>
+                  </n-switch>
+                  是否始终显示下载列表按钮
+                </div>
+              </div>
+              <div class="flex items-center gap-2">
+                <n-button size="small" @click="store.commit('setShowDownloadDrawer', true)">
+                  打开下载管理
+                </n-button>
+              </div>
+            </div>
+
             <div class="set-item">
               <div>
                 <div class="set-item-title">下载目录</div>