From a313d2b6c11b75234d7ad7e9d0963ca17ada5930 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 16 一月 2025 18:07:58 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.V1.0 into test
---
src/components/chat/Chat.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index 5d55abb..3fbb0e4 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -49,7 +49,7 @@
import moment from 'moment';
import { computed, onActivated, onMounted, ref } from 'vue';
import { loadAmisSource } from '../amis/load';
-import { useScrollLoad } from './hooks/useScrollLoad';
+import { useScrollLoad } from './hooks/useScrollLoad';
import type { ChatContent } from './model/types';
import { AnswerState, AnswerType, RoleEnum, type ChatMessage } from './model/types';
import { getShareChatJsonByPost, questionStreamByPost } from '/@/api/ai/chat';
@@ -75,9 +75,12 @@
import { useCompRef } from '/@/utils/types';
import { toMyFixed } from '/@/utils/util';
import { useLoadData } from './hooks/useLoadData';
+import { useSyncMsg } from './hooks/useSyncMsg';
const containerRef = useCompRef(ChatContainer);
const chatListDom = computed(() => containerRef.value?.chatListDom);
-
+const scrollToBottom = () => {
+ containerRef.value?.scrollToBottom();
+};
const { loadReplyData, parseContent, parseExtraContent, convertProcessItem, convertProcessToStep, formatShowTimeYear } = useLoadData();
const voicePageIsShow = ref(false);
let isTalking = ref(false);
@@ -401,9 +404,11 @@
updateLoadIndex();
userItem.historyId = questionRes?.history_id;
+ const current = moment().format('YYYY-MM-DD HH:mm:ss');
+ userItem.createTime = current;
userItem.content.values = questionRes?.question ?? userItem.content.values;
assistantItem.historyId = questionRes?.history_id;
- const currentTime = formatShowTimeYear(moment().format('YYYY-MM-DD HH:mm:ss'));
+ const currentTime = formatShowTimeYear(current);
assistantItem.createTime = currentTime;
assistantItem.content = resMsgContent;
setTimeout(() => {
@@ -423,7 +428,16 @@
messageList,
loadReplyData,
});
-
+useSyncMsg({
+ msgList: messageList,
+ updateLoadIndex,
+ historyGroupId: currentRouteId,
+ checkCanSync: (data) => {
+ return !isTalking.value && !moreIsLoading.value;
+ },
+ loadReplyData,
+ scrollToBottom,
+});
const chatListLoading = ref(true);
onActivated(() => {
@@ -437,9 +451,7 @@
};
sendChatMessage();
};
-const scrollToBottom = () => {
- containerRef.value?.scrollToBottom();
-};
+
const initHistoryChat = () => {
// 鍒濆鐘舵�佹粴涓�涓�
--
Gitblit v1.9.3