From acaf8207447eb243e1dc8bec3aaca447cc4d082f Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期三, 17 七月 2024 16:32:58 +0800
Subject: [PATCH] error msg
---
src/components/chat/Chat.vue | 174 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 93 insertions(+), 81 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index 0be8fda..897cbdf 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -1,14 +1,28 @@
<template>
<div class="flex flex-col h-full">
<div class="h-full flex flex-col items-center overflow-y-auto">
- <div ref="chatListDom" class="h-full w-[100ch]">
- <div class="group flex px-4 py-4 hover:bg-slate-100 rounded-lg" v-for="(item, index) of computedMessageList" :key="index">
- <img class="rounded-full size-12 mr-4" :src="roleImageMap[item.role]" alt="" srcset="" />
+ <div ref="chatListDom" class="h-full" :style="{ width: chatWidth }">
+ <div
+ class="group flex px-4 py-6 hover:bg-slate-100 rounded-lg"
+ :class="{ 'flex-row-reverse': item.role === RoleEnum.user }"
+ v-for="(item, index) of computedMessageList"
+ :key="index"
+ >
+ <img
+ class="rounded-full size-12 mr-4"
+ :class="{ 'mr-4': item.role === RoleEnum.assistant, 'ml-4': item.role === RoleEnum.user }"
+ :src="roleImageMap[item.role]"
+ alt=""
+ srcset=""
+ />
- <div class="flex">
- <div class="relative" v-if="item.content?.values">
- <div class="text-sm rounded-[6px] p-4 leading-relaxed max-w-[100ch] bg-white">
- <component class="max-w-[100ch]" :is="answerTypeMapCom[item.content.type]" :data="item.content.values" />
+ <div class="flex" :class="{ 'w-full': item.role === RoleEnum.assistant }">
+ <div class="relative w-full" v-if="item.content?.values">
+ <div
+ class="text-sm rounded-[6px] p-4 leading-relaxed"
+ :style="{ backgroundColor: item.role === RoleEnum.user ? 'rgb(197 224 255)' : 'white' }"
+ >
+ <component :is="answerTypeMapCom[item.content.type]" :data="item.content.values" :error="item.content.error" />
</div>
<div v-if="item.role === RoleEnum.assistant" class="absolute flex items-center right-0 mr-2 mt-2 space-x-2">
@@ -41,15 +55,20 @@
</div>
</div>
- <div class="sticky bottom-0 w-full p-6 pb-8 bg-gray-100 flex justify-center">
- <PlayBar :isTalking="isTalking" v-model="messageContent.values" @sendClick="sendChatMessage" />
+ <div class="sticky bottom-0 w-full p-6 pb-8 bg-[rgb(247,248,250)] flex justify-center">
+ <PlayBar
+ :isTalking="isTalking"
+ v-model="messageContent.values"
+ @sendClick="sendChatMessage"
+ :style="{ width: chatWidth }"
+ ></PlayBar>
</div>
</div>
</template>
<script setup lang="ts">
import { ElMessage } from 'element-plus';
-import { computed, nextTick, ref, watch } from 'vue';
+import { computed, nextTick, onActivated, onMounted, ref, watch } from 'vue';
import useClipboard from 'vue-clipboard3';
import Loding from './components/Loding.vue';
import type { ChatContent } from './model/types';
@@ -57,14 +76,18 @@
import { GetHistoryAnswer, QueryHistoryDetail, QuestionAi, SetHistoryAnswerState, getQuestionProcess } from '/@/api/ai/chat';
import PlayBar from '/@/components/chat/components/playBar/PlayBar.vue';
import router from '/@/router';
-import { activeChatRoom, activeLLMId, activeRoomId, activeSampleId, activeSectionAId } from '/@/stores/chatRoom';
+import { activeChatRoom, activeLLMId, activeRoomId, activeSampleId, activeSectionAId, roomConfig } from '/@/stores/chatRoom';
import { v4 as uuidv4 } from 'uuid';
+
+const chatWidth = '75%';
let isTalking = ref(false);
let messageContent = ref<ChatContent>({
type: AnswerType.Text,
values: '',
});
+const currentRoute = router.currentRoute;
+const currentRouteId = currentRoute.value.query.id as string;
const chatListDom = ref<HTMLDivElement>();
const messageList = ref<ChatMessage[]>([]);
const computedMessageList = computed(() => {
@@ -101,6 +124,13 @@
content = {
type: AnswerType.Summary,
values: res.summary,
+ error: res.json_msg,
+ };
+ break;
+ case AnswerType.Url:
+ content = {
+ type: AnswerType.Url,
+ values: res.url,
};
break;
default:
@@ -114,7 +144,7 @@
};
//#region ====================== 鏌ヨ杩涘害 ======================
let processId = '';
-const QUERY_PROCESS_INTERVAL = 300;
+const QUERY_PROCESS_INTERVAL = 1000;
const process = ref('');
let processTimer = null;
let finishProcess = true;
@@ -156,7 +186,8 @@
question: text,
// FIXME: 鏆傛椂杩欐牱
section_a_id: currentSectionId,
- history_group_id: activeRoomId.value,
+ history_group_id: currentRouteId,
+ raw_mode: roomConfig.value?.[currentRouteId]?.isAnswerByLLM ?? false,
} as any;
if (currentSampleId) {
@@ -168,24 +199,10 @@
}
clearQueryProcess();
queryProcess();
- const res = await QuestionAi(params);
- clearQueryProcess();
+ const res = await QuestionAi(params).finally(() => {
+ clearQueryProcess();
+ });
questionRes = res;
- // const res = {
- // json_ok: true,
- // question: '鏄ㄦ棩浜斾竴骞垮満鍘嬪姏',
- // answer_type: 'recordset',
- // values: {
- // names: ['yesterday', 'max_pressure'],
- // values: [
- // ['2024-06-28 00:00:00', 24.378],
- // ['2024-06-29 00:00:00', 24.276],
- // ],
- // type: 'records',
- // title: '鏄ㄦ棩浜斾竴骞垮満(D_GW_04)鐨勬渶澶у帇鍔涘��',
- // },
- // };
-
const content = parseContent(res);
return content;
};
@@ -204,16 +221,16 @@
let currentSampleId = null;
let currentLLMId = null;
+
const getAnswerById = async (historyId: string) => {
return await GetHistoryAnswer({
history_id: historyId,
});
};
+
const sendChatMessage = async (content: ChatContent = messageContent.value) => {
if (!messageContent.value?.values) return;
- if (activeChatRoom.value.isInitial) {
- activeChatRoom.value.title = messageContent.value.values;
- activeChatRoom.value.isInitial = false;
+ if (messageList.value.length === 0) {
if (activeSampleId.value) {
currentSampleId = activeSampleId.value;
}
@@ -226,6 +243,7 @@
currentSectionId = activeSectionAId.value;
}
}
+
try {
isTalking.value = true;
const userItem: ChatMessage = { role: RoleEnum.user, content } as any;
@@ -258,57 +276,46 @@
}
};
-watch(
- () => activeRoomId.value,
- async (val) => {
- if (!val) {
- router.replace({
- name: 'Home',
- });
- return;
- }
- if (activeChatRoom.value.isInitial) {
- messageContent.value = {
+onMounted(async () => {
+ const res = await QueryHistoryDetail({
+ history_group_id: currentRouteId,
+ });
+
+ messageList.value = (res.details ?? []).map((item) => {
+ return {
+ historyId: item.history_id,
+ role: RoleEnum.user,
+ content: {
type: AnswerType.Text,
- values: activeChatRoom.value.title,
- };
- sendChatMessage();
- } else {
- const res = await QueryHistoryDetail({
- history_group_id: activeRoomId.value,
- });
- messageList.value = (res.details ?? []).map((item) => {
- return {
- historyId: item.history_id,
- role: RoleEnum.user,
- content: {
- type: AnswerType.Text,
- values: item.question,
- },
- } as ChatMessage;
- });
- currentSectionId = res?.details?.[0]?.section_a_id;
- currentSampleId = res?.details?.[0]?.sample_id;
- const resList = await Promise.all((res.details ?? []).map((item) => getAnswerById(item.history_id)));
- let i = 0;
+ values: item.question,
+ },
+ } as ChatMessage;
+ });
+ currentSectionId = res?.details?.[0]?.section_a_id;
+ currentSampleId = res?.details?.[0]?.sample_id;
+ const resList = await Promise.all((res.details ?? []).map((item) => getAnswerById(item.history_id)));
+ let i = 0;
- resList.map((item, index) => {
- const insertIndex = index + 1 + i;
- messageList.value.splice(insertIndex, 0, {
- historyId: item.answer.history_id,
- role: RoleEnum.assistant,
- content: parseContent(item.answer),
- state: item.answer_state,
- });
- i++;
- });
- }
- },
- {
- immediate: true,
+ resList.map((item, index) => {
+ const insertIndex = index + 1 + i;
+ messageList.value.splice(insertIndex, 0, {
+ historyId: item.answer.history_id,
+ role: RoleEnum.assistant,
+ content: parseContent(item.answer),
+ state: item.answer_state,
+ });
+ i++;
+ });
+
+ if (messageList.value.length === 0) {
+ messageContent.value = {
+ type: AnswerType.Text,
+ values: activeChatRoom.value.title,
+ };
+
+ sendChatMessage();
}
-);
-
+});
let forbidScroll = false;
watch(
messageList,
@@ -321,6 +328,11 @@
}
);
+onActivated(() => {
+ if (forbidScroll) return;
+ nextTick(() => scrollToBottom());
+});
+
//#region ====================== 鑱婂ぉ鍐呭鎿嶄綔 ======================
const { toClipboard } = useClipboard();
--
Gitblit v1.9.3