Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,8 @@
"input_account": "Please enter account",
"redirect_2_auth": "Redirecting to {0} authentication, {1} seconds...",
"redirect_immediately": "Redirecting immediately",
"permission_invalid": "Authentication invalid [Current account has insufficient permissions]"
"permission_invalid": "Authentication invalid [Current account has insufficient permissions]",
"scan_qr_login": " Scan QR Code"
},
"supplier": {
"alibaba_cloud_bailian": "Alibaba Cloud Bailian",
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/i18n/ko-KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,8 @@
"input_account": "계정을 입력해 주세요",
"redirect_2_auth": "{0} 인증으로 리디렉션 중입니다, {1}초...",
"redirect_immediately": "지금 이동",
"permission_invalid": "인증 무효 [현재 계정의 권한이 부족합니다]"
"permission_invalid": "인증 무효 [현재 계정의 권한이 부족합니다]",
"scan_qr_login": " QR 코드 스캔"
},
"supplier": {
"alibaba_cloud_bailian": "알리바바 클라우드 바이리엔",
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/i18n/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,8 @@
"input_account": "请输入账号",
"redirect_2_auth": "正在跳转至 {0} 认证,{1} 秒...",
"redirect_immediately": "立即跳转",
"permission_invalid": "认证无效【当前账号权限不够】"
"permission_invalid": "认证无效【当前账号权限不够】",
"scan_qr_login": "扫码登录"
},
"supplier": {
"alibaba_cloud_bailian": "阿里云百炼",
Expand Down
4 changes: 1 addition & 3 deletions frontend/src/views/login/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
</el-form>
</div>
<Handler
ref="xpackLoginHandler"
v-model:loading="showLoading"
jsname="L2NvbXBvbmVudC9sb2dpbi9IYW5kbGVy"
@switch-tab="switchTab"
Expand Down Expand Up @@ -92,7 +91,6 @@ const router = useRouter()
const userStore = useUserStore()
const appearanceStore = useAppearanceStoreWithOut()
const { t } = useI18n()
const xpackLoginHandler = ref<any>(null)
const loginForm = ref({
username: '',
password: '',
Expand Down Expand Up @@ -202,7 +200,7 @@ const switchTab = (name: string) => {

.login-btn {
width: 100%;
height: 45px;
height: 40px;
font-size: 16px;
border-radius: 4px;
}
Expand Down
19 changes: 14 additions & 5 deletions frontend/src/views/login/xpack/DingtalkQr.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<template>
<div id="de2-dingtalk-qr" :class="{ 'de2-dingtalk-qr': !isBind }" />
<div class="dingtalk-qr-div">
<div id="de2-dingtalk-qr" :class="{ 'de2-dingtalk-qr': !isBind }" />
</div>
</template>

<script lang="ts" setup>
Expand Down Expand Up @@ -46,8 +48,6 @@ const loadQr = (client_id: string, STATE: string, REDIRECT_URI: string) => {
window.DTFrameLogin(
{
id: 'de2-dingtalk-qr',
width: 280,
height: 300,
},
{
redirect_uri: encodeURIComponent(REDIRECT_URI),
Expand All @@ -73,7 +73,16 @@ const loadQr = (client_id: string, STATE: string, REDIRECT_URI: string) => {
init()
</script>
<style lang="less" scoped>
.de2-dingtalk-qr {
margin-top: -36px;
.dingtalk-qr-div {
// margin-top: -36px;
width: 234px;
height: 234px;
.de2-dingtalk-qr {
transform: scale(1.3);
transform-origin: top left;
width: 234px;
height: 234px;
margin: -80px;
}
}
</style>
Loading