Merge branch 'develop'

src/components/Chat/ChatInputCopy.vue

@@ -1,15 +1,12 @@
 <script setup>
 import { ref, unref, onMounted, onUnmounted, computed, watch } from 'vue';
 import { useMessage, NInput, NSwitch, NPopover, NScrollbar } from 'naive-ui';
+import { helperApi } from '@/api/helper';
 import SvgIcon from '@/components/SvgIcon';
 
 import 'load-awesome/css/ball-running-dots.min.css';
 
 const props = defineProps({
-  options: {
-    type: Array,
-    default: []
-  },
   activeItem: {
     type: Object,
     default: () => ({})
@@ -30,11 +27,12 @@ const isFocusState = ref(false);
 const isOpen = ref(false);
 const highlightedIndex = ref(0);
 const selectedOption = ref(null);
+const helperList = ref([]);
 
 const popoverTriggerRef = ref(null);
 const popoverInnerRef = ref(null);
 
-const agentOptions = computed(() => props.options.filter(({ tools }) => tools));
+const agentOptions = computed(() => helperList.value.filter(({ tools }) => tools));
 
 const focusInput = _ => isFocusState.value = true;
 
@@ -45,6 +43,9 @@ watch(inpVal, (curVal) => {
     if ( !unref(agentOptions).length ) {
       return message.warning('当前未配置智能体');
     }
+    if ( modelLoading.value ) {
+      return message.warning('当前对话进行中');
+    }
     isOpen.value = true;
   } else {
     isOpen.value = false;
@@ -87,6 +88,7 @@ const handleInpEnter = (event) => {
   if (event.key === 'Enter' && !event.shiftKey && inpVal.value) {
     event.preventDefault();
     commonEmitEvent('onEnter');
+    inpRef.value?.blur();
   }
 }
 
@@ -136,10 +138,15 @@ const selectOption = (index) => {
   selectedOption.value = agentOptions.value[index];
   highlightedIndex.value = index;
   isOpen.value = false;
-  clearInpVal();
+ 
+  inpVal.value = selectedOption.value.content;
+
+  // clearInpVal();
 }
 
-onMounted(() => {
+onMounted(async () => {
+  const { data } = await helperApi.getHelperList();
+  helperList.value = data;
   document.addEventListener('keydown', handleKeyDown);
   document.addEventListener('click', closePopoverOutside);
 })

src/views/answer/AnswerView.vue

@@ -3,7 +3,7 @@ import { ref, unref, computed, onMounted, onUnmounted } from 'vue';
 import { useMessage } from 'naive-ui';
 import { useChatStore } from '@/stores/modules/chatStore';
 import { BaseButton, RecodeCardItem, TheSubMenu, TheChatView, ChatWelcome } from '@/components';
-import { ChatAsk, ChatAnswer, ChatInput } from '@/components/Chat';
+import { ChatAsk, ChatAnswer, ChatInputCopy } from '@/components/Chat';
 import { chatApi } from '@/api/chat';
 
 import { useInfinite, useScroll, useChat, useRecommend } from '@/composables';
@@ -22,6 +22,7 @@ const { recommendList } = useRecommend({ type: 0 });
 const message = useMessage();
 
 const switchActive = ref(false);
+const activeItem = ref({});
 
 const isLoading = ref(false);
 const inputRef = ref(null);
@@ -69,7 +70,7 @@ const handleChatDetail = async ({ sessionId }) => {
   scrollToBottom();
 }
 
-const onRegenerate = async ({ question, realQuestion }) => {
+const onRegenerate = async ({ question, realQuestion, tools }) => {
   controller = new AbortController();
 
   const sessionId = unref(currenSessionId);
@@ -80,9 +81,10 @@ const onRegenerate = async ({ question, realQuestion }) => {
       question: realQuestion || question,
       module: 0,
       isStrong: Number(unref(switchActive)),
+      tools,
       // TODO: 后续大概率需要删除
-      topP: 0.9,
-      temperature: 0.7
+      // topP: 0.9,
+      // temperature: 0.7
     },
     signal: controller.signal,
     onDownloadProgress: ({ event }) => {
@@ -127,7 +129,7 @@ const onRegenerate = async ({ question, realQuestion }) => {
   }
 }
 // 提交问题
-const handleSubmit = async (question, realQuestion = '') => {
+const handleSubmit = async ({question, selectedOption, realQuestion = ''}) => {
   // 用于模拟 - 内容生成前置等待状态
   if (unref(isExistInHistory)) {
     const { data: sessionId } = await chatApi.getChatSessionTag();
@@ -147,12 +149,12 @@ const handleSubmit = async (question, realQuestion = '') => {
 
   scrollToBottom();
 
-  setTimeout(() => onRegenerate({ question, realQuestion }), 2 * 1000);
+  setTimeout(() => onRegenerate({ question, realQuestion, tools: selectedOption?.tools || null }), 2 * 1000);
 }
 
 // 处理推荐问题
 const handleWelcomeRecommend = ({ question, realQuestion }) => {
-  handleSubmit(question, realQuestion);
+  handleSubmit({question, realQuestion});
 }
 
 // 删除历史对话
@@ -171,7 +173,7 @@ const onStopChatStream  = async ({ sessionId }) => {
 
 // 重新生成问题
 const onChatResetStream = ({ question }) => {
-  handleSubmit(question);
+  handleSubmit({question});
 }
 
 onMounted(() => {
@@ -230,8 +232,16 @@ onUnmounted(() => {
       </div>
 
       <template #footer>
-        <ChatInput ref="inputRef" v-model:loading="isLoading" v-model:switch="switchActive" @on-click="handleSubmit"
-          @on-enter="handleSubmit"></ChatInput>
+        <ChatInputCopy
+          :active-item="activeItem"
+          ref="inputRef"
+          v-model:loading="isLoading"
+          v-model:switch="switchActive"
+          @on-click="handleSubmit"
+          @on-enter="handleSubmit"
+        ></ChatInputCopy>
+        <!-- <ChatInput ref="inputRef" v-model:loading="isLoading" v-model:switch="switchActive" @on-click="handleSubmit"
+          @on-enter="handleSubmit"></ChatInput> -->
       </template>
     </TheChatView>
   </section>

src/views/work/WorkView.vue

@@ -245,7 +245,6 @@ onUnmounted(() => {
 
       <template #footer>
         <ChatInputCopy
-          :options="helperList"
           :active-item="activeItem"
           ref="inputRef"
           v-model:loading="isLoading"