Merge pull request #1951 from dataease/pr@dev@fix_oidc_error

fix: oidc使用de账号登录成功
This commit is contained in:
fit2cloud-chenyw 2022-03-22 18:17:57 +08:00 committed by GitHub
commit 2712baa46f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 2 deletions

View File

@ -573,6 +573,7 @@ export default {
secret: 'Please key Secret',
scope: 'Please key scope',
redirectUrl: 'Please key redirectUrl',
input_mapping: 'Please key OIDC mapping',
open: 'Enable OIDC Authentication'
},
role: {

View File

@ -575,6 +575,7 @@ export default {
secret: '請輸入Secret',
scope: '請輸入scope',
redirectUrl: '請輸入redirectUrl',
input_mapping: '請輸入OIDC屬性映射',
open: '啓用OIDC認證'
},
role: {

View File

@ -576,6 +576,7 @@ export default {
secret: '请输入Secret',
scope: '请输入scope',
redirectUrl: '请输入redirectUrl',
input_mapping: '請輸入OIDC屬性映射',
open: '启用OIDC认证'
},
role: {

View File

@ -23,7 +23,7 @@
</el-radio-group>
</el-form-item>
<el-form-item prop="username">
<el-input v-model="loginForm.username" placeholder="ID" autofocus />
<el-input v-model="loginForm.username" placeholder="ID" autofocus :disabled="loginTypes.includes(2) && loginForm.loginType === 2" />
</el-form-item>
<el-form-item prop="password">
<el-input
@ -33,12 +33,13 @@
maxlength="30"
show-word-limit
autocomplete="new-password"
:disabled="loginTypes.includes(2) && loginForm.loginType === 2"
@keypress.enter.native="handleLogin"
/>
</el-form-item>
</div>
<div class="login-btn">
<el-button type="primary" class="submit" size="default" @click.native.prevent="handleLogin">
<el-button type="primary" class="submit" size="default" :disabled="loginTypes.includes(2) && loginForm.loginType === 2" @click.native.prevent="handleLogin">
{{ $t('commons.login') }}
</el-button>
<div v-if="uiInfo && uiInfo['ui.demo.tips'] && uiInfo['ui.demo.tips'].paramValue" class="demo-tips">