From 1ea31dce9d4b622fad0fc850b0d96fd05e7bafe7 Mon Sep 17 00:00:00 2001 From: gerson <1405270578@qq.com> Date: 星期日, 09 二月 2025 23:36:32 +0800 Subject: [PATCH] aa --- src/components/chat/Chat.vue | 206 +++++++++++++++------------------------------------ 1 files changed, 60 insertions(+), 146 deletions(-) diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue index 5a46112..410008a 100644 --- a/src/components/chat/Chat.vue +++ b/src/components/chat/Chat.vue @@ -1,11 +1,5 @@ <template> - <ChatContainer - :loading="chatListLoading" - :more-is-loading="moreIsLoading" - :is-share-page="isSharePage" - :chat-width="chatWidth" - ref="containerRef" - > + <ChatContainer :loading="chatListLoading" :more-is-loading="moreIsLoading" :is-share-page="isSharePage" ref="containerRef"> <!-- 娑堟伅鍒楄〃 --> <template #message-list> <MessageList @@ -27,17 +21,20 @@ <!-- 杈撳叆鍖哄煙 --> <template #input-area> - <PlayBar - ref="playBarRef" - v-model:voicePageIsShow="voicePageIsShow" - :isTalking="isTalking" - :isHome="false" - :msgList="computedMessageList" - v-model="messageContent.values" - @sendClick="sendClick" - @stopGenClick="stopGenClick" - :style="{ width: chatWidth }" - /> + <div class="w-full"> + <PlayBar + ref="playBarRef" + v-model:voicePageIsShow="voicePageIsShow" + :isTalking="isTalking" + :isHome="false" + :msgList="computedMessageList" + v-model="messageContent.values" + @sendClick="sendClick" + @stopGenClick="stopGenClick" + :style="{ width: chatWidth }" + class="mx-auto" + /> + </div> </template> <!-- 鎶藉眽 --> @@ -53,16 +50,16 @@ import axios from 'axios'; import { orderBy } from 'lodash-es'; import moment from 'moment'; -import { computed, onActivated, onMounted, ref } from 'vue'; +import { computed, nextTick, onActivated, onMounted, ref } from 'vue'; import { loadAmisSource } from '../amis/load'; -import { convertProcessItem, convertProcessToStep, formatShowTimeYear, 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'; import PlayBar from '/@/components/chat/components/playBar/PlayBar.vue'; import CustomDrawer from '/@/components/drawer/CustomDrawer.vue'; import { Logger } from '/@/model/logger/Logger'; - +import { triggerRef } from 'vue'; import { ElMessage } from 'element-plus'; import ChatContainer from './components/ChatContainer.vue'; import ShareLinkDlg from './components/shareLink/index.vue'; @@ -80,12 +77,17 @@ import emitter from '/@/utils/mitt'; 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 chatWidth = '75%'; +const scrollToBottom = () => { + containerRef.value?.scrollToBottom(); +}; +const { loadReplyData, parseContent, parseExtraContent, convertProcessItem, convertProcessToStep, formatShowTimeYear } = useLoadData(); const voicePageIsShow = ref(false); let isTalking = ref(false); - +const chatWidth = computed(() => containerRef.value?.chatWidth); let messageContent = ref<ChatContent>({ type: AnswerType.Text, values: '', @@ -98,116 +100,20 @@ return messageList.value.filter((v) => !!v); }); -const parseExtraContent = (res) => { - if (!res) return {}; - const askMoreList = orderBy(res.context_history, [(item) => Number(item.radio)], ['desc']); - const errCode = res?.err_code; - const errMsg = res?.json_msg; - const origin = res; - - return { - askMoreList, - errCode, - errMsg, - origin, - }; -}; - -const parseContent = (res, reportIsShow = false, extraContent?) => { - if (!res) return null; - let content: ChatContent = { - type: AnswerType.Text, - values: '瑙f瀽澶辫触锛�', - }; - if (res.type) { - res.answer_type = res.type; - } - const curExtraContent = parseExtraContent(res); - - switch (res.answer_type) { - case AnswerType.RecordSet: - content = { - type: AnswerType.RecordSet, - values: res.values, - }; - break; - case AnswerType.Text: - content = { - type: AnswerType.Text, - values: res.values ?? res.answer, - }; - break; - case AnswerType.Script: - content = { - type: AnswerType.Script, - values: res, - }; - break; - - case AnswerType.Knowledge: - content = { - type: AnswerType.Knowledge, - values: res.knowledge, - }; - - break; - case AnswerType.Report: - content = { - type: AnswerType.Report, - values: (res?.reports ?? []).map((item) => ({ - content: parseContent(item, reportIsShow, { origin: item, conclusion: item.conclusion ?? [] }), - })), - }; - break; - - case AnswerType.Summary: - content = { - type: AnswerType.Summary, - values: res.summary?.map((item) => { - item.reportIsShow = reportIsShow; - return item; - }), - }; - break; - case AnswerType.Url: - content = { - type: AnswerType.Url, - values: res.url, - }; - break; - case AnswerType.Map: - content = { - type: AnswerType.Map, - values: res.values, - }; - break; - default: - content = { - type: AnswerType.Text, - values: '瑙f瀽澶辫触锛�', - }; - break; - } - if (!extraContent) { - content = { - ...content, - ...curExtraContent, - }; - } else { - content = { - ...content, - ...extraContent, - }; - } - - return content; -}; - let questionRes = null; let position = null; const preQuestion = ref(null); let lastAxiosSource: CancelTokenSource = null; + +// 閫氳繃淇敼 isTalking 鏉ヨЕ鍙戞洿鏂� +const triggerRefresh = () => { + isTalking.value = !isTalking.value; + + nextTick(() => { + isTalking.value = !isTalking.value; + }); +}; const questionAi = async (text) => { let judgeParams = null; if (!preQuestion.value) { @@ -256,7 +162,6 @@ }; const checkReportEmpty = () => { const isEmpty = !questionRes?.reports || questionRes?.reports?.length === 0; - return isEmpty; }; questionStreamByPost( @@ -267,15 +172,15 @@ if (chunkRes.mode === 'result') { lastIsResult = true; const res = chunkRes.value; - if (checkReportEmpty()) { const resReport = getResReport(); resReport.reports.push(res); questionRes = resReport; + // resReport.reports = resReport.reports.concat([]); resolve(resReport); } else { const lastMsg = computedMessageList.value.at(-1); - + // lastMsg.content.values = lastMsg.content.values.concat([]); // 宸茬粡瑙f瀽杩囦竴娆� reports lastMsg.content.values.push({ content: parseContent(res, true, { @@ -283,6 +188,7 @@ }), }); } + triggerRefresh(); return; // chunkRes.value = '鍑嗗鏁版嵁鍒嗘瀽'; } @@ -344,7 +250,7 @@ const getLastGroup = () => { const lastGroup = computedMessageList.value.at(-1).stepGroup.at(-1); return lastGroup; - } + }; const getLastStepList = () => { const stepList = getLastGroup()?.value ?? []; return stepList; @@ -371,12 +277,14 @@ scrollToBottom(); return; } - - - // 鏆傛椂涓嶈�冭檻澶氫釜 report鎯呭喌 + // 鏆傛椂涓嶈�冭檻澶氫釜 report 鎯呭喌 // if (lastIsResult && chunkRes.mode !== 'finish') { + // const lastTow = computedMessageList.value.at(-1); + // lastTow.stepGroup.at(-1).value.at(-1).finishLoading = true; + // // lastTow.content.values = lastTow.content.values.concat([]); + // // 寮�濮嬪鍔犳柊鐨� stepGroup // computedMessageList.value.at(-1).stepGroup.push({ // value: [], @@ -391,7 +299,6 @@ if (chunkRes.mode === 'finish') { stepList.at(-1).ms = ms; isTalking.value = false; - return; } @@ -506,15 +413,15 @@ try { const [userItem, assistantItem] = addChatItem(content); - resMsgContent = await questionAi(content.values); - 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(() => { @@ -532,9 +439,21 @@ container: chatListDom, historyGroupId: currentRouteId, messageList, - parseAnswerContent: parseContent, + loadReplyData, }); - +useSyncMsg({ + msgList: messageList, + updateLoadIndex, + historyGroupId: currentRouteId, + checkCanSync: (data) => { + return !isTalking.value && !moreIsLoading.value; + }, + showTip: (data) => { + playBarRef.value.showSyncTip(data); + }, + loadReplyData, + scrollToBottom, +}); const chatListLoading = ref(true); onActivated(() => { @@ -547,9 +466,6 @@ values: activeChatRoom.value?.title, }; sendChatMessage(); -}; -const scrollToBottom = () => { - containerRef.value?.scrollToBottom(); }; const initHistoryChat = () => { @@ -627,8 +543,6 @@ } loadAmisSource(); }); - - const askMoreClick = (item) => { if (!item.question) return; -- Gitblit v1.9.3