feat(AliyunAuthDialog): 添加配置支持，允许自定义refreshToken和保存设置

feat(site): update site timeout hint to indicate 0 as unlimited

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "2.0.3",
+  "version": "2.0.8",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
@@ -101,4 +101,4 @@
   "resolutions": {
     "postcss": "8"
   }
-}
+}

src/api/constants.ts

@@ -2,18 +2,27 @@ export const storageOptions = [
   {
     title: '本地',
     value: 'local',
+    icon: 'mdi-folder-multiple-outline',
   },
   {
     title: '阿里云盘',
     value: 'alipan',
+    icon: 'mdi-cloud-outline',
   },
   {
     title: '115网盘',
     value: 'u115',
+    icon: 'mdi-cloud-outline',
   },
   {
-    title: 'Rclone网盘',
+    title: 'RClone',
     value: 'rclone',
+    icon: 'mdi-cloud-outline',
+  },
+  {
+    title: 'AList',
+    value: 'alist',
+    icon: 'mdi-cloud-outline',
   },
 ]
 

src/api/types.ts

@@ -72,6 +72,8 @@ export interface Subscribe {
   media_category?: string
   // 过滤规则组
   filter_groups?: string[]
+  // 下载器
+  downloader?: string
 }
 
 // 订阅分享
@@ -387,6 +389,8 @@ export interface Site {
   pri?: number
   // RSS地址
   rss?: string
+  // 下载器
+  downloader?: string
   // Cookie
   cookie?: string
   // ApiKey
@@ -605,6 +609,8 @@ export interface TorrentInfo {
   site_proxy: boolean
   // 站点优先级
   site_order: number
+  // 站点下载器
+  site_downloader?: string
   // 种子名称
   title?: string
   // 种子副标题

src/assets/images/misc/alist.svg

@@ -0,0 +1,10 @@
+<svg width="1252" height="1252" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <g>
+  <g id="#70c6beff">
+   <path id="svg_2" d="m634.37,138.38c11.88,-1.36 24.25,1.3 34.18,8.09c14.96,9.66 25.55,24.41 34.49,39.51c40.59,68.03 81.45,135.91 122.02,203.96c54.02,90.99 108.06,181.97 161.94,273.06c37.28,63 74.65,125.96 112.18,188.82c24.72,41.99 50.21,83.54 73.84,126.16c10.18,17.84 15.77,38.44 14.93,59.03c-0.59,15.92 -3.48,32.28 -11.84,46.08c-11.73,19.46 -31.39,33.2 -52.71,40.36c-11.37,4.09 -23.3,6.87 -35.43,6.89c-132.32,-0.05 -264.64,0.04 -396.95,0.03c-11.38,-0.29 -22.95,-1.6 -33.63,-5.72c-7.81,-3.33 -15.5,-7.43 -21.61,-13.42c-10.43,-10.32 -17.19,-24.96 -15.38,-39.83c0.94,-10.39 3.48,-20.64 7.76,-30.16c4.15,-9.77 9.99,-18.67 15.06,-27.97c22.13,-39.47 45.31,-78.35 69.42,-116.65c7.72,-12.05 14.44,-25.07 25.12,-34.87c11.35,-10.39 25.6,-18.54 41.21,-19.6c12.55,-0.52 24.89,3.82 35.35,10.55c11.8,6.92 21.09,18.44 24.2,31.88c4.49,17.01 -0.34,34.88 -7.55,50.42c-8.09,17.65 -19.62,33.67 -25.81,52.18c-1.13,4.21 -2.66,9.52 0.48,13.23c3.19,3 7.62,4.18 11.77,5.22c12,2.67 24.38,1.98 36.59,2.06c45,-0.01 90,0 135,0c8.91,-0.15 17.83,0.3 26.74,-0.22c6.43,-0.74 13.44,-1.79 18.44,-6.28c3.3,-2.92 3.71,-7.85 2.46,-11.85c-2.74,-8.86 -7.46,-16.93 -12.12,-24.89c-119.99,-204.91 -239.31,-410.22 -360.56,-614.4c-3.96,-6.56 -7.36,-13.68 -13.03,-18.98c-2.8,-2.69 -6.95,-4.22 -10.77,-3.11c-3.25,1.17 -5.45,4.03 -7.61,6.57c-5.34,6.81 -10.12,14.06 -14.51,21.52c-20.89,33.95 -40.88,68.44 -61.35,102.64c-117.9,198.43 -235.82,396.85 -353.71,595.29c-7.31,13.46 -15.09,26.67 -23.57,39.43c-7.45,10.96 -16.49,21.23 -28.14,27.83c-13.73,7.94 -30.69,11.09 -46.08,6.54c-11.23,-3.47 -22.09,-9.12 -30.13,-17.84c-10.18,-10.08 -14.69,-24.83 -14.17,-38.94c0.52,-14.86 5.49,-29.34 12.98,-42.1c71.58,-121.59 143.62,-242.92 215.93,-364.09c37.2,-62.8 74.23,-125.69 111.64,-188.36c37.84,-63.5 75.77,-126.94 113.44,-190.54c21.02,-35.82 42.19,-71.56 64.28,-106.74c6.79,-11.15 15.58,-21.15 26.16,-28.85c8.68,-5.92 18.42,-11 29.05,-11.94z" fill="#70c6be"/>
+  </g>
+  <g id="#1ba0d8ff">
+   <path id="svg_3" d="m628.35,608.38c17.83,-2.87 36.72,1.39 51.5,11.78c11.22,8.66 19.01,21.64 21.26,35.65c1.53,10.68 0.49,21.75 -3.44,31.84c-3.02,8.73 -7.35,16.94 -12.17,24.81c-68.76,115.58 -137.5,231.17 -206.27,346.75c-8.8,14.47 -16.82,29.47 -26.96,43.07c-7.37,9.11 -16.58,16.85 -27.21,21.89c-22.47,11.97 -51.79,4.67 -68.88,-13.33c-8.66,-8.69 -13.74,-20.63 -14.4,-32.84c-0.98,-12.64 1.81,-25.42 7.53,-36.69c5.03,-10.96 10.98,-21.45 17.19,-31.77c30.22,-50.84 60.17,-101.84 90.3,-152.73c41.24,-69.98 83.16,-139.55 124.66,-209.37c4.41,-7.94 9.91,-15.26 16.09,-21.9c8.33,-8.46 18.9,-15.3 30.8,-17.16z" fill="#1ba0d8"/>
+  </g>
+ </g>
+</svg>

src/components/FileBrowser.vue

@@ -3,6 +3,7 @@ import type { Axios } from 'axios'
 import FileList from './filebrowser/FileList.vue'
 import FileToolbar from './filebrowser/FileToolbar.vue'
 import type { EndPoints, FileItem, StorageConf } from '@/api/types'
+import { storageOptions } from '@/api/constants'
 
 // 输入参数
 const props = defineProps({
@@ -27,29 +28,6 @@ const props = defineProps({
 // 对外事件
 const emit = defineEmits(['pathchanged'])
 
-const availableStorages = [
-  {
-    name: '本地',
-    code: 'local',
-    icon: 'mdi-folder-multiple-outline',
-  },
-  {
-    name: '阿里云盘',
-    code: 'alipan',
-    icon: 'mdi-cloud-outline',
-  },
-  {
-    name: '115网盘',
-    code: 'u115',
-    icon: 'mdi-cloud-outline',
-  },
-  {
-    name: 'Rclone网盘',
-    code: 'rclone',
-    icon: 'mdi-cloud-outline',
-  },
-]
-
 const fileIcons = {
   // 压缩包
   zip: 'mdi-folder-zip-outline',
@@ -151,7 +129,7 @@ const sort = ref('name')
 // 计算属性
 const storagesArray = computed(() => {
   const storageCodes = props.storages?.map(item => item.type)
-  return availableStorages.filter(item => storageCodes?.includes(item.code))
+  return storageOptions.filter(item => storageCodes?.includes(item.value))
 })
 
 // 方法

src/components/cards/DirectoryCard.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import type { TransferDirectoryConf } from '@/api/types'
 import { VDivider, VSpacer, VTextField } from 'vuetify/lib/components/index.mjs'
-import { useToast } from 'vue-toast-notification'
 import api from '@/api'
 import { nextTick } from 'vue'
+import { storageOptions } from '@/api/constants'
 
 // 输入参数
 const props = defineProps({
@@ -36,19 +36,12 @@ const typeItems = [
   { title: '电视剧', value: '电视剧' },
 ]
 
-// 存储下拉字典
-const storageItems = [
-  { title: '本地', value: 'local' },
-  { title: '阿里云盘', value: 'alipan' },
-  { title: '115网盘', value: 'u115' },
-  { title: 'Rclone网盘', value: 'rclone' },
-]
-
 // 自动整理方式下拉字典
 const transferSourceItems = [
-  { title: '不自动整理', value: '' },
+  { title: '不整理', value: '' },
   { title: '下载器监控', value: 'downloader' },
   { title: '目录监控', value: 'monitor' },
+  { title: '手动整理', value: 'manual' },
 ]
 
 // 监控模式下拉字典
@@ -227,7 +220,7 @@ watch(
             />
           </VCol>
           <VCol cols="4">
-            <VSelect v-model="props.directory.storage" variant="underlined" :items="storageItems" label="下载存储" />
+            <VSelect v-model="props.directory.storage" variant="underlined" :items="storageOptions" label="下载存储" />
           </VCol>
           <VCol cols="8">
             <VPathField @update:modelValue="updateDownloadPath" :storage="props.directory.storage">
@@ -272,7 +265,7 @@ watch(
             <VSelect
               v-model="props.directory.library_storage"
               variant="underlined"
-              :items="storageItems"
+              :items="storageOptions"
               label="媒体库存储"
             />
           </VCol>

src/components/cards/FilterRuleGroupCard.vue

@@ -48,10 +48,10 @@ const groupInfoDialog = ref(false)
 
 // 规则详情
 const groupInfo = ref<FilterRuleGroup>({
-  name: props.group?.name,
-  rule_string: props.group?.rule_string,
-  media_type: props.group?.media_type,
-  category: props.group?.category,
+  name: props.group?.name ?? '',
+  rule_string: props.group?.rule_string ?? '',
+  media_type: props.group?.media_type ?? '',
+  category: props.group?.category ?? '',
 })
 
 // 媒体类型字典
@@ -64,9 +64,10 @@ const mediaTypeItems = [
 // 根据选中的媒体类型，获取对应的媒体类别
 const getCategories = computed(() => {
   const default_value = [{ title: '全部', value: '' }]
-  if (!props.categories || !groupInfo.value.media_type || !props.categories[groupInfo.value.media_type ?? ''])
+  if (!props.categories || !groupInfo.value.media_type || !props.categories[groupInfo.value.media_type]) {
     return default_value
-  return default_value.concat(props.categories[groupInfo.value.media_type ?? ''])
+  }
+  return default_value.concat(props.categories[groupInfo.value.media_type] || [])
 })
 
 // 规则组规则卡片列表
@@ -81,7 +82,7 @@ const importCodeString = ref('')
 // 更新规则卡片的值
 function updateFilterCardValue(pri: string, rules: string[]) {
   const card = filterRuleCards.value.find(card => card.pri === pri)
-  if (card) card.rules = rules
+  if (card && Array.isArray(rules)) card.rules = rules
 }
 
 // 移除卡片
@@ -96,16 +97,13 @@ function filterCardClose(pri: string) {
 
 // 分享规则
 function shareRules() {
-  // 有值才处理
   if (filterRuleCards.value.length === 0) return
 
-  // 将卡片规则接装为字符串
   const value = filterRuleCards.value
-    .filter(card => card.rules.length > 0)
+    .filter(card => Array.isArray(card.rules) && card.rules.length > 0)
     .map(card => card.rules.join('&'))
     .join('>')
 
-  // 复制到剪贴板
   try {
     copyToClipboard(value)
     $toast.success('优先级规则已复制到剪贴板')
@@ -123,71 +121,57 @@ async function importRules() {
 // 监听导入代码变化
 watchEffect(() => {
   if (!importCodeString.value) return
-  // 导入代码需要以空格开头和结束，没有则拼接
+
   if (!importCodeString.value.startsWith(' ')) importCodeString.value = ` ${importCodeString.value}`
   if (!importCodeString.value.endsWith(' ')) importCodeString.value = `${importCodeString.value} `
-  // 将导入的代码转换为规则卡片
+
   const groups = importCodeString.value.split('>')
-  filterRuleCards.value = groups.map((group: string, index: number) => {
-    return {
-      pri: (index + 1).toString(),
-      rules: group.split('&'),
-    }
-  })
+  filterRuleCards.value = groups.map((group: string, index: number) => ({
+    pri: (index + 1).toString(),
+    rules: group.split('&').filter(rule => rule),
+  }))
 })
 
 // 增加卡片
 function addFilterCard() {
-  // 优先级
   const pri = (filterRuleCards.value.length + 1).toString()
-
-  // 新卡片
   const newCard: FilterCard = { pri, rules: [] }
-
-  // 添加到列表
   filterRuleCards.value.push(newCard)
 }
 
 // 根据列表的拖动顺序更新优先级
 function dragOrderEnd() {
-  filterRuleCards.value.map((card, index) => {
+  filterRuleCards.value.forEach((card, index) => {
     card.pri = (index + 1).toString()
-    return card
   })
 }
 
 // 打开详情弹窗
 function opengroupInfoDialog() {
-  // 深复制
   groupInfo.value = cloneDeep(props.group)
   if (props.group.rule_string) {
-    filterRuleCards.value = props.group.rule_string.split('>').map((group: string, index: number) => {
-      return {
-        pri: (index + 1).toString(),
-        rules: group.split('&'),
-      }
-    })
+    filterRuleCards.value = props.group.rule_string.split('>').map((group: string, index: number) => ({
+      pri: (index + 1).toString(),
+      rules: group.split('&').filter(rule => rule),
+    }))
   }
   groupInfoDialog.value = true
 }
 
 // 保存详情数据
 function saveGroupInfo() {
-  // 为空
-  if (!groupInfo.value.name) {
+  if (!groupInfo.value.name.trim()) {
     $toast.error('规则组名称不能为空')
     return
   }
-  // 重名判断
   if (props.groups.some(item => item.name === groupInfo.value.name && item !== props.group)) {
     $toast.error(`规则组名称【${groupInfo.value.name}】已存在，请替换`)
     return
   }
-  // 保存
+
   groupInfoDialog.value = false
-  // 更新到 groupInfo的rule_string
   groupInfo.value.rule_string = filterRuleCards.value
-    .filter(card => card.rules.length > 0)
+    .filter(card => Array.isArray(card.rules) && card.rules.length > 0)
     .map(card => card.rules.join('&'))
     .join('>')
   emit('change', groupInfo.value, props.group.name)

src/components/cards/MediaCard.vue

@@ -422,7 +422,6 @@ function onRemoveSubscribe() {
           aspect-ratio="2/3"
           :src="getImgUrl"
           class="object-cover aspect-w-2 aspect-h-3"
-          :class="hover.isHovering ? 'on-hover' : ''"
           cover
           @load="isImageLoaded = true"
           @error="imageLoadError = true"
@@ -433,6 +432,24 @@ function onRemoveSubscribe() {
             </div>
           </template>
         </VImg>
+        <!-- 详情 -->
+        <VCardText
+          v-show="hover.isHovering || imageLoadError"
+          class="w-full h-full flex flex-col flex-wrap justify-end align-left text-white absolute bottom-0 cursor-pointer pa-2"
+          style="background: linear-gradient(rgba(45, 55, 72, 40%) 0%, rgba(45, 55, 72, 90%) 100%)"
+        >
+          <span class="font-bold">{{ props.media?.year }}</span>
+          <h1 class="mb-1 text-white font-extrabold text-xl line-clamp-2 overflow-hidden text-ellipsis ...">
+            {{ props.media?.title }}
+          </h1>
+          <p class="leading-4 line-clamp-4 overflow-hidden text-ellipsis ...">
+            {{ props.media?.overview }}
+          </p>
+          <div class="flex align-center justify-between">
+            <IconBtn icon="mdi-magnify" color="white" @click.stop="handleSearch" />
+            <IconBtn icon="mdi-heart" :color="isSubscribed ? 'error' : 'white'" @click.stop="handleSubscribe" />
+          </div>
+        </VCardText>
         <!-- 类型角标 -->
         <VChip
           v-show="isImageLoaded"
@@ -455,23 +472,7 @@ function onRemoveSubscribe() {
         >
           {{ props.media?.vote_average }}
         </VChip>
-        <!-- 详情 -->
-        <VCardText
-          v-show="hover.isHovering || imageLoadError"
-          class="w-full flex flex-col flex-wrap justify-end align-left text-white absolute bottom-0 cursor-pointer pa-2"
-        >
-          <span class="font-bold">{{ props.media?.year }}</span>
-          <h1 class="mb-1 text-white font-extrabold text-xl line-clamp-2 overflow-hidden text-ellipsis ...">
-            {{ props.media?.title }}
-          </h1>
-          <p class="leading-4 line-clamp-4 overflow-hidden text-ellipsis ...">
-            {{ props.media?.overview }}
-          </p>
-          <div class="flex align-center justify-between">
-            <IconBtn icon="mdi-magnify" color="white" @click.stop="handleSearch" />
-            <IconBtn icon="mdi-heart" :color="isSubscribed ? 'error' : 'white'" @click.stop="handleSubscribe" />
-          </div>
-        </VCardText>
+        <!--来源图标-->
         <VAvatar
           size="24"
           density="compact"
@@ -551,9 +552,3 @@ function onRemoveSubscribe() {
     @remove="onRemoveSubscribe"
   />
 </template>
-
-<style lang="scss">
-.on-hover img {
-  @apply brightness-50;
-}
-</style>

src/components/cards/StorageCard.vue

@@ -5,11 +5,14 @@ import storage_png from '@images/misc/storage.png'
 import alipan_png from '@images/misc/alipan.webp'
 import u115_png from '@images/misc/u115.png'
 import rclone_png from '@images/misc/rclone.png'
+import alist_png from '@images/misc/alist.svg'
 import api from '@/api'
 import AliyunAuthDialog from '../dialog/AliyunAuthDialog.vue'
 import U115AuthDialog from '../dialog/U115AuthDialog.vue'
 import RcloneConfigDialog from '../dialog/RcloneConfigDialog.vue'
+import AlistConfigDialog from '../dialog/AlistConfigDialog.vue'
 import { useToast } from 'vue-toast-notification'
+import { isNullOrEmptyObject } from '@/@core/utils'
 
 // 定义输入
 const props = defineProps({
@@ -42,6 +45,8 @@ const aliyunAuthDialog = ref(false)
 const u115AuthDialog = ref(false)
 // Rclone配置对话框
 const rcloneConfigDialog = ref(false)
+// AList配置对话框
+const aListConfigDialog = ref(false)
 
 // 打开存储对话框
 function openStorageDialog() {
@@ -55,6 +60,9 @@ function openStorageDialog() {
     case 'rclone':
       rcloneConfigDialog.value = true
       break
+    case 'alist':
+      aListConfigDialog.value = true
+      break
     default:
       $toast.info('此存储类型无需配置参数，请直接配置目录！')
       break
@@ -72,6 +80,8 @@ const getIcon = computed(() => {
       return u115_png
     case 'rclone':
       return rclone_png
+    case 'alist':
+      return alist_png
     default:
       return storage_png
   }
@@ -109,6 +119,7 @@ function handleDone() {
   aliyunAuthDialog.value = false
   u115AuthDialog.value = false
   rcloneConfigDialog.value = false
+  aListConfigDialog.value = false
   emit('done')
 }
 
@@ -122,7 +133,7 @@ onMounted(() => {
       <div class="align-self-start flex-1">
         <h5 class="text-h6 mb-1">{{ storage.name }}</h5>
         <div class="mb-3 text-sm" v-if="total">{{ formatBytes(used, 1) }} / {{ formatBytes(total, 1) }}</div>
-        <div v-else>未配置</div>
+        <div v-else-if="isNullOrEmptyObject(storage.config)">未配置</div>
       </div>
       <VImg :src="getIcon" cover class="mt-5" max-width="3rem" min-width="3rem" />
     </VCardText>
@@ -133,10 +144,17 @@ onMounted(() => {
   <AliyunAuthDialog
     v-if="aliyunAuthDialog"
     v-model="aliyunAuthDialog"
+    :conf="props.storage.config || {}"
     @close="aliyunAuthDialog = false"
     @done="handleDone"
   />
-  <U115AuthDialog v-if="u115AuthDialog" v-model="u115AuthDialog" @close="u115AuthDialog = false" @done="handleDone" />
+  <U115AuthDialog
+    v-if="u115AuthDialog"
+    v-model="u115AuthDialog"
+    :conf="props.storage.config || {}"
+    @close="u115AuthDialog = false"
+    @done="handleDone"
+  />
   <RcloneConfigDialog
     v-if="rcloneConfigDialog"
     v-model="rcloneConfigDialog"
@@ -144,4 +162,11 @@ onMounted(() => {
     @close="rcloneConfigDialog = false"
     @done="handleDone"
   />
+  <AlistConfigDialog
+    v-if="aListConfigDialog"
+    v-model="aListConfigDialog"
+    :conf="props.storage.config || {}"
+    @close="aListConfigDialog = false"
+    @done="handleDone"
+  />
 </template>

src/components/dialog/AddDownloadDialog.vue

@@ -4,7 +4,7 @@ import api from '@/api'
 import { doneNProgress, startNProgress } from '@/api/nprogress'
 import type { DownloaderConf, MediaInfo, TorrentInfo, TransferDirectoryConf } from '@/api/types'
 import { formatFileSize } from '@/@core/utils/formatters'
-import { VCardTitle } from 'vuetify/lib/components/index.mjs'
+import { VCardTitle, VChip } from 'vuetify/lib/components/index.mjs'
 
 // 输入参数
 const props = defineProps({
@@ -119,37 +119,63 @@ onMounted(() => {
 })
 </script>
 <template>
-  <VDialog max-width="40rem" scrollable>
+  <VDialog max-width="45rem" scrollable>
     <VCard>
       <VCardItem>
-        <VCardTitle v-if="title">下载 - {{ title }}</VCardTitle>
+        <VCardTitle v-if="title">{{ torrent?.site_name }} - {{ title }}</VCardTitle>
         <VCardTitle v-else>确认下载</VCardTitle>
         <DialogCloseBtn @click="emit('close')" />
       </VCardItem>
       <VDivider />
       <VCardText>
+        <VList lines="one">
+          <VListItem>
+            <template #prepend>
+              <VIcon icon="mdi-web"></VIcon>
+            </template>
+            <VListItemTitle>
+              <span class="whitespace-break-spaces me-2">{{ torrent?.title }}</span>
+              <span class="text-green-700 ms-2 text-sm">↑{{ torrent?.seeders }}</span>
+              <span class="text-orange-700 ms-2 text-sm">↓{{ torrent?.peers }}</span>
+            </VListItemTitle>
+          </VListItem>
+          <VListItem>
+            <template #prepend>
+              <VIcon icon="mdi-subtitles-outline"></VIcon>
+            </template>
+            <VListItemTitle>
+              <span class="text-body-1 whitespace-break-spaces">{{ torrent?.description }}</span>
+            </VListItemTitle>
+          </VListItem>
+          <VListItem>
+            <template #prepend>
+              <VIcon icon="mdi-database"></VIcon>
+            </template>
+            <VListItemTitle>
+              <span class="text-body-1">
+                <VChip variant="tonal" label>
+                  {{ formatFileSize(torrent?.size || 0) }}
+                </VChip>
+              </span>
+            </VListItemTitle>
+          </VListItem>
+        </VList>
         <VRow>
-          <VCol cols="12" class="text-lg text-high-emphasis pb-0">
-            <div><strong>站点：</strong>{{ props.torrent?.site_name }}</div>
-            <div><strong>标题：</strong>{{ props.torrent?.title }}</div>
-            <div><strong>描述：</strong>{{ props.torrent?.description }}</div>
-            <div><strong>大小：</strong>{{ formatFileSize(props.torrent?.size || 0) }}</div>
-          </VCol>
           <VCol cols="12" md="4">
             <VSelect
               v-model="selectedDownloader"
               :items="downloaderOptions"
-              label="下载器"
+              label="指定下载器"
               variant="underlined"
-              placeholder="默认"
+              placeholder="留空默认"
             />
           </VCol>
           <VCol cols="12" md="8">
             <VCombobox
               v-model="selectedDirectory"
               :items="targetDirectories"
-              label="保存目录"
-              placeholder="自动"
+              label="指定保存目录"
+              placeholder="留空自动匹配"
               variant="underlined"
             />
           </VCol>

src/components/dialog/AlistConfigDialog.vue

@@ -0,0 +1,60 @@
+<script lang="ts" setup>
+import api from '@/api'
+
+// 定义输入
+const props = defineProps({
+  conf: {
+    type: Object as PropType<{ [key: string]: any }>,
+    required: true,
+  },
+})
+
+// 定义事件
+const emit = defineEmits(['done', 'close'])
+
+// 完成
+async function handleDone() {
+  await savaAlistConfig()
+  emit('done')
+}
+
+// 保存rclone设置
+async function savaAlistConfig() {
+  try {
+    await api.post(`storage/save/alist`, props.conf)
+  } catch (e) {
+    console.error(e)
+  }
+}
+</script>
+
+<template>
+  <VDialog width="50rem" scrollable max-height="85vh">
+    <VCard title="AList配置" class="rounded-t">
+      <DialogCloseBtn @click="emit('close')" />
+      <VCardText>
+        <VRow>
+          <VCol cols="12">
+            <VTextField v-model="props.conf.url" hint="AList服务地址" label="地址" persistent-hint />
+          </VCol>
+          <VCol cols="12" md="6">
+            <VTextField v-model="props.conf.username" hint="AList登录用户名" label="用户名" persistent-hint />
+          </VCol>
+          <VCol cols="12" md="6">
+            <VTextField
+              type="password"
+              v-model="props.conf.password"
+              hint="AList登录密码"
+              label="密码"
+              persistent-hint
+            />
+          </VCol>
+        </VRow>
+      </VCardText>
+      <VCardActions>
+        <VSpacer />
+        <VBtn variant="elevated" @click="handleDone" prepend-icon="mdi-check" class="px-5 me-3"> 完成 </VBtn>
+      </VCardActions>
+    </VCard>
+  </VDialog>
+</template>

src/components/dialog/AliyunAuthDialog.vue

@@ -2,6 +2,14 @@
 import QrcodeVue from 'qrcode.vue'
 import api from '@/api'
 
+// 定义输入
+const props = defineProps({
+  conf: {
+    type: Object as PropType<{ [key: string]: any }>,
+    required: true,
+  },
+})
+
 // 定义事件
 const emit = defineEmits(['done', 'close'])
 
@@ -25,6 +33,10 @@ let timeoutTimer: NodeJS.Timeout | undefined = undefined
 
 // 完成
 async function handleDone() {
+  clearTimeout(timeoutTimer)
+  if (props.conf?.refreshToken) {
+    await savaAliPanConfig()
+  }
   emit('done')
 }
 
@@ -75,6 +87,15 @@ async function checkQrcode() {
   }
 }
 
+// 保存cookie设置
+async function savaAliPanConfig() {
+  try {
+    await api.post(`storage/save/alipan`, props.conf)
+  } catch (e) {
+    console.error(e)
+  }
+}
+
 onMounted(async () => {
   await getQrcode()
   timeoutTimer = setTimeout(checkQrcode, 3000)
@@ -97,6 +118,13 @@ onUnmounted(() => {
           <template #prepend />
         </VAlert>
       </VCardText>
+      <VCardText>
+        <VRow>
+          <VCol class="mt-2">
+            <VTextField label="自定义refreshToken" v-model="props.conf.refreshToken" outlined dense />
+          </VCol>
+        </VRow>
+      </VCardText>
       <VCardActions>
         <VSpacer />
         <VBtn variant="elevated" @click="handleDone" prepend-icon="mdi-check" class="px-5 me-3"> 完成 </VBtn>

src/components/dialog/ImportCodeDialog.vue

@@ -18,7 +18,7 @@ function handleImport() {
 </script>
 
 <template>
-  <VDialog width="40rem" scrollable max-height="85vh">
+  <VDialog width="40rem" scrollable max-height="85vh" persistent>
     <VCard :title="props.title" class="rounded-t">
       <DialogCloseBtn @click="emit('close')" />
       <VCardText class="pt-2">

src/components/dialog/RcloneConfigDialog.vue

@@ -38,7 +38,7 @@ async function savaRcloneConfig() {
 
 <template>
   <VDialog width="50rem" scrollable max-height="85vh">
-    <VCard title="Rclone网盘配置" class="rounded-t">
+    <VCard title="RClone配置" class="rounded-t">
       <DialogCloseBtn @click="emit('close')" />
       <VCardText>
         <VRow>

src/components/dialog/ReorganizeDialog.vue

@@ -6,7 +6,7 @@ import { storageOptions } from '@/api/constants'
 import { numberValidator } from '@/@validators'
 import { useDisplay } from 'vuetify'
 import ProgressDialog from './ProgressDialog.vue'
-import { FileItem, TransferDirectoryConf } from '@/api/types'
+import { FileItem } from '@/api/types'
 
 // 显示器宽度
 const display = useDisplay()
@@ -85,36 +85,13 @@ const transferForm = reactive({
   from_history: false,
 })
 
-// 所有媒体库目录
-const directories = ref<TransferDirectoryConf[]>([])
-
-// 查询目录
-async function loadDirectories() {
-  try {
-    const result: { [key: string]: any } = await api.get('system/setting/Directories')
-    directories.value = result.data?.value ?? []
-  } catch (error) {
-    console.log(error)
+// 下载路径更新
+function updateTargetPath(value: string) {
+  if (value !== transferForm.target_path) {
+    transferForm.target_path = value // 仅在值真正改变时更新
   }
 }
 
-// 目的目录下拉框
-const targetDirectories = computed(() => {
-  const libraryDirectories = directories.value.map(item => item.library_path)
-  return [...new Set(libraryDirectories)]
-})
-
-// 监听目的路径变化，自动查询目录削配置
-watch(transferForm, async () => {
-  if (transferForm.target_path) {
-    const directory = directories.value.find(item => item.library_path === transferForm.target_path)
-    if (directory) {
-      transferForm.scrape = directory.scraping ?? false
-      transferForm.transfer_type = directory.transfer_type ?? ''
-    }
-  }
-})
-
 // 使用SSE监听加载进度
 function startLoadingProgress() {
   progressText.value = '请稍候 ...'
@@ -187,10 +164,6 @@ async function handleTransferLog(logid: number) {
     console.log(e)
   }
 }
-
-onMounted(() => {
-  loadDirectories()
-})
 </script>
 
 <template>
@@ -226,15 +199,20 @@ onMounted(() => {
                 persistent-hint
               />
             </VCol>
-            <VCol cols="12" md="12">
-              <VCombobox
-                v-model="transferForm.target_path"
-                :items="targetDirectories"
-                label="目的路径"
-                placeholder="留空自动"
-                hint="整理目的路径，留空将自动匹配"
-                persistent-hint
-              />
+            <VCol cols="12">
+              <VPathField @update:modelValue="updateTargetPath" :storage="transferForm.target_storage">
+                <template #activator="{ menuprops }">
+                  <VTextField
+                    v-model="transferForm.target_path"
+                    v-bind="menuprops"
+                    label="目的路径"
+                    placeholder="留空自动"
+                    hint="整理目的路径，留空将自动匹配"
+                    persistent-hint
+                    clearable
+                  />
+                </template>
+              </VPathField>
             </VCol>
           </VRow>
           <VRow>

src/components/dialog/SiteAddEditDialog.vue

@@ -60,6 +60,25 @@ const priorityItems = ref(
   })),
 )
 
+// 下载器选项
+const downloaderOptions = ref<{ title: string; value: string }[]>([])
+
+async function loadDownloaderSetting() {
+  try {
+    const result: { [key: string]: any } = await api.get('system/setting/Downloaders')
+    const downloaders = result.data?.value ?? []
+    downloaderOptions.value = [
+      { title: '默认', value: null },
+      ...downloaders.map((item: { name: any }) => ({
+        title: item.name,
+        value: item.name,
+      })),
+    ]
+  } catch (error) {
+    console.error('加载下载器设置失败:', error)
+  }
+}
+
 // 查询站点信息
 async function fetchSiteInfo() {
   try {
@@ -142,6 +161,7 @@ onMounted(async () => {
       isLimit.value = true
     if (siteForm.value.apikey) siteType.value = 'api'
   }
+  await loadDownloaderSetting()
 })
 </script>
 
@@ -186,7 +206,7 @@ onMounted(async () => {
             </VCol>
           </VRow>
           <VRow>
-            <VCol cols="12" md="9">
+            <VCol cols="12" md="6">
               <VTextField
                 v-model="siteForm.rss"
                 label="RSS地址"
@@ -195,7 +215,21 @@ onMounted(async () => {
               />
             </VCol>
             <VCol cols="12" md="3">
-              <VTextField v-model="siteForm.timeout" label="超时时间（秒）" hint="站点请求超时时间" persistent-hint />
+              <VTextField
+                v-model="siteForm.timeout"
+                label="超时时间（秒）"
+                hint="站点请求超时时间，为0时不限制"
+                persistent-hint
+              />
+            </VCol>
+            <VCol cols="6" md="3">
+              <VSelect
+                v-model="siteForm.downloader"
+                label="下载器"
+                :items="downloaderOptions"
+                hint="此站点使用的下载器"
+                persistent-hint
+              />
             </VCol>
           </VRow>
           <VTabs v-model="siteType" show-arrows class="v-tabs-pill mt-3">

src/components/dialog/SiteUserDataDialog.vue

@@ -31,8 +31,8 @@ const currentTheme = controlledComputed(
 // 站点数据列表
 const siteDatas = ref<SiteUserData[]>([])
 
-// 最新一天的数据，按时间倒序排序后取第一条记录
-const siteData = computed(() => siteDatas.value[0])
+// 最新一天的数据
+const siteData = computed(() => siteDatas.value[siteDatas.value.length - 1])
 
 
 // 站点数据列表中的上传量、下载量数据生成图形使用的数据
@@ -267,7 +267,7 @@ onBeforeMount(async () => {
   <VDialog scrollable eager max-width="80rem" :fullscreen="!display.mdAndUp.value">
     <VCard class="rounded-t">
       <VCardItem>
-        <VCardTitle>{{ `数据 - ${props.site?.name}` }} 
+        <VCardTitle>{{ `数据 - ${props.site?.name}` }}
         <IconBtn @click.stop="refreshSiteData" color="info"><VIcon icon="mdi-refresh"</VIcon></IconBtn>
         </VCardTitle>
         <DialogCloseBtn @click="emit('close')" />

src/components/dialog/SubscribeEditDialog.vue

@@ -50,6 +50,7 @@ const subscribeForm = ref<Subscribe>({
   sites: [],
   best_version: undefined,
   current_priority: 0,
+  downloader: '',
   date: '',
   show_edit_dialog: false,
 })
@@ -57,6 +58,25 @@ const subscribeForm = ref<Subscribe>({
 // 提示框
 const $toast = useToast()
 
+// 下载器选项
+const downloaderOptions = ref<{ title: string; value: string }[]>([])
+
+async function loadDownloaderSetting() {
+  try {
+    const result: { [key: string]: any } = await api.get('system/setting/Downloaders')
+    const downloaders = result.data?.value ?? []
+    downloaderOptions.value = [
+      { title: '默认', value: '' },
+      ...downloaders.map((item: { name: any }) => ({
+        title: item.name,
+        value: item.name,
+      })),
+    ]
+  } catch (error) {
+    console.error('加载下载器设置失败:', error)
+  }
+}
+
 // 加载规则组
 async function queryFilterRuleGroups() {
   try {
@@ -188,7 +208,7 @@ async function removeSubscribe() {
 // 查询下载目录
 async function loadDownloadDirectories() {
   try {
-    const result: { [key: string]: any } = await api.get('system/setting/DownloadDirectories')
+    const result: { [key: string]: any } = await api.get('system/setting/Directories')
     if (result.success && result.data?.value) {
       downloadDirectories.value = result.data.value
     }
@@ -200,8 +220,7 @@ async function loadDownloadDirectories() {
 // 保存目录下拉框
 const targetDirectories = computed(() => {
   // 去重后的下载目录
-  const directories = downloadDirectories.value.map(item => item.download_path)
-  return [...new Set(directories)]
+  return downloadDirectories.value.map(item => item.download_path)
 })
 
 // 质量选择框数据
@@ -292,6 +311,7 @@ onMounted(() => {
   queryFilterRuleGroups()
   loadDownloadDirectories()
   getSiteList()
+  loadDownloaderSetting()
   if (props.subid) getSubscribeInfo()
   if (props.default) queryDefaultSubscribeConfig()
 })
@@ -392,6 +412,26 @@ onMounted(() => {
                     />
                   </VCol>
                 </VRow>
+                <VRow>
+                  <VCol cols="12" md="6">
+                    <VSelect
+                      v-model="subscribeForm.downloader"
+                      :items="downloaderOptions"
+                      label="下载器"
+                      hint="指定该订阅使用的下载器，留空自动使用默认下载器"
+                      persistent-hint
+                    />
+                  </VCol>
+                  <VCol cols="12" md="6">
+                    <VCombobox
+                      v-model="subscribeForm.save_path"
+                      :items="targetDirectories"
+                      label="保存路径"
+                      hint="指定该订阅的下载保存路径，留空自动使用设定的下载目录"
+                      persistent-hint
+                    />
+                  </VCol>
+                </VRow>
                 <VRow>
                   <VCol cols="12" md="4">
                     <VSwitch
@@ -461,15 +501,6 @@ onMounted(() => {
                       persistent-hint
                     />
                   </VCol>
-                  <VCol cols="12" md="6">
-                    <VCombobox
-                      v-model="subscribeForm.save_path"
-                      :items="targetDirectories"
-                      label="自定义保存路径"
-                      hint="指定该订阅的下载保存路径，留空自动使用设定的下载目录"
-                      persistent-hint
-                    />
-                  </VCol>
                 </VRow>
                 <VRow v-if="!props.default">
                   <VCol cols="12">

src/components/dialog/U115AuthDialog.vue

@@ -1,6 +1,15 @@
 <script lang="ts" setup>
-import QrcodeVue from 'qrcode.vue'
 import api from '@/api'
+import QrcodeVue from 'qrcode.vue'
+import { VCardItem, VTextField } from 'vuetify/lib/components/index.mjs'
+
+// 定义输入
+const props = defineProps({
+  conf: {
+    type: Object as PropType<{ [key: string]: any }>,
+    required: true,
+  },
+})
 
 // 定义事件
 const emit = defineEmits(['done', 'close'])
@@ -9,7 +18,7 @@ const emit = defineEmits(['done', 'close'])
 const qrCodeContent = ref('')
 
 // 下方的提示信息
-const text = ref('请使用微信或115客户端扫码')
+const text = ref('请使用微信或115客户端扫码，或在下方输入Cookie')
 
 // 提醒类型
 const alertType = ref<'success' | 'info' | 'error' | 'warning' | undefined>('info')
@@ -19,6 +28,10 @@ let timeoutTimer: NodeJS.Timeout | undefined = undefined
 
 // 完成
 async function handleDone() {
+  clearTimeout(timeoutTimer)
+  if (props.conf?.cookie) {
+    await savaU115Config()
+  }
   emit('done')
 }
 
@@ -43,15 +56,21 @@ async function checkQrcode() {
     if (result.success && result.data) {
       const status = result.data.status
       text.value = result.data.tip
-      if (status == 1) {
-        // 已确认完成
-        alertType.value = 'success'
-        handleDone()
-      } else if (status == 0) {
+      if (status == 0) {
         alertType.value = 'info'
         // 新建、待扫码
         clearTimeout(timeoutTimer)
         timeoutTimer = setTimeout(checkQrcode, 3000)
+      } else if (status == 1) {
+        // 已扫码
+        alertType.value = 'info'
+        text.value = '已扫码，请确认登录'
+        clearTimeout(timeoutTimer)
+        timeoutTimer = setTimeout(checkQrcode, 3000)
+      } else if (status == 2) {
+        // 已确认完成
+        alertType.value = 'success'
+        handleDone()
       } else {
         // 过期或者已取消
         alertType.value = 'error'
@@ -65,6 +84,15 @@ async function checkQrcode() {
   }
 }
 
+// 保存cookie设置
+async function savaU115Config() {
+  try {
+    await api.post(`storage/save/u115`, props.conf)
+  } catch (e) {
+    console.error(e)
+  }
+}
+
 onMounted(async () => {
   await getQrcode()
   timeoutTimer = setTimeout(checkQrcode, 3000)
@@ -80,15 +108,20 @@ onUnmounted(() => {
     <VCard title="115网盘登录" class="rounded-t">
       <DialogCloseBtn @click="emit('close')" />
       <VCardText class="pt-2 flex flex-col items-center">
-        <div class="my-6 shadow-lg rounded border">
-          <VImg class="mx-auto" :src="qrCodeContent" style="block-size: 200px; inline-size: 200px">
-            <VSkeletonLoader v-if="!qrCodeContent" class="w-full h-full" />
-          </VImg>
+        <div class="my-6 shadow-lg rounded text-center p-3 border">
+          <QrcodeVue class="mx-auto" :value="qrCodeContent" :size="200" />
         </div>
         <VAlert variant="tonal" :type="alertType" class="my-4 text-center" :text="text">
           <template #prepend />
         </VAlert>
       </VCardText>
+      <VCardText>
+        <VRow>
+          <VCol class="mt-2">
+            <VTextField label="自定义Cookie" v-model="props.conf.cookie" outlined dense />
+          </VCol>
+        </VRow>
+      </VCardText>
       <VCardActions>
         <VSpacer />
         <VBtn variant="elevated" @click="handleDone" prepend-icon="mdi-check" class="px-5 me-3"> 完成 </VBtn>

src/components/dialog/UserAuthDialog.vue

@@ -0,0 +1,177 @@
+<script lang="ts" setup>
+import { isNullOrEmptyObject } from '@/@core/utils'
+import api from '@/api'
+import { useToast } from 'vue-toast-notification'
+
+// 定义事件
+const emit = defineEmits(['done', 'close'])
+
+// 提示框
+const $toast = useToast()
+
+// 是否加载中
+const loading = ref(false)
+
+// 用户认证表单
+const authForm = ref<any>({
+  site: null,
+  params: {},
+})
+
+// 所有认证站点
+const authSites = ref<{
+  [key: string]: {
+    name: string
+    icon: string
+    params: { [key: string]: any }
+  }
+}>({})
+
+// 生成站点拉选项
+const dropdownItems = computed(() => {
+  return Object.keys(authSites.value).map(key => {
+    return {
+      key,
+      name: authSites.value[key].name,
+      prependAvatar: authSites.value[key].icon,
+    }
+  })
+})
+
+// 读取authSites.params，生成表单配置列表
+const formFields = computed(() => {
+  const site = authSites.value[authForm.value.site]
+  return Object.keys(site?.params || {})
+    .filter(item => {
+      return site.params[item].name && site.params[item].type
+    })
+    .map(key => {
+      return {
+        key,
+        site: authForm.value.site,
+        name: site.params[key].name,
+        type: site.params[key].type,
+        placeholder: site.params[key].placeholder,
+        tooltip: site.params[key].tooltip,
+      }
+    })
+})
+
+// 查询之前使用的认证参数
+async function loadLastAuthParams() {
+  try {
+    const result: { [key: string]: any } = await api.get(`system/setting/UserSiteAuthParams`)
+    if (result.success) {
+      const ret = result.data?.value
+      if (ret && !isNullOrEmptyObject(ret.params)) {
+        authForm.value = ret
+      }
+    }
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+// 加载认证站点配置
+async function loadAuthSites() {
+  try {
+    authSites.value = (await api.get(`site/auth`)) || {}
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+// 完成
+async function handleDone() {
+  await checkUser()
+}
+
+// 认证处理
+async function checkUser() {
+  if (!authForm.value.site) {
+    $toast.error('请选择认证站点！')
+    return
+  }
+  if (!authSites.value[authForm.value.site]) {
+    $toast.error('站点配置不存在！')
+    return
+  }
+  if (formFields.value.length > 0) {
+    for (const field of formFields.value) {
+      if (!authForm.value.params[field.site.toUpperCase() + '_' + field.key.toUpperCase()]) {
+        $toast.error(`请输入${field.name}！`)
+        return
+      }
+    }
+  }
+  loading.value = true
+  try {
+    const result: { [key: string]: any } = await api.post(`site/auth`, authForm.value)
+    if (result.success) {
+      $toast.success('用户认证成功，请重新登录！')
+      // 1秒后刷新页面
+      setTimeout(() => {
+        emit('done')
+      }, 1000)
+    } else {
+      $toast.error(`认证失败：${result.message}`)
+    }
+  } catch (e) {
+    console.error(e)
+  }
+  loading.value = false
+}
+
+onMounted(async () => {
+  await loadAuthSites()
+  loadLastAuthParams()
+})
+</script>
+
+<template>
+  <VDialog width="40rem" scrollable max-height="85vh">
+    <VCard title="用户认证" class="rounded-t">
+      <DialogCloseBtn @click="emit('close')" />
+      <VCardText>
+        <VRow>
+          <VCol cols="12">
+            <VSelect
+              v-model="authForm.site"
+              :items="dropdownItems"
+              item-value="key"
+              item-title="name"
+              label="选择认证站点"
+              item-props
+            >
+            </VSelect>
+          </VCol>
+        </VRow>
+        <VRow>
+          <VCol v-for="param in formFields" :key="param.key">
+            <VTextField
+              v-model="authForm.params[param.site.toUpperCase() + '_' + param.key.toUpperCase()]"
+              :type="param.type"
+              :label="param.name"
+              :placeholder="param.placeholder"
+              :hint="param.tooltip"
+              clearable
+              persistent-hint
+            />
+          </VCol>
+        </VRow>
+      </VCardText>
+      <VCardText class="text-center">
+        <VBtn
+          variant="elevated"
+          @click="handleDone"
+          prepend-icon="mdi-check"
+          class="px-5"
+          size="large"
+          :disabled="loading"
+        >
+          开始认证
+        </VBtn>
+      </VCardText>
+    </VCard>
+  </VDialog>
+</template>

src/components/filebrowser/FileList.vue

@@ -106,9 +106,6 @@ const files = computed(() => items.value.filter(item => item.type === 'file' &&
 // 是否文件
 const isFile = computed(() => inProps.item.type == 'file')
 
-// 是否目录
-const isDir = computed(() => !isFile.value)
-
 // 需要整理的文件项
 const transferItems = ref<FileItem[]>([])
 
@@ -622,7 +619,8 @@ onMounted(() => {
                         v-if="inProps.icons && item.extension"
                         :icon="inProps.icons[item.extension.toLowerCase()] || inProps.icons?.other"
                       />
-                      <VIcon v-else icon="mdi-folder-outline" />
+                      <VIcon v-else-if="item.type == 'dir'" icon="mdi-folder-outline" />
+                      <VIcon v-else icon="mdi-file-outline" />
                     </template>
                   </template>
                   <VListItemTitle v-text="item.name" />

src/components/filebrowser/FileToolbar.vue

@@ -63,7 +63,7 @@ const pathSegments = computed(() => {
 
 // 当前存储
 const storageObject = computed(() => {
-  return inProps.storages?.find(item => item.code === inProps.storage)
+  return inProps.storages?.find(item => item.value === inProps.storage)
 })
 
 // 切换存储
@@ -127,19 +127,19 @@ const sortIcon = computed(() => {
           <VListItem
             v-for="(item, index) in storages"
             :key="index"
-            :disabled="item.code === storageObject?.code"
-            @click="changeStorage(item.code)"
+            :disabled="item.value === storageObject?.value"
+            @click="changeStorage(item.value)"
           >
             <template #prepend>
               <Icon :icon="item.icon" />
             </template>
-            <VListItemTitle>{{ item.name }}</VListItemTitle>
+            <VListItemTitle>{{ item.title }}</VListItemTitle>
           </VListItem>
         </VList>
       </VMenu>
       <VBtn variant="text" :input-value="item.path === '/'" class="px-1" @click="changePath(inProps.itemstack[0])">
         <VIcon :icon="storageObject?.icon" class="mr-2" />
-        {{ storageObject?.name }}
+        {{ storageObject?.title }}
       </VBtn>
       <template v-for="(segment, index) in pathSegments" :key="index">
         <VBtn

src/components/input/PathField.vue

@@ -3,7 +3,6 @@ import api from '@/api'
 import { FileItem } from '@/api/types'
 import { VTreeview } from 'vuetify/labs/VTreeview'
 
-// 输入变量为默认路径
 const props = defineProps({
   root: {
     type: String,
@@ -16,16 +15,12 @@ const props = defineProps({
   },
 })
 
-// update:modelValue 事件
 const emit = defineEmits(['update:modelValue'])
 
-// 激活的目录
 const activedDirs = ref<string[]>([])
-
-// 打开的目录
 const openedDirs = ref<string[]>([])
+const isUserAction = ref(false) // 标志：是否为用户主动操作
 
-// 目录列表
 const treeItems = ref<FileItem[]>([
   {
     name: '/',
@@ -37,19 +32,16 @@ const treeItems = ref<FileItem[]>([
   },
 ])
 
-// 拉取子目录
 async function fetchDirs(item: any) {
   return api
     .post('/storage/list', item)
     .then((data: any) => {
-      // 只添加目录到子目录
       data = data.filter((i: any) => i.type === 'dir')
       item.children.push(...data)
     })
     .catch(err => console.warn(err))
 }
 
-// 获取选择的目录路径
 const selectedPath = computed(() => {
   if (activedDirs.value.length > 0) {
     return activedDirs.value[0]
@@ -57,13 +49,12 @@ const selectedPath = computed(() => {
   return ''
 })
 
-// 监听目录变化
 watch(activedDirs, newVal => {
-  if (!newVal.length) return
-  emit('update:modelValue', selectedPath)
+  if (!newVal.length || !isUserAction.value) return
+  emit('update:modelValue', selectedPath.value)
+  isUserAction.value = false
 })
 
-// 监听存储变化
 watch(
   () => props.storage,
   async newVal => {
@@ -81,6 +72,10 @@ watch(
     activedDirs.value = []
   },
 )
+
+function handleUserSelect() {
+  isUserAction.value = true
+}
 </script>
 
 <template>
@@ -102,7 +97,7 @@ watch(
       max-height="20rem"
       expand-icon="mdi-folder"
       collapse-icon="mdi-folder-open"
-    >
-    </VTreeview>
+      @update:activated="handleUserSelect"
+    />
   </VMenu>
 </template>

src/layouts/components/UserProfile.vue

@@ -6,6 +6,7 @@ import router from '@/router'
 import avatar1 from '@images/avatars/avatar-1.png'
 import api from '@/api'
 import ProgressDialog from '@/components/dialog/ProgressDialog.vue'
+import UserAuthDialog from '@/components/dialog/UserAuthDialog.vue'
 
 // Vuex Store
 const store = useStore()
@@ -19,6 +20,9 @@ const $toast = useToast()
 // 进度框
 const progressDialog = ref(false)
 
+// 站点认证对话框
+const siteAuthDialog = ref(false)
+
 // 执行注销操作
 function logout() {
   // 清除登录状态信息
@@ -56,10 +60,22 @@ async function restart() {
   }
 }
 
+// 显示站点认证对话框
+function showSiteAuthDialog() {
+  siteAuthDialog.value = true
+}
+
+// 用户站点认证成功
+function siteAuthDone() {
+  siteAuthDialog.value = false
+  logout()
+}
+
 // 从Vuex Store中获取信息
 const superUser = computed(() => store.state.auth.superUser)
 const userName = computed(() => store.state.auth.userName)
 const avatar = computed(() => store.state.auth.avatar || avatar1)
+const userLevel = computed(() => store.state.auth.level)
 </script>
 
 <template>
@@ -94,6 +110,14 @@ const avatar = computed(() => store.state.auth.avatar || avatar1)
           <VListItemTitle>个人信息</VListItemTitle>
         </VListItem>
 
+        <!-- 👉 Site Auth -->
+        <VListItem v-if="userLevel < 2 && superUser" link @click="showSiteAuthDialog">
+          <template #prepend>
+            <VIcon class="me-2" icon="mdi-lock-check-outline" size="22" />
+          </template>
+          <VListItemTitle>用户认证</VListItemTitle>
+        </VListItem>
+
         <!-- 👉 FAQ -->
         <VListItem href="https://wiki.movie-pilot.org" target="_blank">
           <template #prepend>
@@ -126,4 +150,6 @@ const avatar = computed(() => store.state.auth.avatar || avatar1)
   </VAvatar>
   <!-- 重启进度框 -->
   <ProgressDialog v-if="progressDialog" v-model="progressDialog" text="正在重启 ..." />
+  <!-- 用户认证对话框 -->
+  <UserAuthDialog v-if="siteAuthDialog" v-model="siteAuthDialog" @done="siteAuthDone" @close="siteAuthDialog = false" />
 </template>

src/pages/subscribe.vue

@@ -2,7 +2,7 @@
 import SubscribeListView from '@/views/subscribe/SubscribeListView.vue'
 import SubscribePopularView from '@/views/subscribe/SubscribePopularView.vue'
 import SubscribeShareView from '@/views/subscribe/SubscribeShareView.vue'
-import { SubscribeMovieTabs } from '@/router/menu'
+import { SubscribeMovieTabs, SubscribeTvTabs } from '@/router/menu'
 import router from '@/router'
 
 const route = useRoute()
@@ -19,11 +19,11 @@ function jumpTab(tab: string) {
 <template>
   <div>
     <VTabs v-model="activeTab">
-      <VTab v-for="item in SubscribeMovieTabs" :value="item.tab" @to="jumpTab(item.tab)">
+      <VTab v-if="subType == '电影'" v-for="item in SubscribeMovieTabs" :value="item.tab" @to="jumpTab(item.tab)">
         <span class="mx-5">{{ item.title }}</span>
       </VTab>
-      <VTab v-if="subType == '电视剧'" value="share" @to="jumpTab('share')">
-        <span class="mx-5">订阅分享</span>
+      <VTab v-if="subType == '电视剧'" v-for="item in SubscribeTvTabs" :value="item.tab" @to="jumpTab(item.tab)">
+        <span class="mx-5">{{ item.title }}</span>
       </VTab>
     </VTabs>
 

src/router/menu.ts

@@ -219,6 +219,11 @@ export const SubscribeTvTabs = [
     tab: 'popular',
     icon: 'mdi-television',
   },
+  {
+    title: '订阅分享',
+    tab: 'share',
+    icon: 'mdi-television',
+  },
 ]
 
 // 插件标签页

src/views/setting/AccountSettingSite.vue

@@ -79,15 +79,7 @@ async function loadSiteSettings() {
       // 将API返回的值赋值给SystemSettings
       for (const sectionKey of Object.keys(siteSetting.value) as Array<keyof typeof siteSetting.value>) {
         Object.keys(siteSetting.value[sectionKey]).forEach((key: string) => {
-          let v: any
-          if (result.data.hasOwnProperty(key)) {
-            v = result.data[key]
-            // 空字符串转为null，避免空字符串导致前端显示问题
-            if (v === '') {
-              v = null
-            }
-            ;(siteSetting.value[sectionKey] as any)[key] = v
-          }
+          if (result.data.hasOwnProperty(key)) (siteSetting.value[sectionKey] as any)[key] = result.data[key]
         })
       }
     }