Merge branch 'main' into pr@main@model_embedding

ui/src/components/ai-chat/index.vue

@@ -4,9 +4,10 @@
       <div ref="dialogScrollbar" class="ai-chat__content p-24 chat-width">
         <div class="item-content mb-16" v-if="!props.available || (props.data?.prologue && !log)">
           <div class="avatar">
-            <AppAvatar class="avatar-gradient">
+            <!-- <AppAvatar class="avatar-gradient">
               <img src="@/assets/icon_robot.svg" style="width: 75%" alt="" />
-            </AppAvatar>
+            </AppAvatar> -->
+            <LogoIcon height="30px" />
           </div>
 
           <div class="content">
@@ -51,9 +52,10 @@
           <!-- 回答 -->
           <div class="item-content mb-16 lighter">
             <div class="avatar">
-              <AppAvatar class="avatar-gradient">
+              <!-- <AppAvatar class="avatar-gradient">
                 <img src="@/assets/icon_robot.svg" style="width: 75%" alt="" />
-              </AppAvatar>
+              </AppAvatar> -->
+              <LogoIcon height="30px" />
             </div>
 
             <div class="content">

ui/src/layout/components/app-header/index.vue

@@ -31,7 +31,4 @@ const isDefaultTheme = computed(() => {
   top: 0;
   z-index: 100;
 }
-.custom-header {
-  background: var(--el-color-primary-light-9) !important;
-}
 </style>

ui/src/styles/app.scss

@@ -701,3 +701,8 @@ h5 {
     box-shadow: none;
   }
 }
+
+// 自定义主题
+.custom-header {
+  background: var(--el-color-primary-light-9) !important;
+}

ui/src/styles/element-plus.scss

@@ -1,5 +1,5 @@
 :root {
-  --el-color-primary: #3370ff;
+  --el-color-primary: #3370FF;
   --el-menu-item-height: 45px;
   --el-box-shadow-light: 0px 2px 4px 0px rgba(31, 35, 41, 0.12);
   --el-border-color: #dee0e3;

ui/src/styles/variables.scss

@@ -14,8 +14,8 @@
   --app-header-height: 56px;
   --app-header-padding: 0 20px;
   --app-header-bg-color: linear-gradient(90deg, #ebf1ff 24.34%, #e5fbf8 56.18%, #f2ebfe 90.18%);
-  --app-logo-color: linear-gradient(180deg, #3370ff 0%, #7f3bf5 100%);
+  --app-logo-color: linear-gradient(180deg, #3370FF 0%, #7f3bf5 100%);
-  --app-avatar-gradient-color: linear-gradient(270deg, #9258f7 0%, #3370ff 100%);
+  --app-avatar-gradient-color: linear-gradient(270deg, #9258f7 0%, #3370FF 100%);
 
   /* 计算高度 */
   --app-main-height: calc(100vh - var(--app-header-height) - var(--app-view-padding) * 2 - 40px);

ui/src/views/chat/base/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="chat layout-bg" v-loading="loading">
-    <div class="chat__header">
+    <div class="chat__header" :class="!isDefaultTheme ? 'custom-header' : ''">
       <div class="chat-width">
         <h2 class="ml-24">{{ applicationDetail?.name }}</h2>
       </div>
@@ -16,7 +16,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import applicationApi from '@/api/application'
 import useStore from '@/stores'
@@ -27,6 +27,10 @@ const {
 
 const { application, user } = useStore()
 
+const isDefaultTheme = computed(() => {
+  return user.isDefaultTheme()
+})
+
 const loading = ref(false)
 const applicationDetail = ref<any>({})
 const applicationAvailable = ref<boolean>(true)

ui/src/views/chat/embed/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="chat-embed layout-bg" v-loading="loading">
-    <div class="chat-embed__header">
+    <div class="chat-embed__header" :class="!isDefaultTheme ? 'custom-header' : ''">
       <div class="chat-width">
         <h4 class="ml-24">{{ applicationDetail?.name }}</h4>
       </div>
@@ -75,7 +75,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, reactive, nextTick } from 'vue'
+import { ref, onMounted, reactive, nextTick, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import applicationApi from '@/api/application'
 import useStore from '@/stores'
@@ -86,6 +86,10 @@ const {
 
 const { application, user, log } = useStore()
 
+const isDefaultTheme = computed(() => {
+  return user.isDefaultTheme()
+})
+
 const AiChatRef = ref()
 const loading = ref(false)
 const left_loading = ref(false)

ui/src/views/chat/index.vue

@@ -4,6 +4,8 @@
 <script setup lang="ts">
 import { onMounted, computed } from 'vue'
 import { useRoute } from 'vue-router'
+import useStore from '@/stores'
+const { user } = useStore()
 
 const components: any = import.meta.glob('@/views/chat/**/index.vue', {
   eager: true
@@ -18,6 +20,8 @@ const currentTemplate = computed(() => {
   return components[name].default
 })
 
-onMounted(() => {})
+onMounted(() => {
+  user.asyncGetProfile()
+})
 </script>
 <style lang="scss"></style>

ui/src/views/chat/pc/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="chat-pc layout-bg" :class="classObj" v-loading="loading">
-    <div class="chat-pc__header">
+    <div class="chat-pc__header" :class="!isDefaultTheme ? 'custom-header' : ''">
       <h4 class="ml-24">{{ applicationDetail?.name }}</h4>
     </div>
     <div class="flex">
@@ -122,6 +122,10 @@ const {
 
 const { application, user, log, common } = useStore()
 
+const isDefaultTheme = computed(() => {
+  return user.isDefaultTheme()
+})
+
 const isCollapse = ref(false)
 
 const classObj = computed(() => {

ui/src/views/template/component/ModelCard.vue

@@ -4,7 +4,7 @@
       <div class="flex">
         <span style="height: 32px; width: 32px" :innerHTML="icon" class="mr-12"></span>
         <div class="w-full">
-          <div class="flex" style="height: 22px;">
+          <div class="flex" style="height: 22px">
             <auto-tooltip :content="model.name" style="max-width: 40%">
               {{ model.name }}
             </auto-tooltip>