From 98f2147789fadc058adcef82f042fad98dcbee57 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 05 十一月 2024 10:32:29 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.V1.0 into test
---
src/components/chat/hooks/useScrollLoad.ts | 67 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/src/components/chat/hooks/useScrollLoad.ts b/src/components/chat/hooks/useScrollLoad.ts
index c8fc721..7cd7fe6 100644
--- a/src/components/chat/hooks/useScrollLoad.ts
+++ b/src/components/chat/hooks/useScrollLoad.ts
@@ -1,15 +1,33 @@
-import { Ref, ShallowRef, nextTick, onBeforeUnmount, ref } from 'vue';
+import moment from 'moment';
+import { Ref, ShallowRef, computed, nextTick, onBeforeUnmount, ref, unref } from 'vue';
import { LOAD_CHAT_LIMIT } from '../constants';
-import { AnswerType, ChatContent, ChatMessage, RoleEnum } from '../model/types';
+import { AnswerType, ChatContent, ChatMessage, RoleEnum, StepEnum, StepItem } from '../model/types';
import { GetHistoryAnswer, QueryHistoryDetail } from '/@/api/ai/chat';
-
type UseScrollLoadOption = {
container: ShallowRef<HTMLDivElement>;
- historyGroupId: string;
+ historyGroupId: string | Ref<string>;
messageList: Ref<ChatMessage[]>;
parseAnswerContent: (res: any) => ChatContent;
};
+export const convertProcessItem = (processItem: any) => {
+ switch (processItem.mode) {
+ case 'begin':
+ break;
+ case 'end':
+ break;
+ }
+ return {
+ status: StepEnum.Success,
+ title: processItem.value,
+ };
+};
+export const convertProcessToStep = (process: any[]) => {
+ const stepList = (process??[]).map<StepItem>((item) => {
+ return convertProcessItem(item);
+ });
+ return stepList;
+};
/**
* 婊氬姩鍔犺浇鏁版嵁
* @returns
@@ -28,12 +46,17 @@
history_id: historyId,
});
};
-
+ const formatShowTimeYear = computed(() => {
+ return (str) => {
+ return moment(str).format('MM鏈圖D鏃� HH:mm:ss');
+ };
+ });
/**
* 鑾峰彇鐢ㄦ埛鍥炲鏁版嵁锛屽苟鎻掑叆鍒板璇濆綋涓幓
*/
const loadReplyData = async (userMsg: any[]) => {
- const sectionAIdMap = new Map();
+ const userItemIdMap = new Map();
+ // 鐢ㄦ埛娑堟伅
const tmpMessageList: ChatMessage[] = userMsg.map((item) => {
return {
historyId: item.history_id,
@@ -46,7 +69,7 @@
});
const resList = await Promise.all(
(userMsg ?? []).map((item) => {
- sectionAIdMap.set(item.history_id, item.section_a_id);
+ userItemIdMap.set(item.history_id, item);
return getAnswerById(item.history_id);
})
);
@@ -55,6 +78,11 @@
const insertIndex = index + 1 + i;
const currentUserMsg = tmpMessageList[insertIndex - 1];
currentUserMsg.content.values = item?.answer?.question ?? currentUserMsg.content.values;
+
+
+ const mapUser = userItemIdMap.get(item.answer?.history_id);
+
+ const answerTime = formatShowTimeYear.value(mapUser?.create_time);
tmpMessageList.splice(
insertIndex,
0,
@@ -65,7 +93,10 @@
role: RoleEnum.assistant,
content: parseAnswerContent(item.answer),
state: item.answer_state,
- sectionAId: sectionAIdMap.get(item.answer.history_id),
+ sectionAId: mapUser?.section_a_id,
+ createTime: answerTime,
+ stepList: convertProcessToStep(item?.answer?.exec_process),
+ stepIsShow:false
}
);
i++;
@@ -79,7 +110,7 @@
*/
const loadRangeData = async (lastEnd = nextUserMsgEndIndex.value) => {
const res = await QueryHistoryDetail({
- history_group_id: historyGroupId,
+ history_group_id: unref(historyGroupId),
last_end: lastEnd,
last_count: LOAD_CHAT_LIMIT,
});
@@ -97,8 +128,6 @@
//婊氬姩鐩戝惉
async function onChatListScroll() {
if (container.value.scrollTop == 0) {
- console.log('婊氬姩鍒伴《閮ㄤ簡');
-
// 鏇村鏁版嵁姝ｅ湪鍔犺浇鏃�
if (moreIsLoading.value) {
return;
@@ -115,12 +144,16 @@
});
//鏇存柊鍚庯紝绛夊緟椤甸潰娓叉煋瀹屾瘯鍐嶅幓鎷縮crollHeight,鍚﹀垯鎷垮埌鐨勬槸涔嬪墠鐨�
nextTick(() => {
- let h2 = container.value.scrollHeight;
-
- //椤堕儴鍦ㄥ師鍏堝熀纭�涓婂線涓嬫粴鍔�50px锛岄湶鍑烘柊鍔犺浇鏁版嵁鐨勪竴鐐�
- container.value.scrollTo({
- top: h2 - h1 - 50,
- behavior: 'instant', //auto-鑷姩婊氬姩 instant-鐬棿婊氬姩 smooth-骞虫粦婊氬姩
+ nextTick(() => {
+ nextTick(() => {
+ let h2 = container.value.scrollHeight;
+ container.value.scrollTo({
+ //椤堕儴鍦ㄥ師鍏堝熀纭�涓婂線涓嬫粴鍔�50px锛岄湶鍑烘柊鍔犺浇鏁版嵁鐨勪竴鐐�
+ // top: h2 - h1 - 50,
+ top: h2 - h1,
+ behavior: 'instant', //auto-鑷姩婊氬姩 instant-鐬棿婊氬姩 smooth-骞虫粦婊氬姩
+ });
+ });
});
});
}
--
Gitblit v1.9.3