From 77ec8c7a81380bf4f98d699c7e283204089caae5 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Mon, 21 Apr 2025 20:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=9A=E4=B8=AA=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=9A=E8=B0=83=E6=95=B4=20FileBrowser=20=E5=92=8C=20Transfe?=
 =?UTF-8?q?rHistoryView=20=E7=9A=84=E9=AB=98=E5=BA=A6=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=20TorrentCard=20=E5=92=8C=20Torrent?=
 =?UTF-8?q?Item=20=E7=9A=84=20VChip=20=E9=A2=9C=E8=89=B2=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20FileList=E3=80=81FileNavigator=20=E5=92=8C=20FileTo?=
 =?UTF-8?q?olbar=20=E4=B8=AD=20axios=20=E7=9A=84=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=20secondary=20=E9=A2=9C=E8=89=B2=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81=E6=8C=89=E9=92=AE=E5=88=B0?=
 =?UTF-8?q?=20UserListView=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileBrowser.vue               |  4 +-
 src/components/cards/TorrentCard.vue         | 10 +--
 src/components/cards/TorrentItem.vue         |  2 +-
 src/components/filebrowser/FileList.vue      |  4 +-
 src/components/filebrowser/FileNavigator.vue |  2 +-
 src/components/filebrowser/FileToolbar.vue   |  2 +-
 src/plugins/vuetify/theme.ts                 |  2 +-
 src/views/reorganize/TransferHistoryView.vue |  4 +-
 src/views/site/SiteCardListView.vue          |  4 +-
 src/views/user/UserListView.vue              | 66 ++++++++------------
 10 files changed, 43 insertions(+), 57 deletions(-)

diff --git a/src/components/FileBrowser.vue b/src/components/FileBrowser.vue
index bb7f14ef..857752d9 100644
--- a/src/components/FileBrowser.vue
+++ b/src/components/FileBrowser.vue
@@ -181,8 +181,8 @@ function fileListUpdated(items: FileItem[]) {
 // 外层DIV大小控制
 const scrollStyle = computed(() => {
   return appMode
-    ? 'height: calc(100vh - 10rem - env(safe-area-inset-bottom) - 7rem)'
-    : 'height: calc(100vh - 10rem - env(safe-area-inset-bottom)'
+    ? 'height: calc(100vh - 10.5rem - env(safe-area-inset-bottom) - 6.5rem)'
+    : 'height: calc(100vh - 10.5rem - env(safe-area-inset-bottom)'
 })
 
 // 文件列表大小限制
diff --git a/src/components/cards/TorrentCard.vue b/src/components/cards/TorrentCard.vue
index 6ff9a989..27e30a6c 100644
--- a/src/components/cards/TorrentCard.vue
+++ b/src/components/cards/TorrentCard.vue
@@ -252,7 +252,7 @@ onMounted(() => {
 
         <!-- 体积和详情按钮并排 -->
         <div class="d-flex align-center">
-          <VChip v-if="torrent?.size" color="secondary" size="x-small" variant="elevated" class="rounded-sm mr-2">
+          <VChip v-if="torrent?.size" color="primary" size="x-small" variant="elevated" class="rounded-sm mr-2">
             {{ formatFileSize(torrent.size) }}
           </VChip>
           <VBtn icon size="small" variant="text" color="primary" @click.stop="openTorrentDetail">
@@ -263,9 +263,9 @@ onMounted(() => {
     </VCard>
 
     <!-- 更多来源对话框 -->
-    <VDialog v-model="showMoreTorrents" max-width="380px" location="center">
+    <VDialog v-model="showMoreTorrents" max-width="25rem" location="center">
       <VCard>
-        <VCardTitle class="py-2 d-flex align-center">
+        <VCardTitle class="py-3 d-flex align-center">
           <span>其他来源</span>
           <VSpacer />
           <VBtn variant="text" size="small" icon="mdi-close" @click.stop="showMoreTorrents = false"></VBtn>
@@ -273,7 +273,7 @@ onMounted(() => {
 
         <VDivider />
 
-        <VCardText class="more-sources-content">
+        <VCardText class="more-sources-content pa-0">
           <VList lines="one" density="compact">
             <VListItem
               v-for="(item, index) in props.more"
@@ -333,7 +333,7 @@ onMounted(() => {
                   </span>
                   <span>
                     <VIcon
-                      @click.stop="openTorrentDetail(item)"
+                      @click.stop="openTorrentDetail"
                       size="small"
                       color="secondary"
                       icon="mdi-arrow-top-right"
diff --git a/src/components/cards/TorrentItem.vue b/src/components/cards/TorrentItem.vue
index a440097f..5648bf44 100644
--- a/src/components/cards/TorrentItem.vue
+++ b/src/components/cards/TorrentItem.vue
@@ -203,7 +203,7 @@ onMounted(() => {
           </div>
 
           <div class="d-flex align-center">
-            <VChip v-if="torrent?.size" color="secondary" size="x-small" variant="elevated" class="rounded-sm mr-2">
+            <VChip v-if="torrent?.size" color="primary" size="x-small" variant="elevated" class="rounded-sm mr-2">
               {{ formatFileSize(torrent.size) }}
             </VChip>
 
diff --git a/src/components/filebrowser/FileList.vue b/src/components/filebrowser/FileList.vue
index cb7ad0bc..fccff49d 100644
--- a/src/components/filebrowser/FileList.vue
+++ b/src/components/filebrowser/FileList.vue
@@ -20,7 +20,7 @@ const inProps = defineProps({
   storage: String,
   endpoints: Object as PropType<EndPoints>,
   axios: {
-    type: Function,
+    type: Object as PropType<any>,
     required: true,
   },
   refreshpending: Boolean,
@@ -562,7 +562,7 @@ onMounted(() => {
         variant="plain"
         placeholder="搜索 ..."
         prepend-inner-icon="mdi-filter-outline"
-        class="me-2"
+        class="mx-2"
         rounded
       />
       <VSpacer v-if="isFile" />
diff --git a/src/components/filebrowser/FileNavigator.vue b/src/components/filebrowser/FileNavigator.vue
index 5831022f..6bb55936 100644
--- a/src/components/filebrowser/FileNavigator.vue
+++ b/src/components/filebrowser/FileNavigator.vue
@@ -23,7 +23,7 @@ const props = defineProps({
   },
   endpoints: Object,
   axios: {
-    type: Function,
+    type: Object as PropType<any>,
     required: true,
   },
 })
diff --git a/src/components/filebrowser/FileToolbar.vue b/src/components/filebrowser/FileToolbar.vue
index 0a7a93f8..848191b8 100644
--- a/src/components/filebrowser/FileToolbar.vue
+++ b/src/components/filebrowser/FileToolbar.vue
@@ -20,7 +20,7 @@ const inProps = defineProps({
   },
   endpoints: Object as PropType<EndPoints>,
   axios: {
-    type: Function,
+    type: Object as PropType<any>,
     required: true,
   },
 })
diff --git a/src/plugins/vuetify/theme.ts b/src/plugins/vuetify/theme.ts
index cb9cf18c..23b505c1 100644
--- a/src/plugins/vuetify/theme.ts
+++ b/src/plugins/vuetify/theme.ts
@@ -159,7 +159,7 @@ const theme: VuetifyOptions['theme'] = {
       dark: true,
       colors: {
         'primary': '#A370F7',
-        'secondary': '#B794FF',
+        'secondary': '#8A8D93',
         'on-secondary': '#FFFFFF',
         'success': '#66BB6A',
         'info': '#42A5F5',
diff --git a/src/views/reorganize/TransferHistoryView.vue b/src/views/reorganize/TransferHistoryView.vue
index 51093e7b..b7473949 100644
--- a/src/views/reorganize/TransferHistoryView.vue
+++ b/src/views/reorganize/TransferHistoryView.vue
@@ -189,8 +189,8 @@ const TransferDict: { [key: string]: string } = {
 
 const tableStyle = computed(() => {
   return appMode
-    ? 'height: calc(100vh - 14rem - env(safe-area-inset-bottom) - 7.5rem)'
-    : 'height: calc(100vh - 14rem - env(safe-area-inset-bottom)'
+    ? 'height: calc(100vh - 15rem - env(safe-area-inset-bottom) - 6.5rem)'
+    : 'height: calc(100vh - 15rem - env(safe-area-inset-bottom)'
 })
 
 // 分页提示
diff --git a/src/views/site/SiteCardListView.vue b/src/views/site/SiteCardListView.vue
index 7c75b381..16d2aa66 100644
--- a/src/views/site/SiteCardListView.vue
+++ b/src/views/site/SiteCardListView.vue
@@ -88,7 +88,7 @@ onActivated(() => {
 
 // 使用动态按钮钩子
 useDynamicButton({
-  icon: 'mdi-plus',
+  icon: 'mdi-web-plus',
   onClick: () => {
     siteAddDialog.value = true
   },
@@ -123,7 +123,7 @@ useDynamicButton({
   <!-- 新增站点按钮 -->
   <VFab
     v-if="isRefreshed && !appMode"
-    icon="mdi-plus"
+    icon="mdi-web-plus"
     location="bottom"
     size="x-large"
     fixed
diff --git a/src/views/user/UserListView.vue b/src/views/user/UserListView.vue
index a547adfd..dcabf448 100644
--- a/src/views/user/UserListView.vue
+++ b/src/views/user/UserListView.vue
@@ -4,6 +4,11 @@ import type { User } from '@/api/types'
 import NoDataFound from '@/components/NoDataFound.vue'
 import UserCard from '@/components/cards/UserCard.vue'
 import UserAddEditDialog from '@/components/dialog/UserAddEditDialog.vue'
+import { useDisplay } from 'vuetify'
+import { useDynamicButton } from '@/composables/useDynamicButton'
+// APP
+const display = useDisplay()
+const appMode = inject('pwaMode') && display.mdAndDown.value
 
 // 是否刷新过
 const isRefreshed = ref(false)
@@ -51,6 +56,14 @@ onActivated(() => {
     loadAllUsers()
   }
 })
+
+// 使用动态按钮钩子
+useDynamicButton({
+  icon: 'mdi-account-plus',
+  onClick: () => {
+    openAddUserDialog()
+  },
+})
 </script>
 
 <template>
@@ -70,14 +83,6 @@ onActivated(() => {
         @remove="loadAllUsers"
         @save="loadAllUsers"
       />
-
-      <!-- 添加用户卡片 -->
-      <VCard class="add-user-card" @click="openAddUserDialog">
-        <div class="add-user-content">
-          <VIcon icon="mdi-account-plus" size="large" color="primary" />
-          <span class="add-user-text">添加用户</span>
-        </div>
-      </VCard>
     </div>
 
     <!-- 无数据提示 -->
@@ -85,6 +90,19 @@ onActivated(() => {
       <NoDataFound error-code="404" error-title="没有用户" error-description="点击添加用户卡片添加用户" />
     </div>
 
+    <!-- 新增用户按钮 -->
+    <VFab
+      v-if="isRefreshed && !appMode"
+      icon="mdi-account-plus"
+      location="bottom"
+      size="x-large"
+      fixed
+      app
+      appear
+      @click="openAddUserDialog"
+      :class="{ 'mb-12': appMode }"
+    />
+
     <!-- 用户添加弹窗 -->
     <UserAddEditDialog
       v-if="addUserDialog"
@@ -97,35 +115,3 @@ onActivated(() => {
     />
   </div>
 </template>
-
-<style scoped>
-.add-user-card {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border: 1.5px dashed rgba(var(--v-theme-primary), 0.4);
-  background-color: rgba(var(--v-theme-surface), 1);
-  block-size: 100%;
-  cursor: pointer;
-  min-block-size: 160px;
-  transition: all 0.3s ease;
-}
-
-.add-user-card:hover {
-  background-color: rgba(var(--v-theme-primary), 0.05);
-  transform: translateY(-4px);
-}
-
-.add-user-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 0.75rem;
-}
-
-.add-user-text {
-  color: rgba(var(--v-theme-primary), 0.8);
-  font-size: 1.05rem;
-  font-weight: 500;
-}
-</style>