Skip to content

Commit 4d71bfb

Browse files
committed
fix: bug fix
1 parent a3b91bd commit 4d71bfb

File tree

9 files changed

+57
-51
lines changed

9 files changed

+57
-51
lines changed
156 KB
Loading

frontend/src/components/layout/Person.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ const logout = () => {
144144
</el-icon>
145145
<div class="datasource-name">{{ $t('about.title') }}</div>
146146
</div>
147-
<div @click="openHelp" class="popover-item">
147+
<div class="popover-item" @click="openHelp">
148148
<el-icon size="16">
149149
<icon_maybe_outlined></icon_maybe_outlined>
150150
</el-icon>

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+
"intelligent_questioning_platform": "Welcome to the SQLBot Intelligent Questioning Platform",
10+
"login": "Login",
11+
"login_": "Login",
912
"confirm2": "Confirm",
1013
"excessive_tables_selected": "Excessive tables selected",
1114
"to_continue_saving": "The number of selected tables is 67, exceeding {msg}. This may cause the operation to time out or become unresponsive. Do you want to continue saving?",
@@ -556,4 +559,4 @@
556559
"back_community": "Restore to Community Edition",
557560
"confirm_tips": "Are you sure to restore to Community Edition?"
558561
}
559-
}
562+
}

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+
"intelligent_questioning_platform": "欢迎使用 SQLBot 智能问数平台",
10+
"login": "账号登录",
11+
"login_": "登录",
912
"confirm2": "确定",
1013
"excessive_tables_selected": "选择数据表过量",
1114
"to_continue_saving": "选择的数据表数量为:{msg},已超出30,可能会导致操作超时或者无响应,是否继续保存?",
@@ -556,4 +559,4 @@
556559
"back_community": "还原至社区版",
557560
"confirm_tips": "确定还原至社区版?"
558561
}
559-
}
562+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ function showSql() {
227227
function copy() {
228228
if (props.message?.record?.sql) {
229229
navigator.clipboard.writeText(props.message.record.sql)
230-
ElMessage.info(t('qa.copied'))
230+
ElMessage.success(t('embedded.copy_successful'))
231231
}
232232
}
233233

frontend/src/views/dashboard/canvas/ComponentBar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ const doDeleteComponent = (e: MouseEvent) => {
4747
<div class="component-bar-main" :class="{ 'bar-hidden': !active }">
4848
<div>
4949
<el-dropdown
50-
popper-class="bar-main_popper"
5150
ref="curDropdown"
51+
popper-class="bar-main_popper"
5252
trigger="click"
5353
placement="bottom-end"
5454
>

frontend/src/views/login/index.vue

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<template>
22
<div class="login-container">
3+
<div class="login-left">
4+
<img :src="login_image" alt="" />
5+
</div>
36
<div class="login-content">
4-
<div class="login-left">
5-
<div class="illustration"></div>
6-
</div>
77
<div class="login-right">
8+
<img width="227" height="52" :src="aboutBg" alt="" />
9+
<div class="welcome">{{ $t('common.intelligent_questioning_platform') }}</div>
810
<div class="login-form">
9-
<h2 class="title">Login</h2>
11+
<h2 class="title">{{ $t('common.login') }}</h2>
1012
<el-form
1113
ref="loginFormRef"
1214
class="form-content_error"
@@ -33,7 +35,9 @@
3335
></el-input>
3436
</el-form-item>
3537
<el-form-item>
36-
<el-button type="primary" class="login-btn" @click="submitForm">Login</el-button>
38+
<el-button type="primary" class="login-btn" @click="submitForm">{{
39+
$t('common.login_')
40+
}}</el-button>
3741
</el-form-item>
3842
</el-form>
3943
</div>
@@ -47,6 +51,8 @@ import { ref } from 'vue'
4751
import { useRouter } from 'vue-router'
4852
import { useUserStore } from '@/stores/user'
4953
import { useI18n } from 'vue-i18n'
54+
import aboutBg from '@/assets/embedded/LOGO-about.png'
55+
import login_image from '@/assets/embedded/login_image.png'
5056
5157
const router = useRouter()
5258
const userStore = useUserStore()
@@ -79,52 +85,45 @@ const submitForm = () => {
7985
.login-container {
8086
height: 100vh;
8187
width: 100vw;
82-
background-color: #f0f6f7;
88+
background-color: #fff;
8389
display: flex;
8490
align-items: center;
8591
justify-content: center;
8692
87-
.login-content {
93+
.login-left {
8894
display: flex;
89-
width: 1000px;
90-
// height: 600px;
91-
background: #fff;
92-
border-radius: 12px;
93-
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.05);
94-
overflow: hidden;
95-
96-
.login-left {
97-
flex: 1;
98-
background: linear-gradient(135deg, #28c76f 0%, #81fbb8 100%);
99-
// padding: 40px;
100-
display: flex;
101-
flex-direction: column;
102-
align-items: center;
103-
104-
.illustration {
105-
flex: 1;
106-
width: 100%;
107-
background-image: url('@/assets/login-bg-sqlbot.jpg');
108-
background-size: contain;
109-
background-position: center;
110-
background-repeat: no-repeat;
111-
}
95+
height: 100%;
96+
img {
97+
height: 100%;
11298
}
99+
}
100+
101+
.login-content {
102+
display: flex;
103+
align-items: center;
104+
justify-content: center;
105+
flex: 1;
113106
114107
.login-right {
115-
flex: 1;
116-
padding: 40px;
117108
display: flex;
118109
align-items: center;
110+
flex-direction: column;
119111
position: relative;
120-
height: 361px;
112+
.welcome {
113+
margin: 8px 0 40px 0;
114+
font-weight: 400;
115+
font-size: 14px;
116+
line-height: 20px;
117+
color: #646a73;
118+
}
121119
122120
.login-form {
123-
width: 100%;
124-
padding: 0 40px;
125-
position: absolute;
126-
top: 40px;
127-
left: 0;
121+
border: 1px solid #dee0e3;
122+
padding: 40px;
123+
width: 480px;
124+
min-height: 392px;
125+
border-radius: 12px;
126+
box-shadow: 0px 6px 24px 0px #1f232914;
128127
129128
.form-content_error {
130129
.ed-form-item--default {
@@ -136,10 +135,11 @@ const submitForm = () => {
136135
}
137136
138137
.title {
139-
font-size: 28px;
140-
color: #1a1a1a;
141-
margin-bottom: 40px;
142-
text-align: center;
138+
font-weight: 500;
139+
font-style: Medium;
140+
font-size: 20px;
141+
line-height: 28px;
142+
margin-bottom: 24px;
143143
}
144144
145145
.login-btn {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ const saveHandler = () => {
450450
</script>
451451

452452
<template>
453-
<div v-loading="searchLoading" class="embedded no-padding">
453+
<div v-loading="searchLoading" class="embedded-index no-padding">
454454
<div class="tool-left">
455455
<div class="btn-select">
456456
<el-button :class="[btnSelect === 'd' && 'is-active']" text @click="btnSelect = 'd'">
@@ -474,7 +474,7 @@ const saveHandler = () => {
474474
</template>
475475
</el-input>
476476

477-
<el-popover popper-class="system-embedded_user" placement="bottom">
477+
<el-popover popper-class="system-embedded_user" placement="bottom-end">
478478
<template #reference>
479479
<el-button type="primary">
480480
<template #icon>
@@ -928,7 +928,7 @@ const saveHandler = () => {
928928
</template>
929929

930930
<style lang="less" scoped>
931-
.embedded {
931+
.embedded-index {
932932
height: 100%;
933933
padding: 16px 0 16px 0;
934934

frontend/src/views/system/model/Model.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ const submit = (item: any) => {
402402
@click-model="supplierChang"
403403
></ModelListSide>
404404
<ModelForm
405-
v-if="activeStep === 1"
405+
v-if="activeStep === 1 && modelConfigvVisible"
406406
ref="modelFormRef"
407407
:active-name="activeName"
408408
:active-type="activeType"

0 commit comments

Comments
 (0)