diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 099080a18..b4cb2cfc5 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -745,10 +745,12 @@ export default { thirdParty: 'Third-party account', createBackupAccount: 'Create {0} backup account', noTypeForCreate: 'No backup type is currently created', - serverDisk: 'Server disks', + LOCAL: 'Server disks', currentPath: 'Current path', OSS: 'Ali OSS', S3: 'Amazon S3', + MINIO: 'MINIO', + SFTP: 'SFTP', backupAccount: 'Backup account', loadBucket: 'Get bucket', accountName: 'Account name', @@ -759,7 +761,7 @@ export default { password: 'Password', path: 'Path', - safe: 'Safe', + safe: 'Security', safeEntrance: 'Security entrance', safeEntranceHelper: 'Panel management portal. You can log in to the panel only through a specified security portal, for example: onepanel', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index ddfdb4a80..8885002ce 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -751,10 +751,12 @@ export default { thirdParty: '第三方账号', createBackupAccount: '添加 {0} 备份账号', noTypeForCreate: '当前无可创建备份类型', - serverDisk: '服务器磁盘', + LOCAL: '服务器磁盘', currentPath: '当前路径', OSS: '阿里云 OSS', S3: '亚马逊 S3 云存储', + MINIO: 'MINIO', + SFTP: 'SFTP', backupAccount: '备份账号', loadBucket: '获取桶', accountName: '账户名称', @@ -816,7 +818,7 @@ export default { monitor: '监控', enableMonitor: '监控状态', - storeDays: '过期时间 (天)', + storeDays: 'Retention days (days)', cleanMonitor: '清空监控记录', message: '通知', diff --git a/frontend/src/views/container/compose/create/index.vue b/frontend/src/views/container/compose/create/index.vue index 0aa35c7fd..9836ec84a 100644 --- a/frontend/src/views/container/compose/create/index.vue +++ b/frontend/src/views/container/compose/create/index.vue @@ -12,7 +12,7 @@ - {{ $t('container.edit') }} + {{ $t('commons.button.edit') }} {{ $t('container.pathSelect') }} {{ $t('container.composeTemplate') }} diff --git a/frontend/src/views/container/compose/detail/index.vue b/frontend/src/views/container/compose/detail/index.vue index e729e9aa2..bff5d4d96 100644 --- a/frontend/src/views/container/compose/detail/index.vue +++ b/frontend/src/views/container/compose/detail/index.vue @@ -3,35 +3,31 @@
- -
- {{ composeName }} -
-
- -
- - {{ $t('container.start') }} - - - - {{ $t('container.stop') }} - - - - {{ $t('container.remove') }} - -
-
- -
-
+
+ {{ composeName }} +
+
+ + {{ $t('container.start') }} + + + + {{ $t('container.stop') }} + + + + {{ $t('container.remove') }} + +
+
+ +
diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue index 3cc8744de..f382eaeb2 100644 --- a/frontend/src/views/container/compose/index.vue +++ b/frontend/src/views/container/compose/index.vue @@ -195,6 +195,9 @@ const buttons = [ click: (row: Container.ComposeInfo) => { onEdit(row); }, + disabled: (row: any) => { + return row.createdBy !== '1Panel'; + }, }, { label: i18n.global.t('commons.button.delete'), diff --git a/frontend/src/views/container/container/log/index.vue b/frontend/src/views/container/container/log/index.vue index b982047fa..15d8daae2 100644 --- a/frontend/src/views/container/container/log/index.vue +++ b/frontend/src/views/container/container/log/index.vue @@ -4,7 +4,7 @@
- +
diff --git a/frontend/src/views/cronjob/index.vue b/frontend/src/views/cronjob/index.vue index e042af0ad..50ed89f71 100644 --- a/frontend/src/views/cronjob/index.vue +++ b/frontend/src/views/cronjob/index.vue @@ -104,7 +104,7 @@ { data.value = res.data.items || []; for (const item of data.value) { if (item.targetDir !== '-') { - item.targetDir = loadBackupName(item.targetDir); + item.targetDir = i18n.global.t('setting.' + item.targetDir); } } paginationConfig.total = res.data.total; diff --git a/frontend/src/views/cronjob/operate/index.vue b/frontend/src/views/cronjob/operate/index.vue index 59f7923e3..238405901 100644 --- a/frontend/src/views/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/operate/index.vue @@ -160,7 +160,6 @@