From 9089a59a073fd252cec25b45c735dc726f3ac3cf Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 24 十月 2024 11:35:33 +0800
Subject: [PATCH] isDayTime
---
src/components/chat/Chat.vue | 194 ++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 98 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index 009de90..d853f77 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -1,13 +1,17 @@
<template>
<div class="flex h-full">
<div class="flex flex-col h-full flex-auto">
- <div class="h-full flex flex-col items-center overflow-y-auto">
- <div ref="chatListDom" class="h-full" :style="{ width: chatWidth }">
+ <div ref="chatListDom" class="relative h-full flex flex-col items-center overflow-y-auto">
+ <span
+ class="more-loading absolute text-blue-400 left-[50%] translate-x-[-50%] cursor-pointer w-10"
+ v-loading="moreIsLoading"
+ ></span>
+ <div class="h-full" v-loading="chatListLoading" :style="{ width: chatWidth }">
<div
class="group flex px-4 py-6 hover:bg-slate-100 rounded-lg relative"
:class="{ 'flex-row-reverse': item.role === RoleEnum.user }"
v-for="(item, index) of computedMessageList"
- :key="index"
+ :key="`${item.historyId}_${item.role}`"
>
<img
class="rounded-full size-12 flex-0"
@@ -72,7 +76,7 @@
v-if="item.content?.type === AnswerType.Text || item.content?.type === AnswerType.Knowledge"
>
<i
- class="p-2 ywicon icon-copy cursor-pointer hover:text-[#0284ff] hover:!text-[18px]"
+ class="p-2 ywifont ywicon-copy cursor-pointer hover:text-[#0284ff] hover:!text-[18px]"
@click="copyClick(item)"
/>
</div>
@@ -80,14 +84,14 @@
<div class="flex items-center justify-center size-[15px]">
<i
:class="{ 'text-[#0284ff]': item.state === AnswerState.Like }"
- class="p-2 ywicon icon-dianzan cursor-pointer hover:text-[#0284ff] font-medium hover:!text-[18px]"
+ class="p-2 ywifont ywicon-dianzan cursor-pointer hover:text-[#0284ff] font-medium hover:!text-[18px]"
@click="likeClick(item)"
/>
</div>
<div class="flex items-center justify-center size-[15px]">
<i
:class="{ 'text-[#0284ff]': item.state === AnswerState.Unlike }"
- class="p-2 ywicon icon-buzan cursor-pointer hover:text-[#0284ff] !text-[13px] hover:!text-[15px]"
+ class="p-2 ywifont ywicon-buzan cursor-pointer hover:text-[#0284ff] !text-[13px] hover:!text-[15px]"
@click="unLikeClick(item)"
/>
</div>
@@ -95,7 +99,7 @@
<div class="flex items-center justify-center size-[15px] relative">
<i
- class="p-2 ywicon icon-wentifankui cursor-pointer hover:text-[#0284ff] !text-[13px] hover:!text-[15px]"
+ class="p-2 ywifont ywicon-wentifankui cursor-pointer hover:text-[#0284ff] !text-[13px] hover:!text-[15px]"
@click="
($event) =>
feedbackClick(
@@ -119,7 +123,7 @@
</div>
</div>
- <Loding v-else class="w-fit" :process="process" />
+ <Loding v-if="isTalking && index === computedMessageList.length - 1" class="w-fit" :process="process" />
</div>
</div>
</div>
@@ -156,7 +160,6 @@
</template>
<script setup lang="ts">
-import { ElMessage } from 'element-plus';
import _ from 'lodash';
import { v4 as uuidv4 } from 'uuid';
import { computed, onMounted, ref } from 'vue';
@@ -164,10 +167,11 @@
import Loding from './components/Loding.vue';
import { useAssistantContentOpt } from './hooks/useAssistantContentOpt';
import { useQueryProcess } from './hooks/useQueryProcess';
+import { useScrollLoad } from './hooks/useScrollLoad';
import { useScrollToBottom } from './hooks/useScrollToBottom';
import type { ChatContent } from './model/types';
import { AnswerState, AnswerType, RoleEnum, answerTypeMapCom, roleImageMap, type ChatMessage } from './model/types';
-import { GetHistoryAnswer, QueryHistoryDetail, QuestionAi, extCallQuery } from '/@/api/ai/chat';
+import { GetHistoryAnswer, QuestionAi, extCallQuery } from '/@/api/ai/chat';
import PlayBar from '/@/components/chat/components/playBar/PlayBar.vue';
import CustomDrawer from '/@/components/drawer/CustomDrawer.vue';
import router from '/@/router';
@@ -186,18 +190,7 @@
const chatListDom = ref<HTMLDivElement>();
const messageList = ref<ChatMessage[]>([]);
const computedMessageList = computed(() => {
-
-
-
- for (let index = 0; index < messageList.value.length; index++) {
- const item = messageList.value[index];
- if(item.role===RoleEnum.assistant){
- continue
- }
- item.content.values = messageList.value[index+1]?.content?.origin?.question;
- }
- const filterList = messageList.value.filter((v) => !!v);
- return filterList;
+ return messageList.value.filter((v) => !!v);
});
const parseContent = (res) => {
@@ -261,37 +254,47 @@
};
const { clearQueryProcess, process, processId, queryProcess } = useQueryProcess();
+const DEFAULT_SECTION_A_ID = 'knowledge_base';
let questionRes = null;
+
+let finalCalcSectionAId = null;
const questionAi = async (text) => {
- if (!currentSectionId) {
- ElMessage.warning('鍙戦�佸け璐ワ紝鏈‘瀹氬簲鐢ㄥ満鏅紒');
- }
processId.value = uuidv4();
let judgeParams = null;
if (!preQuestion.value) {
- const aiContent = computedMessageList.value.filter((item) => item.role === RoleEnum.assistant);
- const lastQuestion = aiContent[aiContent.length - 2]?.content?.origin?.question;
- judgeParams = lastQuestion
- ? {
- prev_question: lastQuestion,
- }
- : {};
+ // const aiContent = computedMessageList.value.filter((item) => item.role === RoleEnum.assistant);
+ // const lastQuestion = aiContent[aiContent.length - 2]?.content?.origin?.question;
+ // judgeParams = lastQuestion
+ // ? {
+ // prev_question: lastQuestion,
+ // }
+ // : {};
+ // 姝ｅ父鍥炵瓟鏆傛椂涓嶉噰鐢�
+ judgeParams = {};
} else {
judgeParams = {
prev_question: preQuestion.value,
};
}
- // const judgeParams = !preQuestion.value
- // ? {}
- // : {
- // prev_question: preQuestion.value,
- // };
+ let currentSectionAId = '';
+ if (activeSectionAId.value) {
+ currentSectionAId = activeSectionAId.value;
+ activeSectionAId.value = '';
+ } else {
+ const lastSectionAItem = _.findLast(
+ computedMessageList.value as any,
+ (item) => item.role === RoleEnum.assistant && !!item.sectionAId
+ );
+ currentSectionAId = lastSectionAItem?.sectionAId ?? DEFAULT_SECTION_A_ID;
+ }
+ finalCalcSectionAId = currentSectionAId;
+
const params = {
process_id: processId.value,
question: text,
// FIXME: 鏆傛椂杩欐牱
- section_a_id: currentSectionId,
+ section_a_id: currentSectionAId,
history_group_id: currentRouteId,
raw_mode: roomConfig.value?.[currentRouteId]?.isAnswerByLLM ?? false,
...judgeParams,
@@ -299,11 +302,12 @@
if (currentSampleId) {
params.sample_id = currentSampleId;
+ currentSampleId = '';
}
- if (currentLLMId) {
- params.llm_id = currentLLMId;
- }
+ // if (currentLLMId) {
+ // params.llm_id = currentLLMId;
+ // }
clearQueryProcess();
queryProcess();
const res = await QuestionAi(params).finally(() => {
@@ -320,19 +324,13 @@
values: '',
});
-let currentSectionId = null;
-let currentSampleId = null;
+let currentSampleId = '';
let currentLLMId = null;
-const getAnswerById = async (historyId: string) => {
- return await GetHistoryAnswer({
- history_id: historyId,
- });
-};
const sendChatMessage = async (content: ChatContent = messageContent.value, cb?: any, isCallExtParams?: any) => {
- if (!content?.values) return;
+ if (!content?.values || isTalking.value || chatListLoading.value) return;
const isNewChat = messageList.value.length === 0;
if (isNewChat) {
if (activeSampleId.value) {
@@ -341,10 +339,6 @@
if (activeLLMId.value) {
currentLLMId = activeLLMId.value;
- }
-
- if (activeSectionAId.value) {
- currentSectionId = activeSectionAId.value;
}
}
let resMsgContent: ChatContent = null;
@@ -360,6 +354,9 @@
// 鍑虹幇鍥炲锛岀疆绌哄嚭鐜扮瓑寰呭姩鐢�
messageList.value.push(assistantItem);
+ // 婊氬姩鑷冲綋鍓嶅彂閫佹秷鎭�
+ scrollToBottom();
+
if (isCallExtParams) {
const extRes = await extCallQuery(isCallExtParams);
questionRes = extRes;
@@ -367,7 +364,7 @@
} else {
resMsgContent = await questionAi(content.values);
}
-
+ nextUserMsgEndIndex.value++;
if (isNewChat) {
const firstResCb = getRoomConfig(currentRouteId, 'firstResCb');
firstResCb?.(resMsgContent);
@@ -375,8 +372,14 @@
cb?.(resMsgContent);
}
userItem.historyId = questionRes.history_id;
+ userItem.content.values = questionRes?.question ?? userItem.content.values;
assistantItem.historyId = questionRes.history_id;
+ assistantItem.sectionAId = finalCalcSectionAId;
appendLastMessageContent(resMsgContent);
+ setTimeout(() => {
+ // 鏀跺埌鍥炲锛岀户缁粴
+ scrollToBottom();
+ }, 300);
} catch (error: any) {
// appendLastMessageContent({
// type: AnswerType.Text,
@@ -395,45 +398,27 @@
messageList.value.at(-1).content = content;
}
};
+const { loadRangeData, onChatListScroll, moreIsLoading, nextUserMsgEndIndex } = useScrollLoad({
+ container: chatListDom,
+ historyGroupId: currentRouteId,
+ messageList,
+ parseAnswerContent: parseContent,
+});
+
+const chatListLoading = ref(false);
+
+const { scrollToBottom } = useScrollToBottom({
+ chatListDom: chatListDom,
+});
onMounted(async () => {
- const res = await QueryHistoryDetail({
- history_group_id: currentRouteId,
+ messageList.value = [];
+ // 鍔犺浇鍒濆鏁版嵁
+ chatListLoading.value = true;
+
+ await loadRangeData().finally(() => {
+ chatListLoading.value = false;
});
-
- 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;
-
- resList.map((item, index) => {
- const insertIndex = index + 1 + i;
- messageList.value.splice(
- insertIndex,
- 0,
- item.answer === null
- ? null
- : {
- 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,
@@ -441,14 +426,17 @@
};
sendChatMessage();
+ } else {
+ setTimeout(() => {
+ // 鍒濆鐘舵�佹粴涓�涓�
+ scrollToBottom();
+
+ setTimeout(() => {
+ chatListDom.value.addEventListener('scroll', onChatListScroll);
+ }, 300);
+ }, 300);
}
});
-
-const { forbidScroll } = useScrollToBottom({
- chatListDom: chatListDom,
- displayMessageList: computedMessageList,
-});
-
//#region ====================== 鍏宠仈鏌ヨ ======================
const relativeQueryClick = async (val) => {
sendChatMessage(
@@ -483,7 +471,6 @@
showFixQuestion,
showAskMore,
} = useAssistantContentOpt({
- forbidScroll,
sendChatMessage,
displayMessageList: computedMessageList,
});
@@ -497,10 +484,21 @@
//#endregion
</script>
-<style scoped>
+<style scoped lang="scss">
pre {
font-family: -apple-system, 'Noto Sans', 'Helvetica Neue', Helvetica, 'Nimbus Sans L', Arial, 'Liberation Sans', 'PingFang SC',
'Hiragino Sans GB', 'Noto Sans CJK SC', 'Source Han Sans SC', 'Source Han Sans CN', 'Microsoft YaHei', 'Wenquanyi Micro Hei',
'WenQuanYi Zen Hei', 'ST Heiti', SimHei, 'WenQuanYi Zen Hei Sharp', sans-serif;
}
+
+.more-loading {
+ :deep(.el-loading-spinner) {
+ --loading-size: 35px;
+ margin-top: 0;
+ .circular {
+ width: var(--loading-size);
+ height: var(--loading-size);
+ }
+ }
+}
</style>
--
Gitblit v1.9.3