From 6275e06806335c5b468b2fd90b0893f9d250d6d0 Mon Sep 17 00:00:00 2001 From: wangdan-fit2cloud <79562285+wangdan-fit2cloud@users.noreply.github.com> Date: Tue, 20 Feb 2024 18:20:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?(#3928)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/app-status/index.vue | 10 +- frontend/src/components/status/index.vue | 10 +- frontend/src/lang/modules/en.ts | 6 +- frontend/src/lang/modules/tw.ts | 4 +- frontend/src/lang/modules/zh.ts | 4 +- frontend/src/styles/common.scss | 6 +- .../views/app-store/detail/params/index.vue | 2 +- .../app-store/installed/detail/index.vue | 7 +- .../src/views/app-store/installed/index.vue | 13 ++- .../src/views/container/compose/index.vue | 4 +- .../src/views/container/setting/index.vue | 2 +- frontend/src/views/cronjob/index.vue | 2 +- frontend/src/views/cronjob/operate/index.vue | 3 +- frontend/src/views/home/index.vue | 4 +- .../src/views/host/file-management/index.vue | 4 +- .../src/views/host/firewall/port/index.vue | 2 +- frontend/src/views/setting/about/index.vue | 1 - .../views/setting/backup-account/index.vue | 96 +++++++++++-------- frontend/src/views/setting/snapshot/index.vue | 5 +- .../src/views/website/runtime/node/index.vue | 4 +- .../src/views/website/runtime/php/index.vue | 2 +- 21 files changed, 110 insertions(+), 81 deletions(-) diff --git a/frontend/src/components/app-status/index.vue b/frontend/src/components/app-status/index.vue index ba5f45032..5a74a1b0e 100644 --- a/frontend/src/components/app-status/index.vue +++ b/frontend/src/components/app-status/index.vue @@ -76,15 +76,15 @@ diff --git a/frontend/src/components/status/index.vue b/frontend/src/components/status/index.vue index 0735732d4..17d38ff2f 100644 --- a/frontend/src/components/status/index.vue +++ b/frontend/src/components/status/index.vue @@ -1,9 +1,11 @@ diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 04ad6437b..6499f26a7 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -821,7 +821,8 @@ const message = { default_download_path: 'Default Download Link', saveLocal: 'Retain local backups (the same as the number of cloud storage copies)', url: 'URL Address', - targetHelper: 'Backup accounts are maintained in panel settings.', + target: 'Target', + targetHelper: 'Third-party backup accounts are maintained in panel settings.', retainCopies: 'Retain copies', retainCopiesHelper: 'Number of copies to retain for execution records and logs', retainCopiesHelper1: 'Number of copies to retain for backup files', @@ -1068,7 +1069,6 @@ const message = { hardLink: 'Hard link', linkPath: 'Link Path', selectFile: 'Select file', - downloadSuccess: 'Download succeeded', downloadUrl: 'Download URL', downloadStart: 'Download start!', moveSuccess: 'Move success', @@ -1083,6 +1083,7 @@ const message = { infoDetail: 'File Properties', list: 'File List', sub: 'Subdirectory', + downloadSuccess: 'Download Success', theme: 'Theme', language: 'Language', eol: 'End Of Line', @@ -1401,6 +1402,7 @@ const message = { backupData: 'Backup local backup directory for 1Panel', compress: 'Create snapshot file', upload: 'Upload snapshot file', + thirdPartySupport: 'Only third-party accounts are supported', recoverDetail: 'Recover detail', createSnapshot: 'Create snapshot', importSnapshot: 'Sync snapshot', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index 2403a3b05..92a46e419 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -781,7 +781,8 @@ const message = { default_download_path: '默認下載地址', saveLocal: '同時保留本地備份（和雲存儲保留份數一致）', url: 'URL 地址', - targetHelper: '備份賬號可在面板設置中維護', + target: '備份到', + targetHelper: '第三方備份賬號在面板設置中維護', retainCopies: '保留份數', retainCopiesHelper: '執行記錄及日誌保留份数', retainCopiesHelper1: '備份文件保留份数', @@ -1242,6 +1243,7 @@ const message = { backupData: '備份 1Panel 本地備份目錄', compress: '製作快照文件', upload: '上傳快照文件', + thirdPartySupport: '僅支持第三方賬號', recoverDetail: '恢復詳情', createSnapshot: '創建快照', importSnapshot: '同步快照', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index f76bf9fbe..2b574fbec 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -782,7 +782,8 @@ const message = { default_download_path: '默认下载地址', saveLocal: '同时保留本地备份（和云存储保留份数一致）', url: 'URL 地址', - targetHelper: '备份账号可在面板设置中维护', + target: '备份到', + targetHelper: '第三方备份账号在面板设置中维护', retainCopies: '保留份数', retainCopiesHelper: '执行记录及日志保留份数', retainCopiesHelper1: '备份文件保留份数', @@ -1243,6 +1244,7 @@ const message = { backupData: '备份 1Panel 本地备份目录', compress: '制作快照文件', upload: '上传快照文件', + thirdPartySupport: '仅支持第三方账号', recoverDetail: '恢复详情', createSnapshot: '创建快照', importSnapshot: '同步快照', diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss index 5666d0f0e..676c69ecb 100644 --- a/frontend/src/styles/common.scss +++ b/frontend/src/styles/common.scss @@ -409,4 +409,8 @@ html { .p-ml-5 { margin-left: 5px !important; -} \ No newline at end of file +} + +.p-mb-5 { + margin-bottom: 5px !important; +} diff --git a/frontend/src/views/app-store/detail/params/index.vue b/frontend/src/views/app-store/detail/params/index.vue index 10e85339c..2b6e8ae1a 100644 --- a/frontend/src/views/app-store/detail/params/index.vue +++ b/frontend/src/views/app-store/detail/params/index.vue @@ -42,7 +42,7 @@ {{ $t('app.toInstall') }} - + - + { type: d.type, values: d.values, showValue: d.showValue, - multiple: d.multiple, }); rules.params[d.key] = [Rules.requiredInput]; if (d.rule) { diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue index d94051cf3..94bc4f14e 100644 --- a/frontend/src/views/app-store/installed/index.vue +++ b/frontend/src/views/app-store/installed/index.vue @@ -79,11 +79,14 @@