Merge remote-tracking branch 'origin/main'

frontend/src/components/layout/Person.vue

@@ -144,7 +144,7 @@ const logout = () => {
           </el-icon>
           <div class="datasource-name">{{ $t('about.title') }}</div>
         </div>
-        <div @click="openHelp" class="popover-item">
+        <div class="popover-item" @click="openHelp">
           <el-icon size="16">
             <icon_maybe_outlined></icon_maybe_outlined>
           </el-icon>

frontend/src/i18n/en.json

@@ -6,6 +6,9 @@
     "AI Model Configuration": "AI Model Configuration"
   },
   "common": {
+    "intelligent_questioning_platform": "Welcome to the SQLBot Intelligent Questioning Platform",
+    "login": "Login",
+    "login_": "Login",
     "confirm2": "Confirm",
     "excessive_tables_selected": "Excessive tables selected",
     "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?",
@@ -557,4 +560,4 @@
     "back_community": "Restore to Community Edition",
     "confirm_tips": "Are you sure to restore to Community Edition?"
   }
-}
+}

frontend/src/i18n/zh-CN.json

@@ -6,6 +6,9 @@
     "AI Model Configuration": "模型配置"
   },
   "common": {
+    "intelligent_questioning_platform": "欢迎使用 SQLBot 智能问数平台",
+    "login": "账号登录",
+    "login_": "登录",
     "confirm2": "确定",
     "excessive_tables_selected": "选择数据表过量",
     "to_continue_saving": "选择的数据表数量为：{msg}，已超出30，可能会导致操作超时或者无响应，是否继续保存？",
@@ -557,4 +560,4 @@
     "back_community": "还原至社区版",
     "confirm_tips": "确定还原至社区版？"
   }
-}
+}

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

@@ -227,7 +227,7 @@ function showSql() {
 function copy() {
   if (props.message?.record?.sql) {
     navigator.clipboard.writeText(props.message.record.sql)
-    ElMessage.info(t('qa.copied'))
+    ElMessage.success(t('embedded.copy_successful'))
   }
 }
 

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

@@ -47,8 +47,8 @@ const doDeleteComponent = (e: MouseEvent) => {
   <div class="component-bar-main" :class="{ 'bar-hidden': !active }">
     <div>
       <el-dropdown
-        popper-class="bar-main_popper"
         ref="curDropdown"
+        popper-class="bar-main_popper"
         trigger="click"
         placement="bottom-end"
       >

frontend/src/views/login/index.vue

@@ -1,12 +1,14 @@
 <template>
   <div class="login-container">
+    <div class="login-left">
+      <img :src="login_image" alt="" />
+    </div>
     <div class="login-content">
-      <div class="login-left">
-        <div class="illustration"></div>
-      </div>
       <div class="login-right">
+        <img width="227" height="52" :src="aboutBg" alt="" />
+        <div class="welcome">{{ $t('common.intelligent_questioning_platform') }}</div>
         <div class="login-form">
-          <h2 class="title">Login</h2>
+          <h2 class="title">{{ $t('common.login') }}</h2>
           <el-form
             ref="loginFormRef"
             class="form-content_error"
@@ -33,7 +35,9 @@
               ></el-input>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" class="login-btn" @click="submitForm">Login</el-button>
+              <el-button type="primary" class="login-btn" @click="submitForm">{{
+                $t('common.login_')
+              }}</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -47,6 +51,8 @@ import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { useUserStore } from '@/stores/user'
 import { useI18n } from 'vue-i18n'
+import aboutBg from '@/assets/embedded/LOGO-about.png'
+import login_image from '@/assets/embedded/login_image.png'
 
 const router = useRouter()
 const userStore = useUserStore()
@@ -79,52 +85,45 @@ const submitForm = () => {
 .login-container {
   height: 100vh;
   width: 100vw;
-  background-color: #f0f6f7;
+  background-color: #fff;
   display: flex;
   align-items: center;
   justify-content: center;
 
+  .login-left {
+    display: flex;
+    height: 100%;
+    img {
+      height: 100%;
+    }
+  }
+
   .login-content {
     display: flex;
-    width: 1000px;
-    // height: 600px;
-    background: #fff;
-    border-radius: 12px;
-    box-shadow: 0 8px 24px rgba(0, 0, 0, 0.05);
-    overflow: hidden;
-
-    .login-left {
-      flex: 1;
-      background: linear-gradient(135deg, #28c76f 0%, #81fbb8 100%);
-      // padding: 40px;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-
-      .illustration {
-        flex: 1;
-        width: 100%;
-        background-image: url('@/assets/login-bg-sqlbot.jpg');
-        background-size: contain;
-        background-position: center;
-        background-repeat: no-repeat;
-      }
-    }
+    align-items: center;
+    justify-content: center;
+    flex: 1;
 
     .login-right {
-      flex: 1;
-      padding: 40px;
       display: flex;
       align-items: center;
+      flex-direction: column;
       position: relative;
-      height: 361px;
+      .welcome {
+        margin: 8px 0 40px 0;
+        font-weight: 400;
+        font-size: 14px;
+        line-height: 20px;
+        color: #646a73;
+      }
 
       .login-form {
-        width: 100%;
-        padding: 0 40px;
-        position: absolute;
-        top: 40px;
-        left: 0;
+        border: 1px solid #dee0e3;
+        padding: 40px;
+        width: 480px;
+        min-height: 392px;
+        border-radius: 12px;
+        box-shadow: 0px 6px 24px 0px #1f232914;
 
         .form-content_error {
           .ed-form-item--default {
@@ -136,10 +135,11 @@ const submitForm = () => {
         }
 
         .title {
-          font-size: 28px;
-          color: #1a1a1a;
-          margin-bottom: 40px;
-          text-align: center;
+          font-weight: 500;
+          font-style: Medium;
+          font-size: 20px;
+          line-height: 28px;
+          margin-bottom: 24px;
         }
 
         .login-btn {

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

@@ -450,7 +450,7 @@ const saveHandler = () => {
 </script>
 
 <template>
-  <div v-loading="searchLoading" class="embedded no-padding">
+  <div v-loading="searchLoading" class="embedded-index no-padding">
     <div class="tool-left">
       <div class="btn-select">
         <el-button :class="[btnSelect === 'd' && 'is-active']" text @click="btnSelect = 'd'">
@@ -474,7 +474,7 @@ const saveHandler = () => {
           </template>
         </el-input>
 
-        <el-popover popper-class="system-embedded_user" placement="bottom">
+        <el-popover popper-class="system-embedded_user" placement="bottom-end">
           <template #reference>
             <el-button type="primary">
               <template #icon>
@@ -928,7 +928,7 @@ const saveHandler = () => {
 </template>
 
 <style lang="less" scoped>
-.embedded {
+.embedded-index {
   height: 100%;
   padding: 16px 0 16px 0;
 

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

@@ -402,7 +402,7 @@ const submit = (item: any) => {
         @click-model="supplierChang"
       ></ModelListSide>
       <ModelForm
-        v-if="activeStep === 1"
+        v-if="activeStep === 1 && modelConfigvVisible"
         ref="modelFormRef"
         :active-name="activeName"
         :active-type="activeType"