Merge branch 'beta' into 'master'

Beta

See merge request !198

src/locales/langs/en.yaml

@@ -152,7 +152,7 @@ common_module:
   dialogue_module:
     continue_question_message: 'You can keep asking questions'
     empty_message_content: '[Empty content]'
-    question_input_placeholder: 'Please enter your question to ask'
+    question_input_placeholder: 'Please enter your question to ask (press enter+shift to wrap lines)'
     generate_warning_message: 'The above content is generated by AI and is for reference only'
     clear_message_popover_message: 'Clear history session'
     clear_message_dialog_title: 'Are you sure you want to clear the conversation?'
@@ -324,17 +324,19 @@ personal_space_module:
         advanced_setting: 'Advanced setting'
         knowledge_base_setting: 'Knowledge base setting'
         reply: 'Reply'
+        reply_desc: 'When the user asks questions beyond the scope of the knowledge base, the system supports the setting of super-class reply, which is automatically responded by the default model, and the user can also customize the reply content'
         reply_to_superclass_question: 'Reply to superclass question'
         default_reply: 'Default reply'
         custom_reply: 'Custom reply'
         please_enter_custom_content: 'Please enter custom content'
         knowledge_base_retrieval_strategy: 'Knowledge base retrieval strategy'
+        knowledge_base_retrieval_strategy_desc: 'The knowledge base provides a variety of search methods, supports multiple scenarios, and can be selected as required'
         mix: 'Mix'
-        mix_desc: 'Keyword retrieval strategy and semantic retrieval strategy are used to retrieve knowledge base and return slices with high relevance. It is recommended to be used in the scenario where both keywords and semantic understanding are required.'
+        mix_desc: 'Keywords and semantic retrieval in fusion problems return knowledge base content with high similarity. It is suitable for both problem keywords and semantic understanding scenarios.'
         keyword: 'Keyword'
-        keyword_desc: 'The key word retrieval strategy is used to retrieve the knowledge base and return the slices with high correlation to the keywords in the question. It is recommended for scenarios that require an exact match with the keyword in the question.'
+        keyword_desc: 'The knowledge base is retrieved by question keywords and the contents with high similarity are returned. Applicable to scenarios that require accurate keyword matching.'
         semantics: 'Semantics'
-        semantics_desc: 'The semantic retrieval strategy is used to retrieve the knowledge base and return the slice content that matches the meaning of the question. It is recommended for use in scenarios where the semantic relevance of questions and the relevance of intent recognition need to be matched.'
+        semantics_desc: 'The knowledge base is retrieved according to the semantic meaning of the problem, and the content matching the meaning of the problem is returned. It is recommended for scenarios where semantics and intent need to be matched.'
         retrieval_strategy_setting: 'Retrieval strategy setting'
         retrieval_strategy_setting_desc: 'Set the minimum similarity and the number of results returned'
         minimum_similarity: 'Minimum similarity'

src/locales/langs/zh-cn.yaml

@@ -151,7 +151,7 @@ common_module:
   dialogue_module:
     continue_question_message: '你可以继续提问'
     empty_message_content: '[空内容]'
-    question_input_placeholder: '请输入你的问题进行提问'
+    question_input_placeholder: '请输入你的问题进行提问（按enter+shift键可换行）'
     generate_warning_message: '以上内容均由AI生成，仅供参考'
     clear_message_popover_message: '清空历史会话'
     clear_message_dialog_title: '确认要清空对话吗？'
@@ -322,17 +322,19 @@ personal_space_module:
         advanced_setting: '高级设置'
         knowledge_base_setting: '知识库设置'
         reply: '回复'
+        reply_desc: '当用户提问超出知识库范围时，系统支持设置超纲回复，默认由模型自动响应，用户也可自定义答复内容'
         reply_to_superclass_question: '超纲问题回复'
         default_reply: '默认回复'
         custom_reply: '自定义回复'
         please_enter_custom_content: '请输入自定义内容'
         knowledge_base_retrieval_strategy: '知识库检索策略'
+        knowledge_base_retrieval_strategy_desc: '知识库提供多种检索方法，支持多场景适配，可按需选用'
         mix: '混合检索'
-        mix_desc: '使用关键词检索策略和语义检索策略检索知识库，并返回相关性高的切片内容。推荐在需要兼顾提问关键词和提问语义理解的场景下使用。'
+        mix_desc: '融合问题中的关键词和语义检索，返回高相似度的知识库内容。适用于兼顾问题关键词和语义理解的场景'
         keyword: '关键词检索'
-        keyword_desc: '使用关键词检索策略检索知识库，返回与提问中关键字相关度高的切片内容。推荐在需要与提问里关键字精准匹配的场景中使用。'
+        keyword_desc: '通过问题关键词检索知识库，返回高相似度的内容。适用于需要精准匹配关键词的场景'
         semantics: '语义检索'
-        semantics_desc: '使用语义检索策略检索知识库，返回与提问含义相匹配的切片内容。推荐在需要匹配提问语义相关性和意图识别相关性的场景中使用。'
+        semantics_desc: '根据问题语义检索知识库，返回与问题含义相匹配的内容。推荐在需要匹配语义和意图的场景下使用'
         retrieval_strategy_setting: '检索策略设置'
         retrieval_strategy_setting_desc: '配置最低相似度与匹配结果返回数量'
         minimum_similarity: '最低相似度'

src/locales/langs/zh-hk.yaml

@@ -151,7 +151,7 @@ common_module:
   dialogue_module:
     continue_question_message: '你可以繼續提問'
     empty_message_content: '[空內容]'
-    question_input_placeholder: '請輸入你的問題進行提問'
+    question_input_placeholder: '請輸入你的問題進行提問（按enter+shift鍵可換行）'
     generate_warning_message: '以上內容均由AI生成，僅供參考'
     clear_message_popover_message: '清空歷史會話'
     clear_message_dialog_title: '確認要清空對話嗎？'
@@ -322,17 +322,19 @@ personal_space_module:
         advanced_setting: '高級設置'
         knowledge_base_setting: '知識庫設置'
         reply: '回覆'
+        reply_desc: '當用户提問超出知識庫範圍時，系統支持設置超綱回覆，默認由模型自動響應，用户也可自定義答覆內容'
         reply_to_superclass_question: '超綱問題回覆'
         default_reply: '默認回覆'
         custom_reply: '自定義回覆'
         please_enter_custom_content: '請輸入自定義內容'
         knowledge_base_retrieval_strategy: '知識庫檢索策略'
+        knowledge_base_retrieval_strategy_desc: '知識庫提供多種檢索方法，支持多場景適配，可按需選用'
         mix: '混合檢索'
-        mix_desc: '使用關鍵詞檢索策略和語義檢索策略檢索知識庫，並返回相關性高的切片內容。推薦在需要兼顧提問關鍵詞和提問語義理解的場景下使用。'
+        mix_desc: '融合問題中的關鍵詞和語義檢索，返回高相似度的知識庫內容。適用於兼顧問題關鍵詞和語義理解的場景'
         keyword: '關鍵詞檢索'
-        keyword_desc: '使用關鍵詞檢索策略檢索知識庫，返回與提問中關鍵字相關度高的切片內容。推薦在需要與提問裏關鍵字精準匹配的場景中使用。'
+        keyword_desc: '通過問題關鍵詞檢索知識庫，返回高相似度的內容。適用於需要精準匹配關鍵詞的場景'
         semantics: '語義檢索'
-        semantics_desc: '使用語義檢索策略檢索知識庫，返回與提問含義相匹配的切片內容。推薦在需要匹配提問語義相關性和意圖識別相關性的場景中使用。'
+        semantics_desc: '根據問題語義檢索知識庫，返回與問題含義相匹配的內容。推薦在需要匹配語義和意圖的場景下使用'
         retrieval_strategy_setting: '檢索策略設置'
         retrieval_strategy_setting_desc: '配置最低相似度與匹配結果返回數量'
         minimum_similarity: '最低相似度'

src/views/applications-square/applications-square.vue

@@ -239,7 +239,8 @@ function handleEnterKeypress(event: KeyboardEvent) {
             >
               <div v-for="agentApplicationItem in agentApplicationList" :key="agentApplicationItem.id">
                 <div
-                  class="rounded-[10px]! max-w-[392px] bg-[#fff] px-[24px] pb-[20px] pt-[20px] shadow-[0_4px_10px_0px_rgba(103,103,103,.1)]"
+                  class="rounded-[10px]! hover:border-theme-color max-w-[392px] cursor-pointer border border-transparent bg-[#fff] px-[24px] pb-[20px] pt-[20px] shadow-[0_4px_10px_0px_rgba(103,103,103,.1)]"
+                  @click="handleToUseAgentApplication(agentApplicationItem.baseInfo.agentId)"
                 >
                   <div class="flex justify-between">
                     <div class="popover-trigger mr-[22px] text-[14px]">
@@ -284,7 +285,7 @@ function handleEnterKeypress(event: KeyboardEvent) {
                             :fill="agentApplicationItem.isCollect === 'Y' ? ['#ffc06d', '#ffc06d'] : ['#333', '#fff']"
                             :stroke-width="3"
                             class="cursor-pointer transition-all delay-150 duration-300 ease-in-out"
-                            @click="handleCollectOrCancelAgentApplication(agentApplicationItem)"
+                            @click.stop="handleCollectOrCancelAgentApplication(agentApplicationItem)"
                           />
                           <span class="ml-[6px] text-[12px] text-[#333]">{{ agentApplicationItem.collectNumber }}</span>
                         </div>

src/views/multi-model-dialogue/components/footer-operation.vue

@@ -101,7 +101,7 @@ function messageItemFactory() {
 }
 
 function handleInputMessageEnter(event: KeyboardEvent) {
-  if (event.key === 'Enter') {
+  if (event.key === 'Enter' && !event.shiftKey) {
     event.preventDefault()
     handleQuestionSubmit()
   }

src/views/personal-space/personal-app-setting/components/agent-config/agent-preview/components/footer-input.vue

@@ -155,7 +155,7 @@ function messageItemFactory(): ConversationMessageItem {
 }
 
 function handleInputMessageEnter(event: KeyboardEvent) {
-  if (event.key === 'Enter') {
+  if (event.key === 'Enter' && !event.shiftKey) {
     event.preventDefault()
     handleMessageSend()
   }

src/views/personal-space/personal-app-setting/components/agent-config/agent-setting/components/agent-knowledge-setting-modal.vue

@@ -107,6 +107,14 @@ function handleConfirm() {
           <div class="font-family-medium">
             {{ t('personal_space_module.agent_module.agent_setting_module.agent_config_module.reply') }}
           </div>
+          <n-popover trigger="hover" class="max-w-[300px]!">
+            <template #trigger>
+              <Help theme="outline" size="15" fill="#999" :stroke-width="3" class="mt-[2px] cursor-pointer" />
+            </template>
+            <span class="text-xs">
+              {{ t('personal_space_module.agent_module.agent_setting_module.agent_config_module.reply_desc') }}
+            </span>
+          </n-popover>
         </div>
 
         <div class="mb-[8px] mt-[12px] flex items-center gap-[20px]">
@@ -156,6 +164,18 @@ function handleConfirm() {
               )
             }}
           </div>
+          <n-popover trigger="hover" class="max-w-[300px]!">
+            <template #trigger>
+              <Help theme="outline" size="15" fill="#999" :stroke-width="3" class="mt-[2px] cursor-pointer" />
+            </template>
+            <span class="text-xs">
+              {{
+                t(
+                  'personal_space_module.agent_module.agent_setting_module.agent_config_module.knowledge_base_retrieval_strategy_desc',
+                )
+              }}
+            </span>
+          </n-popover>
         </div>
 
         <div class="mt-3 grid grid-cols-3 gap-[18px]">
@@ -176,7 +196,7 @@ function handleConfirm() {
             >
               {{ item.label }}
             </n-radio>
-            <span class="text-font-color mt-2 text-xs">{{ item.desc }}</span>
+            <span class="text-gray-font-color mt-2 text-xs">{{ item.desc }}</span>
           </div>
         </div>
       </article>

src/views/personal-space/personal-app/personal-app.vue

@@ -262,7 +262,7 @@ const handleCardContentScrollDebounce = debounce(
               @click="handleEditPersonalApp(agentAppItem.baseInfo.agentId)"
             >
               <div
-                class="rounded-[10px]! ml-[5px] max-w-[380px] pb-[19px] pl-[24px] pr-[27px] pt-[20px] shadow-[0_4px_10px_0px_rgba(103,103,103,.1)]"
+                class="rounded-[10px]! hover:border-theme-color ml-[5px] max-w-[380px] border border-transparent pb-[19px] pl-[24px] pr-[27px] pt-[20px] shadow-[0_4px_10px_0px_rgba(103,103,103,.1)]"
               >
                 <div class="flex cursor-pointer justify-between">
                   <div class="popover-trigger mb-[19px] mr-[15px] text-[14px]">

src/views/share/components/footer-input.vue

@@ -148,7 +148,7 @@ function messageItemFactory(): ConversationMessageItem {
 }
 
 function handleInputMessageEnter(event: KeyboardEvent) {
-  if (event.key === 'Enter') {
+  if (event.key === 'Enter' && !event.shiftKey) {
     event.preventDefault()
     handleMessageSend()
   }

types/locales.d.ts

@@ -322,11 +322,13 @@ declare namespace I18n {
           advanced_setting: string
           knowledge_base_setting: string
           reply: string
+          reply_desc: string
           reply_to_superclass_question: string
           default_reply: string
           custom_reply: string
           please_enter_custom_content: string
           knowledge_base_retrieval_strategy: string
+          knowledge_base_retrieval_strategy_desc: string
           mix: string
           mix_desc: string
           keyword: string