From c56ba92667b2b5dded272fb60ad0c2af4983cd43 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期三, 05 三月 2025 17:09:55 +0800
Subject: [PATCH] 修改意见
---
src/components/chat/Chat.vue | 347 ++++++++++++++++++++++++++-------------------------------
1 files changed, 160 insertions(+), 187 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index fe35bdb..411f287 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
@@ -15,6 +9,7 @@
@shareClick="shareClick"
@setCommonQuestionClick="setCommonPhraseClick"
@sendChatMessage="sendChatMessage"
+ @stopGenClick="stopGenClick"
@askMoreClick="askMoreClick"
/>
<el-empty v-else-if="isSharePage && !chatListLoading" :image-size="200">
@@ -26,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>
<!-- 鎶藉眽 -->
@@ -52,17 +50,17 @@
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 { ElMessage } from 'element-plus';
+import { triggerRef } from 'vue';
+import { ElLoadingService, ElMessage } from 'element-plus';
import ChatContainer from './components/ChatContainer.vue';
import ShareLinkDlg from './components/shareLink/index.vue';
import router from '/@/router';
@@ -78,13 +76,28 @@
} from '/@/stores/chatRoom';
import emitter from '/@/utils/mitt';
import { useCompRef } from '/@/utils/types';
-import { toMyFixed } from '/@/utils/util';
+import { toFormData, toMyFixed } from '/@/utils/util';
+import { useLoadData } from './hooks/useLoadData';
+import { useSyncMsg } from './hooks/useSyncMsg';
+import { getCurrentPosition } from '/@/utils/brower';
const containerRef = useCompRef(ChatContainer);
const chatListDom = computed(() => containerRef.value?.chatListDom);
-const chatWidth = '75%';
+const scrollToBottom = () => {
+ containerRef.value?.scrollToBottom();
+};
+const {
+ loadReplyData,
+ parseContent,
+ parseExtraContent,
+ convertProcessItem,
+ convertProcessToStep,
+ convertAttach,
+ formatShowTimeYear,
+ getStepGroupList,
+} = useLoadData();
const voicePageIsShow = ref(false);
let isTalking = ref(false);
-
+const chatWidth = computed(() => containerRef.value?.chatWidth);
let messageContent = ref<ChatContent>({
type: AnswerType.Text,
values: '',
@@ -97,116 +110,22 @@
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: '瑙ｆ瀽澶辫触锛�',
- };
- 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: '瑙ｆ瀽澶辫触锛�',
- };
- 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;
+ });
+};
+
+let streamOutputIsStart = false;
+let position: Position = null;
const questionAi = async (text) => {
let judgeParams = null;
if (!preQuestion.value) {
@@ -223,12 +142,26 @@
raw_mode: roomConfig.value?.[currentRouteId]?.isAnswerByLLM ?? false,
...judgeParams,
} as any;
-
- if (position) {
- const longitude = position.coords.longitude;
- const latitude = position.coords.latitude;
- params.cur_pos = [longitude, latitude].join(',');
+ const tableList = attachList.value.filter((item) => item.type === 'table').map((item) => item.model);
+ if (tableList?.length > 0) {
+ params.tables = JSON.stringify(tableList);
}
+
+ // if (!position) {
+ // const loadingInstance = ElLoadingService({
+ // text: '鑾峰彇浣嶇疆涓�...',
+ // target: '.layout-parent',
+ // fullscreen:false,
+ // });
+ // position = await getCurrentPosition().finally(() => {
+ // loadingInstance.close();
+ // });
+ // }
+
+ // if (position) {
+ // const { latitude, longitude } = position;
+ // params.cur_pos = [longitude, latitude].join(',');
+ // }
if (activeGroupType.value) {
params.group_type = activeGroupType.value;
@@ -238,7 +171,12 @@
params.sample_id = currentSampleId;
currentSampleId = '';
}
-
+ const formDataParams = toFormData(params);
+ const fileList = attachList.value.filter((item) => item.type === 'file').map((item) => item.model);
+ for (const item of fileList) {
+ formDataParams.append('files', item.file);
+ }
+ // clearAttach();
let lastTimestamp = new Date().getTime();
questionRes = {};
let lastIsResult = false;
@@ -255,33 +193,36 @@
};
const checkReportEmpty = () => {
const isEmpty = !questionRes?.reports || questionRes?.reports?.length === 0;
-
return isEmpty;
};
questionStreamByPost(
- params,
+ formDataParams,
(chunkRes) => {
Logger.info('chunk response锛歕n\n' + JSON.stringify(chunkRes));
-
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([]);
// 宸茬粡瑙ｆ瀽杩囦竴娆� reports
+ if (!lastMsg.content.values) {
+ lastMsg.content.values = [];
+ }
+
lastMsg.content.values.push({
content: parseContent(res, true, {
origin: res,
}),
});
}
+ triggerRefresh();
return;
// chunkRes.value = '鍑嗗鏁版嵁鍒嗘瀽';
}
@@ -335,15 +276,16 @@
if (chunkRes.mode === 'conclusion') {
const lastReport = computedMessageList.value.at(-1)?.content?.values?.at(-1);
+ chunkRes.value = '鍒嗘瀽缁撴潫';
+
if (lastReport) {
lastReport.conclusion = chunkRes.value;
- chunkRes.value = '鍒嗘瀽缁撴潫';
}
}
const getLastGroup = () => {
- const lastGroup = computedMessageList.value.at(-1).stepGroup.at(-1);
+ const lastGroup = computedMessageList.value.at(-1).stepGroup[0];
return lastGroup;
- }
+ };
const getLastStepList = () => {
const stepList = getLastGroup()?.value ?? [];
return stepList;
@@ -370,43 +312,59 @@
scrollToBottom();
return;
}
-
-
- // 鏆傛椂涓嶈�冭檻澶氫釜 report鎯呭喌
+ // 鏆傛椂涓嶈�冭檻澶氫釜 report 鎯呭喌
- // if (lastIsResult && chunkRes.mode !== 'finish') {
- // // 寮�濮嬪鍔犳柊鐨� stepGroup
- // computedMessageList.value.at(-1).stepGroup.push({
- // value: [],
- // isShow: true,
- // });
- // lastIsResult = false;
- // }
- const lastGroup = computedMessageList.value.at(-1).stepGroup.at(-1);
+ 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锛屽悗缁殑 stepGroup 骞舵病鏈夊疄闄呬綔鐢紝鍙槸涓轰簡鍋氳凯浠ｇ敤锛岃凯浠ｅ嚭缁勪欢锛屽睅灞变唬鐮佸疄鍦ㄥお闅炬敼浜嗭紒锛侊紒
+ computedMessageList.value.at(-1).stepGroup.push({
+ value: [],
+ isShow: true,
+ });
+ lastIsResult = false;
+ }
+ const lastGroup = getLastGroup();
const stepList = lastGroup?.value ?? [];
const currentTimeStamp = new Date().getTime();
- const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
if (chunkRes.mode === 'finish') {
+ const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
stepList.at(-1).ms = ms;
isTalking.value = false;
-
+ streamOutputIsStart = false;
return;
}
- if (stepList?.length >= 1) {
+ if (stepList?.length >= 1 && !streamOutputIsStart) {
+ const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
+
stepList.at(-1).ms = ms;
+ }
+
+ if (!streamOutputIsStart) {
+ lastTimestamp = currentTimeStamp;
+ }
+ if (!streamOutputIsStart) {
+ const stepItem = convertProcessItem(chunkRes);
+ stepList.push(stepItem);
} else {
- const stepGroup = computedMessageList.value.at(-1).stepGroup;
- if (stepGroup.length > 1) {
- const lastStepList = stepGroup.at(-2).value;
- lastStepList.at(-1).ms = ms;
+ const lastItem = stepList.at(-1);
+ if (lastItem) {
+ lastItem.title += chunkRes.value ?? '';
}
}
- lastTimestamp = currentTimeStamp;
- const stepItem = convertProcessItem(chunkRes);
- stepList.push(stepItem);
+ if (chunkRes.mode === 'begin_stream') {
+ streamOutputIsStart = true;
+ lastTimestamp = currentTimeStamp;
+ }
+ if (chunkRes.mode === 'end_stream') {
+ streamOutputIsStart = false;
+ }
+
// 寮哄埗瑙﹀彂鏇存柊
scrollToBottom();
@@ -431,12 +389,14 @@
const content = parseContent(questionRes, true);
return content;
};
-
-const clearMessageContent = () =>
- (messageContent.value = {
+const playBarRef = useCompRef(PlayBar);
+const attachList = computed(() => playBarRef.value?.attachList ?? []);
+const clearMessageContent = () => {
+ messageContent.value = {
type: AnswerType.Text,
values: '',
- });
+ };
+};
let currentSampleId = '';
@@ -463,7 +423,7 @@
const addChatItem = (content: ChatContent) => {
isTalking.value = true;
- const userItem: ChatMessage = { role: RoleEnum.user, content, isChecked: false } as any;
+ const userItem: ChatMessage = { role: RoleEnum.user, content, isChecked: false, attachList: attachList.value } as any;
const assistantItem: ChatMessage = {
role: RoleEnum.assistant,
content: {
@@ -476,6 +436,7 @@
isShow: true,
},
],
+
isStopMsg: false,
isChecked: false,
} as any;
@@ -485,6 +446,13 @@
messageList.value.push(assistantItem);
scrollToBottom();
return [userItem, assistantItem];
+};
+
+/**
+ * 娓呴櫎闄勪欢
+ */
+const clearAttach = () => {
+ playBarRef.value?.clearAttach();
};
const sendChatMessage = async (content: ChatContent = messageContent.value) => {
@@ -505,15 +473,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(() => {
@@ -531,9 +499,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(() => {
@@ -546,9 +526,6 @@
values: activeChatRoom.value?.title,
};
sendChatMessage();
-};
-const scrollToBottom = () => {
- containerRef.value?.scrollToBottom();
};
const initHistoryChat = () => {
@@ -580,6 +557,7 @@
type: AnswerType.Text,
values: msgValue.question,
},
+ attachList: convertAttach(msgValue),
isChecked: false,
};
@@ -587,10 +565,8 @@
historyId: msgValue.history_id,
role: RoleEnum.assistant,
content: parseContent(msgValue),
- stepGroup: (msgValue?.reports ?? []).map((item) => ({
- value: convertProcessToStep(item?.exec_process),
- isShow: false,
- })),
+ stepGroup: getStepGroupList(msgValue?.reports ?? []),
+
isStopMsg: false,
conclusion: msgValue.conclusion ?? [],
@@ -627,8 +603,6 @@
loadAmisSource();
});
-
-
const askMoreClick = (item) => {
if (!item.question) return;
sendChatMessage({ type: AnswerType.Text, values: item.question });
@@ -641,7 +615,6 @@
messageContent.value.values = content;
};
//#endregion
-const playBarRef = useCompRef(PlayBar);
//鐢ㄦ埛闂璁剧疆涓哄父鐢ㄨ
const setCommonPhraseClick = (item) => {
playBarRef.value.addPhrase(item);
--
Gitblit v1.9.3