test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(项目设置): 修改三方认证回调登录页面闪现问题

This commit is contained in:
guoyuqi 2024-09-06 14:35:31 +08:00 committed by Craftsman
parent fcc7fbb9a1
commit 7c8c7c4555
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/views/login/components/login-form.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div v-if="preheat" class="login-form" :style="props.isPreview ? 'height: inherit' : 'height: 100vh'"> <div v-if="preheat" class="login-form" :style="props.isPreview ? 'height: inherit' : 'height: 100vh'">
<a-spin v-if="preheat" :loading="preheat" tip="This may take a while..."> </a-spin> <a-spin :loading="preheat" :tip="t('login.form.loading')"> </a-spin>
</div> </div>
<div v-if="!preheat" class="login-form" :style="props.isPreview ? 'height: inherit' : 'height: 100vh'"> <div v-else class="login-form" :style="props.isPreview ? 'height: inherit' : 'height: 100vh'">
<div class="title"> <div class="title">
<div class="flex justify-center"> <div class="flex justify-center">
<img :src="innerLogo" class="h-[60px] w-[290px]" /> <img :src="innerLogo" class="h-[60px] w-[290px]" />
@ -153,7 +153,7 @@
const orgOptions = ref<SelectOptionData[]>([]); const orgOptions = ref<SelectOptionData[]>([]);
const preheat = ref(false); const preheat = ref(true);
const props = defineProps<{ const props = defineProps<{
isPreview?: boolean; isPreview?: boolean;
@ -313,11 +313,9 @@
} }
getAuthDetailByType(authType).then((res) => { getAuthDetailByType(authType).then((res) => {
if (!res) { if (!res) {
preheat.value = false;
return; return;
} }
if (!res.enable) { if (!res.enable) {
preheat.value = false;
Message.error(t('login.auth_not_enable')); Message.error(t('login.auth_not_enable'));
return; return;
} }

1
frontend/src/views/login/locale/en-US.ts
View File

@ -18,4 +18,5 @@ export default {
'login.form.LDAPLogin': 'LDAP', 'login.form.LDAPLogin': 'LDAP',
'login.form.username': 'Username', 'login.form.username': 'Username',
'login.form.password': 'Password', 'login.form.password': 'Password',
'login.form.loading': 'Logging in',
}; };

1
frontend/src/views/login/locale/zh-CN.ts
View File

@ -18,4 +18,5 @@ export default {
'login.form.LDAPLogin': 'LDAP登录', 'login.form.LDAPLogin': 'LDAP登录',
'login.form.username': '用户名', 'login.form.username': '用户名',
'login.form.password': '密码', 'login.form.password': '密码',
'login.form.loading': '登录中',
}; };