From 4a2073a0386bffa4fe9f863606450f92d0445fb9 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 10 Sep 2025 16:56:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE=E5=90=91?= =?UTF-8?q?=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/input/PathInput.vue | 1 - src/composables/useSetupWizard.ts | 54 +++++++++++++++---------- src/layouts/components/UserProfile.vue | 2 +- src/locales/en-US.ts | 7 ++-- src/locales/zh-CN.ts | 11 ++--- src/locales/zh-TW.ts | 7 ++-- src/pages/setup.vue | 48 +++++++++------------- src/views/setup/StorageSettingsStep.vue | 8 ++-- 8 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/components/input/PathInput.vue b/src/components/input/PathInput.vue index 8fb77258..7a1109c0 100644 --- a/src/components/input/PathInput.vue +++ b/src/components/input/PathInput.vue @@ -10,7 +10,6 @@ const props = defineProps({ root: { type: String, default: '/', - required: true, }, storage: { type: String, diff --git a/src/composables/useSetupWizard.ts b/src/composables/useSetupWizard.ts index 8eb5e9f8..8460544a 100644 --- a/src/composables/useSetupWizard.ts +++ b/src/composables/useSetupWizard.ts @@ -232,12 +232,13 @@ export function useSetupWizard() { if (wizardData.value.downloader.type === type) { // 重复点击已选中的类型，取消选择 wizardData.value.downloader.type = '' - wizardData.value.downloader.name = '' - wizardData.value.downloader.config = {} } else { wizardData.value.downloader.type = type - wizardData.value.downloader.name = `${type} 下载器` - wizardData.value.downloader.config = {} + // 如果名称为空或为默认名称，则设置默认名称 + if (!wizardData.value.downloader.name || wizardData.value.downloader.name.includes('下载器')) { + wizardData.value.downloader.name = `${type} 下载器` + } + // 不清空config，保留用户已输入的值 } } @@ -246,14 +247,13 @@ export function useSetupWizard() { if (wizardData.value.mediaServer.type === type) { // 重复点击已选中的类型，取消选择 wizardData.value.mediaServer.type = '' - wizardData.value.mediaServer.name = '' - wizardData.value.mediaServer.config = {} - wizardData.value.mediaServer.sync_libraries = [] } else { wizardData.value.mediaServer.type = type - wizardData.value.mediaServer.name = `${type} 服务器` - wizardData.value.mediaServer.config = {} - wizardData.value.mediaServer.sync_libraries = [] + // 如果名称为空或为默认名称，则设置默认名称 + if (!wizardData.value.mediaServer.name || wizardData.value.mediaServer.name.includes('服务器')) { + wizardData.value.mediaServer.name = `${type} 服务器` + } + // 不清空config和sync_libraries，保留用户已输入的值 } } @@ -262,16 +262,14 @@ export function useSetupWizard() { if (wizardData.value.notification.type === type) { // 重复点击已选中的类型，取消选择 wizardData.value.notification.type = '' - wizardData.value.notification.name = '' - wizardData.value.notification.enabled = false - wizardData.value.notification.config = {} - wizardData.value.notification.switchs = [] } else { wizardData.value.notification.type = type - wizardData.value.notification.name = `${type} 通知` + // 如果名称为空或为默认名称，则设置默认名称 + if (!wizardData.value.notification.name || wizardData.value.notification.name.includes('通知')) { + wizardData.value.notification.name = `${type} 通知` + } wizardData.value.notification.enabled = true - wizardData.value.notification.config = {} - wizardData.value.notification.switchs = [] + // 不清空config和switchs，保留用户已输入的值 } } @@ -924,6 +922,7 @@ export function useSetupWizard() { const directory = { name: '默认目录', storage: 'local', + library_storage: 'local', download_path: wizardData.value.storage.downloadPath, library_path: wizardData.value.storage.libraryPath, priority: 0, @@ -955,12 +954,15 @@ export function useSetupWizard() { async function saveDownloaderSettings() { if (wizardData.value.downloader.type) { try { + // 只保存当前选中类型的配置 + const config = { ...wizardData.value.downloader.config } + const downloader = { name: wizardData.value.downloader.name, type: wizardData.value.downloader.type, default: true, enabled: true, - config: wizardData.value.downloader.config, + config: config, } const response: { [key: string]: any } = await api.post('system/setting/Downloaders', [downloader]) @@ -981,11 +983,16 @@ export function useSetupWizard() { async function saveMediaServerSettings() { if (wizardData.value.mediaServer.type) { try { + // 只保存当前选中类型的配置 + const config = { ...wizardData.value.mediaServer.config } + const sync_libraries = [...(wizardData.value.mediaServer.sync_libraries || [])] + const mediaServer = { name: wizardData.value.mediaServer.name, type: wizardData.value.mediaServer.type, enabled: true, - config: wizardData.value.mediaServer.config, + config: config, + sync_libraries: sync_libraries, } const response: { [key: string]: any } = await api.post('system/setting/MediaServers', [mediaServer]) @@ -1006,11 +1013,16 @@ export function useSetupWizard() { async function saveNotificationSettings() { if (wizardData.value.notification.type) { try { + // 只保存当前选中类型的配置 + const config = { ...wizardData.value.notification.config } + const switchs = [...(wizardData.value.notification.switchs || [])] + const notification = { name: wizardData.value.notification.name, type: wizardData.value.notification.type, - enabled: true, - config: wizardData.value.notification.config, + enabled: wizardData.value.notification.enabled, + config: config, + switchs: switchs, } const response: { [key: string]: any } = await api.post('system/setting/Notifications', [notification]) diff --git a/src/layouts/components/UserProfile.vue b/src/layouts/components/UserProfile.vue index 3cfe9c99..a226e93b 100644 --- a/src/layouts/components/UserProfile.vue +++ b/src/layouts/components/UserProfile.vue @@ -526,7 +526,7 @@ onUnmounted(() => { - {{ t('user.systemSettings') }} + {{ isAdvancedMode ? t('user.systemSettings') : t('user.wizardSettings') }} diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index e49ef646..b82f6c2b 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -372,6 +372,7 @@ export default { deleteFailed: 'Failed to delete user!', profile: 'Profile', systemSettings: 'System Settings', + wizardSettings: 'Setup Wizard', siteAuth: 'User Authentication', helpDocs: 'Help Documents', restart: 'Restart', @@ -2948,7 +2949,7 @@ export default { apiTokenRequired: 'API Token is required', }, storage: { - title: 'Storage Configuration', + title: 'Storage', description: 'Configure download directory and media library directory', info: 'Storage Configuration', infoDesc: 'Configure local storage directories for download and media library management', @@ -2960,7 +2961,7 @@ export default { libraryPathRequired: 'Media library directory is required', }, downloader: { - title: 'Downloader Configuration', + title: 'Downloader', description: 'Configure downloader', info: 'Downloader Configuration', infoDesc: 'Configure downloader for resource download, can choose qBittorrent or Transmission', @@ -2992,7 +2993,7 @@ export default { token: 'Access Token', }, notification: { - title: 'Notification Settings', + title: 'Notification', description: 'Configure notification channels', info: 'Notification Configuration', infoDesc: 'Configure notification channels for receiving system messages (optional)', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 527e08c9..e06b1408 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -370,6 +370,7 @@ export default { deleteFailed: '用户删除失败！', profile: '个人信息', systemSettings: '系统设定', + wizardSettings: '设置向导', siteAuth: '用户认证', helpDocs: '帮助文档', restart: '重启', @@ -1791,11 +1792,7 @@ export default { webPush: 'WebPush', creatingUser: '正在创建【{name}】用户，请稍后', updatingUser: '正在更新【{name}】用户，请稍后', - usernameRequired: '用户名不能为空', usernameExists: '用户名已存在', - passwordMinLength: '密码长度不能少于6位字符', - confirmPasswordRequired: '请确认密码', - passwordMismatch: '两次输入的密码不一致', userCreated: '用户【{name}】创建成功', userCreateFailed: '创建用户失败：{message}', userUpdateSuccess: '用户【{name}】更新成功', @@ -2939,7 +2936,7 @@ export default { apiTokenRequired: 'API Token不能为空', }, storage: { - title: '存储配置', + title: '存储', description: '配置下载目录和媒体库目录', info: '存储配置说明', infoDesc: '配置本地存储目录，用于下载和媒体库管理', @@ -2951,7 +2948,7 @@ export default { libraryPathRequired: '媒体库目录不能为空', }, downloader: { - title: '下载器配置', + title: '下载器', description: '配置下载器', info: '下载器配置说明', infoDesc: '配置下载器用于下载资源，可选择qBittorrent或Transmission', @@ -2983,7 +2980,7 @@ export default { token: '访问令牌', }, notification: { - title: '通知设置', + title: '通知', description: '配置通知渠道', info: '通知配置说明', infoDesc: '配置通知渠道用于接收系统消息（可选）', diff --git a/src/locales/zh-TW.ts b/src/locales/zh-TW.ts index 462ad763..122d6146 100644 --- a/src/locales/zh-TW.ts +++ b/src/locales/zh-TW.ts @@ -371,6 +371,7 @@ export default { deleteFailed: '用戶刪除失敗！', profile: '個人信息', systemSettings: '系統設定', + wizardSettings: '設定向導', siteAuth: '用戶認證', helpDocs: '幫助文檔', restart: '重啟', @@ -2903,7 +2904,7 @@ export default { apiTokenRequired: 'API Token 不能為空', }, storage: { - title: '儲存配置', + title: '儲存', description: '設定下載目錄和媒體庫目錄', info: '儲存設定說明', infoDesc: '設定本機儲存目錄，用於下載和媒體庫管理', @@ -2915,7 +2916,7 @@ export default { libraryPathRequired: '媒體庫目錄不能為空', }, downloader: { - title: '下載器配置', + title: '下載器', description: '設定下載器', info: '下載器設定說明', infoDesc: '設定下載器用於下載資源，可選擇qBittorrent或Transmission', @@ -2947,7 +2948,7 @@ export default { token: '存取權杖', }, notification: { - title: '通知設定', + title: '通知', description: '設定通知管道', info: '通知設定說明', infoDesc: '設定通知管道用於接收系統訊息（可選）', diff --git a/src/pages/setup.vue b/src/pages/setup.vue index 9f7dc7ea..4c0d33ea 100644 --- a/src/pages/setup.vue +++ b/src/pages/setup.vue @@ -10,10 +10,14 @@ import MediaServerSettingsStep from '@/views/setup/MediaServerSettingsStep.vue' import NotificationSettingsStep from '@/views/setup/NotificationSettingsStep.vue' import PreferencesSettingsStep from '@/views/setup/PreferencesSettingsStep.vue' import ConnectivityTest from '@/views/setup/ConnectivityTest.vue' +import { useDisplay } from 'vuetify' const { t } = useI18n() const router = useRouter() +// 显示器宽度 +const display = useDisplay() + const { currentStep, totalSteps, stepTitles, connectivityTest, nextStep, prevStep, completeWizard, initialize } = useSetupWizard() @@ -28,20 +32,27 @@ onMounted(async () => {
-
+ +
+ + +

{{ t('setupWizard.title') }}

{{ t('setupWizard.subtitle') }}

+ + +
-
-
+ + - +