diff --git a/frontend/src/components/drawer-pro/index.vue b/frontend/src/components/drawer-pro/index.vue index e11eff6ea..54489c374 100644 --- a/frontend/src/components/drawer-pro/index.vue +++ b/frontend/src/components/drawer-pro/index.vue @@ -139,7 +139,6 @@ const handleBeforeClose = (done: () => void) => { }; const handleClose = () => { - console.log('321321'); localOpenPage.value = false; globalStore.isFullScreen = false; emit('close'); diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 5fa46a2cd..909093ceb 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1434,6 +1434,7 @@ const message = { proxyPort: '代理端口', proxyPasswdKeep: '记住密码', proxyDocker: 'Docker 代理', + proxyDockerHelper: '将代理服务器配置同步至 Docker,支持离线服务器拉取镜像等操作', apiInterface: 'API 接口', apiInterfaceClose: '关闭后将不能使用 API 接口进行访问,是否继续?', apiInterfaceHelper: '提供面板支持 API 接口访问', diff --git a/frontend/src/layout/components/Sidebar/components/Collapse.vue b/frontend/src/layout/components/Sidebar/components/Collapse.vue index c33f457d5..bbd61627b 100644 --- a/frontend/src/layout/components/Sidebar/components/Collapse.vue +++ b/frontend/src/layout/components/Sidebar/components/Collapse.vue @@ -28,8 +28,8 @@ {{ $t('menu.msgCenter') }} {{ taskCount }} - -
+ +
@@ -90,6 +90,10 @@ const loadCurrentName = () => { }; const loadNodes = async () => { + if (!globalStore.isMasterProductPro) { + globalStore.currentNode = 'local'; + return; + } await listNodeOptions() .then((res) => { if (!res) { diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue index 3b9907032..1200efe0a 100644 --- a/frontend/src/views/login/components/login-form.vue +++ b/frontend/src/views/login/components/login-form.vue @@ -339,6 +339,7 @@ const login = (formEl: FormInstance | undefined) => { globalStore.currentNode = 'local'; MsgSuccess(i18n.t('commons.msg.loginSuccess')); router.push({ name: 'home' }); + document.onkeydown = null; } catch (res) { if (res.code === 401) { if (res.message === 'ErrCaptchaCode') { @@ -374,6 +375,7 @@ const mfaLogin = async (auto: boolean) => { MsgSuccess(i18n.t('commons.msg.loginSuccess')); globalStore.currentNode = 'local'; router.push({ name: 'home' }); + document.onkeydown = null; } catch (res) { if (res.code === 401) { errMfaInfo.value = true; diff --git a/frontend/src/views/setting/safe/index.vue b/frontend/src/views/setting/safe/index.vue index 3600ca180..a7b8c0d7b 100644 --- a/frontend/src/views/setting/safe/index.vue +++ b/frontend/src/views/setting/safe/index.vue @@ -288,18 +288,23 @@ const handleMFA = async () => { ElMessageBox.confirm(i18n.global.t('setting.mfaClose'), i18n.global.t('setting.mfa'), { confirmButtonText: i18n.global.t('commons.button.confirm'), cancelButtonText: i18n.global.t('commons.button.cancel'), - }).then(async () => { - loading.value = true; - await updateSetting({ key: 'MFAStatus', value: 'Disable' }) - .then(() => { - loading.value = false; - search(); - MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); - }) - .catch(() => { - loading.value = false; - }); - }); + }) + .then(async () => { + loading.value = true; + await updateSetting({ key: 'MFAStatus', value: 'Disable' }) + .then(() => { + loading.value = false; + search(); + MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); + }) + .catch(() => { + loading.value = false; + search(); + }); + }) + .catch(() => { + search(); + }); }; const onChangeEntrance = () => { diff --git a/frontend/src/views/toolbox/fail2ban/log-path/index.vue b/frontend/src/views/toolbox/fail2ban/log-path/index.vue index 6d492f385..9c38b90ff 100644 --- a/frontend/src/views/toolbox/fail2ban/log-path/index.vue +++ b/frontend/src/views/toolbox/fail2ban/log-path/index.vue @@ -64,7 +64,7 @@ const onSave = async (formEl: FormInstance | undefined) => { type: 'info', }, ).then(async () => { - await updateFail2ban({ key: 'logPath', value: form.logPath }) + await updateFail2ban({ key: 'logpath', value: form.logPath }) .then(async () => { MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); loading.value = false;