Unverified 提交 2712baa4 authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw 提交者: GitHub

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

fix: oidc使用de账号登录成功
...@@ -573,6 +573,7 @@ export default { ...@@ -573,6 +573,7 @@ export default {
secret: 'Please key Secret', secret: 'Please key Secret',
scope: 'Please key scope', scope: 'Please key scope',
redirectUrl: 'Please key redirectUrl', redirectUrl: 'Please key redirectUrl',
input_mapping: 'Please key OIDC mapping',
open: 'Enable OIDC Authentication' open: 'Enable OIDC Authentication'
}, },
role: { role: {
......
...@@ -575,6 +575,7 @@ export default { ...@@ -575,6 +575,7 @@ export default {
secret: '請輸入Secret', secret: '請輸入Secret',
scope: '請輸入scope', scope: '請輸入scope',
redirectUrl: '請輸入redirectUrl', redirectUrl: '請輸入redirectUrl',
input_mapping: '請輸入OIDC屬性映射',
open: '啓用OIDC認證' open: '啓用OIDC認證'
}, },
role: { role: {
......
...@@ -576,6 +576,7 @@ export default { ...@@ -576,6 +576,7 @@ export default {
secret: '请输入Secret', secret: '请输入Secret',
scope: '请输入scope', scope: '请输入scope',
redirectUrl: '请输入redirectUrl', redirectUrl: '请输入redirectUrl',
input_mapping: '請輸入OIDC屬性映射',
open: '启用OIDC认证' open: '启用OIDC认证'
}, },
role: { role: {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item prop="username"> <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>
<el-form-item prop="password"> <el-form-item prop="password">
<el-input <el-input
...@@ -33,12 +33,13 @@ ...@@ -33,12 +33,13 @@
maxlength="30" maxlength="30"
show-word-limit show-word-limit
autocomplete="new-password" autocomplete="new-password"
:disabled="loginTypes.includes(2) && loginForm.loginType === 2"
@keypress.enter.native="handleLogin" @keypress.enter.native="handleLogin"
/> />
</el-form-item> </el-form-item>
</div> </div>
<div class="login-btn"> <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') }} {{ $t('commons.login') }}
</el-button> </el-button>
<div v-if="uiInfo && uiInfo['ui.demo.tips'] && uiInfo['ui.demo.tips'].paramValue" class="demo-tips"> <div v-if="uiInfo && uiInfo['ui.demo.tips'] && uiInfo['ui.demo.tips'].paramValue" class="demo-tips">
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论