From aab8df6abc2d151bafef8284070212c1185bd669 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Thu, 9 Jan 2025 21:59:41 +0800 Subject: [PATCH] fix: Fix the issue of database cover exception display. (#7682) --- frontend/src/components/app-status/index.vue | 35 +++++++++----------- frontend/src/lang/modules/en.ts | 1 + frontend/src/lang/modules/ja.ts | 1 + frontend/src/lang/modules/ms.ts | 1 + frontend/src/lang/modules/pt-br.ts | 1 + frontend/src/lang/modules/ru.ts | 1 + frontend/src/lang/modules/tw.ts | 1 + frontend/src/lang/modules/zh.ts | 1 + frontend/src/views/host/ssh/index.vue | 2 +- frontend/src/views/host/ssh/ssh/index.vue | 2 +- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/frontend/src/components/app-status/index.vue b/frontend/src/components/app-status/index.vue index 15b07c091..c5046f9db 100644 --- a/frontend/src/components/app-status/index.vue +++ b/frontend/src/components/app-status/index.vue @@ -187,31 +187,26 @@ const clear = () => { }; const onOperate = async (operation: string) => { - em('update:maskShow', false); operateReq.operate = operation; ElMessageBox.confirm(i18n.global.t(`app.${operation}OperatorHelper`), i18n.global.t('app.' + operation), { confirmButtonText: i18n.global.t('commons.button.confirm'), cancelButtonText: i18n.global.t('commons.button.cancel'), type: 'info', - }) - .then(() => { - em('update:maskShow', true); - em('update:loading', true); - em('before'); - InstalledOp(operateReq) - .then(() => { - em('update:loading', false); - MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); - onCheck(key.value, name.value); - em('after'); - }) - .catch(() => { - em('update:loading', false); - }); - }) - .catch(() => { - em('update:maskShow', true); - }); + }).then(() => { + em('update:maskShow', true); + em('update:loading', true); + em('before'); + InstalledOp(operateReq) + .then(() => { + em('update:loading', false); + MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); + onCheck(key.value, name.value); + em('after'); + }) + .catch(() => { + em('update:loading', false); + }); + }); }; const getTitle = (key: string) => { diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index aebd20a88..a9d857289 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1321,6 +1321,7 @@ const message = { panelInstallDir: `1Panel installation directory can't be deleted`, }, ssh: { + setting: 'Setting', autoStart: 'Auto start', enable: 'Enable Autostart', disable: 'Disable Autostart', diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index 3ad20de41..0371d097b 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -1298,6 +1298,7 @@ const message = { panelInstallDir: `1Panelインストールディレクトリは削除できません`, }, ssh: { + setting: '設定', autoStart: 'オートスタート', enable: 'AutoStartを有効にします', disable: 'AutoStartを無効にします', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index d3ca6530c..a6d40fd08 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -1341,6 +1341,7 @@ const message = { panelInstallDir: 'Direktori pemasangan 1Panel tidak boleh dipadamkan', }, ssh: { + setting: 'tetapan', autoStart: 'Mula automatik', enable: 'Aktifkan Mula Automatik', disable: 'Nyahaktif Mula Automatik', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index 1e40a743b..454bfa4bd 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -1327,6 +1327,7 @@ const message = { panelInstallDir: 'O diretório de instalação do 1Panel não pode ser excluído', }, ssh: { + setting: 'configuração', autoStart: 'Início automático', enable: 'Habilitar início automático', disable: 'Desabilitar início automático', diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index cfd8d3d54..17592b6ee 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -1329,6 +1329,7 @@ const message = { panelInstallDir: 'Директорию установки 1Panel нельзя удалить', }, ssh: { + setting: 'настройка', autoStart: 'Автозапуск', enable: 'Включить автозапуск', disable: 'Отключить автозапуск', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index 477a2ba49..7f6c8fe52 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -1258,6 +1258,7 @@ const message = { panelInstallDir: '1Panel 安裝目錄不能刪除', }, ssh: { + setting: '設定', autoStart: '開機自啟', enable: '設定開機自啟', disable: '關閉開機自啟', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 0a93f5248..f99f221e3 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1259,6 +1259,7 @@ const message = { panelInstallDir: '1Panel 安装目录不能删除', }, ssh: { + setting: '配置', autoStart: '开机自启', enable: '设置开机自启', disable: '关闭开机自启', diff --git a/frontend/src/views/host/ssh/index.vue b/frontend/src/views/host/ssh/index.vue index 947f9e17a..2a6460657 100644 --- a/frontend/src/views/host/ssh/index.vue +++ b/frontend/src/views/host/ssh/index.vue @@ -12,7 +12,7 @@ import i18n from '@/lang'; const buttons = [ { - label: i18n.global.t('menu.settings', 2), + label: i18n.global.t('ssh.setting', 2), path: '/hosts/ssh/ssh', }, { diff --git a/frontend/src/views/host/ssh/ssh/index.vue b/frontend/src/views/host/ssh/ssh/index.vue index eb822c9fb..78fb945b4 100644 --- a/frontend/src/views/host/ssh/ssh/index.vue +++ b/frontend/src/views/host/ssh/ssh/index.vue @@ -52,7 +52,7 @@ - +