diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index b4cb2cfc5..69f5f41a9 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -405,7 +405,7 @@ export default { custom: 'Custom', emptyUser: 'When empty, you will log in as default', - containerTerminal: 'Container terminal', + containerTerminal: 'Terminal', port: 'Port', exposePort: 'Expose port', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 8885002ce..9bb436a57 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -418,7 +418,7 @@ export default { newName: '新名称', custom: '自定义', - containerTerminal: '容器终端', + containerTerminal: '终端', emptyUser: '为空时,将使用容器默认的用户登录', port: '端口', diff --git a/frontend/src/views/container/container/create/index.vue b/frontend/src/views/container/container/create/index.vue index a25e59181..15d45b488 100644 --- a/frontend/src/views/container/container/create/index.vue +++ b/frontend/src/views/container/container/create/index.vue @@ -10,7 +10,7 @@ - + - + - + {{ $t('commons.table.status') }} @@ -101,7 +101,7 @@ - + - + @@ -157,7 +157,21 @@ - {{ dialogData.rowData!.sourceDir }} + + {{ dialogData.rowData!.sourceDir }} + + + + + {{ dialogData.rowData!.sourceDir.substring(0, 20) }}... + + + @@ -450,7 +464,8 @@ const onDownload = async (recordID: number, backupID: number) => { a.download = dialogData.value.rowData!.website + '_' + dateFormatForName(currentRecord.value?.startTime) + '.tar.gz'; } else { - a.download = dateFormatForName(currentRecord.value?.startTime) + '.sql.gz'; + let name = dialogData.value.rowData!.sourceDir.replaceAll('/', '_'); + a.download = name + '_' + dateFormatForName(currentRecord.value?.startTime) + '.tar.gz'; } const event = new MouseEvent('click'); a.dispatchEvent(event); diff --git a/frontend/src/views/setting/backup-account/index.vue b/frontend/src/views/setting/backup-account/index.vue index a42585bf2..9590b6024 100644 --- a/frontend/src/views/setting/backup-account/index.vue +++ b/frontend/src/views/setting/backup-account/index.vue @@ -5,25 +5,24 @@ - - - - - {{ $t('setting.LOCAL') }} - - - - {{ $t('commons.button.edit') }} - - - + + + {{ $t('setting.LOCAL') }} + + + {{ $t('commons.button.edit') }} + + + + + {{ localData.varsJson['dir'] }} {{ dateFormat(0, 0, localData.createdAt) }} - + @@ -31,203 +30,156 @@ {{ $t('setting.thirdParty') }} - + - - - - {{ $t('setting.S3') }} - - - {{ $t('commons.button.delete') }} - - - {{ $t('commons.button.edit') }} - - - - - - {{ s3Data.varsJson['region'] }} - - - {{ s3Data.varsJson['endpoint'] }} - - - {{ s3Data.bucket }} - - - {{ dateFormatSimple(s3Data.createdAt) }} - - - + + + {{ $t('setting.S3') }} + - {{ $t('setting.createBackupAccount', ['S3']) }} + {{ $t('commons.button.edit') }} - - + + {{ $t('commons.button.delete') }} + + + + + + + {{ s3Data.varsJson['region'] }} + + + {{ s3Data.varsJson['endpoint'] }} + + + {{ s3Data.bucket }} + + + {{ dateFormatSimple(s3Data.createdAt) }} + + + + + {{ $t('setting.createBackupAccount', ['S3']) }} + + - - - - {{ $t('setting.OSS') }} - - - {{ $t('commons.button.delete') }} - - - {{ $t('commons.button.edit') }} - - - - - - {{ ossData.varsJson['endpoint'] }} - - - {{ ossData.bucket }} - - - {{ dateFormatSimple(ossData.createdAt) }} - - - + + + {{ $t('setting.OSS') }} + - {{ $t('setting.createBackupAccount', ['OSS']) }} + {{ $t('commons.button.edit') }} - - + + {{ $t('commons.button.delete') }} + + + + + + + + {{ ossData.varsJson['endpoint'] }} + + + {{ ossData.bucket }} + + + {{ dateFormatSimple(ossData.createdAt) }} + + + + + {{ $t('setting.createBackupAccount', ['OSS']) }} + + - - - - MINIO - - - {{ $t('commons.button.delete') }} - - - {{ $t('commons.button.edit') }} - - - - - - {{ minioData.varsJson['endpoint'] }} - - - {{ minioData.bucket }} - - - {{ dateFormatSimple(minioData.createdAt) }} - - - + + + MINIO + - {{ $t('setting.createBackupAccount', ['MINIO']) }} + {{ $t('commons.button.edit') }} - - + + {{ $t('commons.button.delete') }} + + + + + + + {{ minioData.varsJson['endpoint'] }} + + + {{ minioData.bucket }} + + + {{ dateFormatSimple(minioData.createdAt) }} + + + + + {{ $t('setting.createBackupAccount', ['MINIO']) }} + + - - - - SFTP - - - {{ $t('commons.button.delete') }} - - - {{ $t('commons.button.edit') }} - - - - - - {{ sftpData.varsJson['address'] }} - - - {{ sftpData.varsJson['port'] }} - - - {{ sftpData.bucket }} - - - {{ dateFormatSimple(sftpData.createdAt) }} - - - + + + SFTP + - {{ $t('setting.createBackupAccount', ['SFTP']) }} + {{ $t('commons.button.edit') }} - - + + {{ $t('commons.button.delete') }} + + + + + + + {{ sftpData.varsJson['address'] }} + + + {{ sftpData.varsJson['port'] }} + + + {{ sftpData.bucket }} + + + {{ dateFormatSimple(sftpData.createdAt) }} + + + + + {{ $t('setting.createBackupAccount', ['SFTP']) }} + + @@ -367,3 +319,16 @@ onMounted(() => { search(); }); + +