Skip to content

Commit 4e5e34e

Browse files
committed
fix: bug fix
1 parent aecb3d0 commit 4e5e34e

File tree

6 files changed

+36
-14
lines changed

6 files changed

+36
-14
lines changed

frontend/src/i18n/en.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"AI Model Configuration": "AI Model Configuration"
77
},
88
"common": {
9+
"enter_your_password": "Please enter your password",
10+
"your_account_email_address": "Please enter your account/email address",
11+
"the_correct_password": "Please enter the correct password",
912
"input_content": "Please Input Content",
1013
"empty": " ",
1114
"may_not_exist": "No results yet, the user may not exist",
@@ -514,4 +517,4 @@
514517
"back_community": "Restore to Community Edition",
515518
"confirm_tips": "Are you sure to restore to Community Edition?"
516519
}
517-
}
520+
}

frontend/src/i18n/zh-CN.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"AI Model Configuration": "模型配置"
77
},
88
"common": {
9+
"enter_your_password": "请输入密码",
10+
"your_account_email_address": "请输入账号/邮箱",
11+
"the_correct_password": "请输入正确的密码",
912
"input_content": "请输入内容",
1013
"may_not_exist": "暂无结果,用户可能不存在",
1114
"empty": "",
@@ -529,4 +532,4 @@
529532
"back_community": "还原至社区版",
530533
"confirm_tips": "确定还原至社区版?"
531534
}
532-
}
535+
}

frontend/src/views/chat/chat-block/ChartPopover.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ const handleDefaultChatChange = (val: any) => {
4343
<el-popover trigger="click" popper-class="chat-type_select" placement="bottom">
4444
<template #reference>
4545
<div
46-
@click="firstItem"
4746
class="chat-select_type"
4847
:class="chartType && chartType !== 'table' && 'active'"
48+
@click="firstItem"
4949
>
5050
<component :is="currentIcon" />
5151
<el-icon style="transform: scale(0.75)" class="expand" size="16">

frontend/src/views/login/index.vue

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,26 @@
77
<div class="login-right">
88
<div class="login-form">
99
<h2 class="title">Login</h2>
10-
<el-form ref="loginFormRef" :model="loginForm" :rules="rules" @keyup.enter="submitForm">
10+
<el-form
11+
ref="loginFormRef"
12+
class="form-content_error"
13+
:model="loginForm"
14+
:rules="rules"
15+
@keyup.enter="submitForm"
16+
>
1117
<el-form-item prop="username">
1218
<el-input
1319
v-model="loginForm.username"
14-
placeholder="Account"
15-
:prefix-icon="User"
20+
:placeholder="$t('common.your_account_email_address')"
1621
size="large"
1722
></el-input>
1823
</el-form-item>
1924
<el-form-item prop="password">
2025
<el-input
2126
v-model="loginForm.password"
22-
placeholder="Password"
27+
:placeholder="$t('common.enter_your_password')"
2328
type="password"
2429
show-password
25-
:prefix-icon="Lock"
2630
size="large"
2731
></el-input>
2832
</el-form-item>
@@ -40,19 +44,20 @@
4044
import { ref } from 'vue'
4145
import { useRouter } from 'vue-router'
4246
import { useUserStore } from '@/stores/user'
43-
import { User, Lock } from '@element-plus/icons-vue'
47+
import { useI18n } from 'vue-i18n'
4448
4549
const router = useRouter()
4650
const userStore = useUserStore()
51+
const { t } = useI18n()
4752
4853
const loginForm = ref({
4954
username: '',
5055
password: '',
5156
})
5257
5358
const rules = {
54-
username: [{ required: true, message: 'Please input account', trigger: 'blur' }],
55-
password: [{ required: true, message: 'Please input password', trigger: 'blur' }],
59+
username: [{ required: true, message: t('common.your_account_email_address'), trigger: 'blur' }],
60+
password: [{ required: true, message: t('common.the_correct_password'), trigger: 'blur' }],
5661
}
5762
5863
const loginFormRef = ref()
@@ -109,10 +114,24 @@ const submitForm = () => {
109114
padding: 40px;
110115
display: flex;
111116
align-items: center;
117+
position: relative;
118+
height: 361px;
112119
113120
.login-form {
114121
width: 100%;
115122
padding: 0 40px;
123+
position: absolute;
124+
top: 40px;
125+
left: 0;
126+
127+
.form-content_error {
128+
.ed-form-item--default {
129+
margin-bottom: 24px;
130+
&.is-error {
131+
margin-bottom: 48px;
132+
}
133+
}
134+
}
116135
117136
.title {
118137
font-size: 28px;
@@ -126,7 +145,6 @@ const submitForm = () => {
126145
height: 45px;
127146
font-size: 16px;
128147
border-radius: 4px;
129-
margin-top: 20px;
130148
}
131149
132150
.agreement {

frontend/src/views/system/user/User.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ import { workspaceList } from '@/api/workspace'
366366
import { formatTimestamp } from '@/utils/date'
367367
import { ClickOutside as vClickOutside } from 'element-plus-secondary'
368368
import icon_warning_filled from '@/assets/svg/icon_warning_filled.svg'
369-
import { cloneDeep } from 'lodash'
370369
371370
const { t } = useI18n()
372371
const keyword = ref('')

frontend/src/views/system/workspace/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ const handleCheckAllChange = (val: any) => {
205205
}
206206
}
207207
208-
209208
const handleToggleRowSelection = (check: boolean = true) => {
210209
let i = 0
211210
const ids = multipleSelectionAll.value.map((ele: any) => ele.id)

0 commit comments

Comments
 (0)