From 768a63bdae68f9440d4b7f5768c3ea7f9308f2ab Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期三, 06 十一月 2024 14:08:58 +0800
Subject: [PATCH] 流更改
---
src/components/chat/Chat.vue | 329 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 214 insertions(+), 115 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index 2de9848..05b6846 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -10,7 +10,7 @@
<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"
+ v-for="(item, msgIndex) of computedMessageList"
:key="`${item.historyId}_${item.role}`"
>
<div class="absolute top-0 left-[72px] text-[#8d8e99]">{{ item?.createTime }}</div>
@@ -23,69 +23,114 @@
/>
<div class="flex-auto flex" :class="{ 'justify-end': item.role === RoleEnum.user }">
<div class="inline-flex flex-col" :class="{ 'w-full': item.role === RoleEnum.assistant }">
- <div class="w-full" v-if="isTalking && index === computedMessageList.length - 1">
- <div class="text-sm rounded-[6px] p-4 leading-relaxed bg-white" v-if="item.role === RoleEnum.assistant">
- <!-- 杩囩▼杈撳嚭 -->
- <el-steps direction="vertical" :active="activeStep">
- <!-- <el-step title="process" status="process" />
- <el-step title="success" status="success" />
- <el-step title="wait" status="wait" />
- <el-step title="finish" status="finish" />
- <el-steps title="error" status="error" /> -->
-
- <el-step v-for="item in stepList" :title="item.title" :status="stepEnumMap[item.status]" />
- </el-steps>
- </div>
- </div>
- <div class="w-full" v-if="item.content?.values">
+ <div class="w-full">
<div
class="text-sm rounded-[6px] p-4 leading-relaxed"
:style="{ backgroundColor: item.role === RoleEnum.user ? 'rgb(197 224 255)' : 'white' }"
>
- <div v-if="item.content.errCode === ErrorCode.Message" class="flex-column w-full">
- <p class="text-red-500">
- {{ item.content.errMsg }}
- </p>
- <div class="mt-5 flex items-center" v-if="showFixQuestion(item)">
- <div class="text-gray-600 flex-0">
- {{ item.content.origin.err_json.fix_question.title + '锛�' }}
- </div>
- <div class="ml-1 space-x-2 inline-flex flex-wrap">
- <div
- v-for="fixItem in item.content.origin.err_json.fix_question?.values"
- :key="fixItem"
- class="bg-gray-200 p-3 hover:bg-[#c5e0ff] hover:text-[#1c86ff] cursor-pointer rounded-lg"
- @click="fixQuestionClick(fixItem, item.content.origin)"
- >
- {{ fixItem.title }}
- </div>
+ <div class="flex flex-col" v-if="item?.stepList?.length > 0">
+ <div class="flex items-center mb-3">
+ <span class="mr-2">鎰忓浘鍒嗘瀽锛�</span>
+ <div
+ @click="toggleStepList(item)"
+ class="cursor-pointer border border-gray-300 border-solid w-fit px-2 flex items-center space-x-2 rounded-lg hover:bg-gray-100 active:bg-gray-200"
+ >
+ <span>
+ {{ toggleStepLabel(item) }}
+ </span>
+ <span class="ywifont" :class="{ 'ywicon-unfold': !item.stepIsShow, 'ywicon-fold': item.stepIsShow }"></span>
</div>
</div>
- </div>
- <template v-else>
- <component :is="answerTypeMapCom[item.content.type]" :data="item.content.values" :originData="item" />
- <div
- v-if="item.role === RoleEnum.assistant && item.content.origin?.ext_call_list"
- class="flex font-bold items-center mt-6"
- >
- <div class="flex-0 mb-auto -mr-4">鍏宠仈鍔熻兘锛�</div>
- <div class="space-x-5 flex flex-wrap">
- <div
- v-for="callItem in item.content.origin?.ext_call_list"
- :key="callItem.call_ext_id"
- @click="relativeQueryClick(callItem)"
- class="cursor-pointer hover:underline first-of-type:ml-5"
+ <!-- 杩囩▼杈撳嚭 -->
+ <el-steps v-show="item.stepIsShow" direction="vertical" :active="activeStep">
+ <el-step
+ v-for="(subItem, index) in item.stepList"
+ :title="subItem.title"
+ :status="stepEnumMap[subItem.status]"
+ >
+ <template
+ #icon
+ v-if="index + 1 === item.stepList.length && isTalking && msgIndex === computedMessageList.length - 1"
>
- {{ callItem.question }}
+ <span class="ywifont ywicon-loading1 animate-spin !text-[24px]"></span>
+ </template>
+ <template #title>
+ <span class="text-sm">{{ subItem.title }}</span>
+ </template>
+ </el-step>
+ </el-steps>
+ </div>
+
+ <template v-if="item.content?.values">
+ <div v-if="item.content.errCode === ErrorCode.Message" class="flex-column w-full">
+ <p class="text-red-500">
+ {{ item.content.errMsg }}
+ </p>
+ <div class="mt-5 flex items-center" v-if="showFixQuestion(item)">
+ <div class="text-gray-600 flex-0">
+ {{ item.content.origin.err_json.fix_question.title + '锛�' }}
+ </div>
+ <div class="ml-1 space-x-2 inline-flex flex-wrap">
+ <div
+ v-for="fixItem in item.content.origin.err_json.fix_question?.values"
+ :key="fixItem"
+ class="bg-gray-200 p-3 hover:bg-[#c5e0ff] hover:text-[#1c86ff] cursor-pointer rounded-lg"
+ @click="fixQuestionClick(fixItem, item.content.origin)"
+ >
+ {{ fixItem.title }}
+ </div>
</div>
</div>
</div>
+ <template v-else>
+ <component
+ :conclusion="item.conclusion"
+ :is="answerTypeMapCom[item.content.type]"
+ :data="item.content.values"
+ :originData="item"
+ />
+ <div
+ v-if="item.role === RoleEnum.assistant && item.content.origin?.ext_call_list"
+ class="flex font-bold items-center mt-6"
+ >
+ <div class="flex-0 mb-auto -mr-4">鍏宠仈鍔熻兘锛�</div>
+ <div class="space-x-5 flex flex-wrap">
+ <div
+ v-for="callItem in item.content.origin?.ext_call_list"
+ :key="callItem.call_ext_id"
+ @click="relativeQueryClick(callItem)"
+ class="cursor-pointer hover:underline first-of-type:ml-5"
+ >
+ {{ callItem.question }}
+ </div>
+ </div>
+ </div>
+ </template>
</template>
</div>
-
<!-- 鎿嶄綔 -->
- <div v-if="item.role === RoleEnum.assistant" class="absolute flex items-center right-0 mr-4 mt-2 space-x-2">
+ <div
+ v-if="item.role === RoleEnum.user && item.content?.values"
+ class="absolute flex items-center right-0 mr-4 space-x-2"
+ >
+ <div class="flex items-center justify-center size-[20px]">
+ <i
+ class="p-2 ywifont ywicon-copy cursor-pointer hover:text-[#0284ff] font-medium !text-[15px] hover:!text-[18px]"
+ @click="copyUserClick(item)"
+ />
+ </div>
+ <div class="flex items-center justify-center size-[20px]">
+ <i
+ class="p-2 ywifont ywicon-cubelifangti cursor-pointer hover:text-[#0284ff] text-[#000] font-[590] !text-[15px] hover:!text-[18px]"
+ @click="setCommonQuestionClick(item)"
+ />
+ </div>
+ </div>
+ <div
+ v-if="item.role === RoleEnum.assistant && item.content?.values"
+ class="absolute flex items-center right-0 mr-4 mt-2 space-x-2"
+ >
<div
class="flex items-center justify-center size-[15px]"
v-if="item.content?.type === AnswerType.Text || item.content?.type === AnswerType.Knowledge"
@@ -166,10 +211,10 @@
@showUpChatClick="showUpChatClick"
@showDownChatClick="showDownChatClick"
:style="{ width: chatWidth }"
+ :setCommonQuestionInfo="setCommonQuestionInfo"
></PlayBar>
</div>
</div>
-
<CustomDrawer v-model:isShow="drawerIsShow" @updateChatInput="updateChatInput" />
</div>
</template>
@@ -177,19 +222,18 @@
<script setup lang="ts">
import _ from 'lodash';
import moment from 'moment';
-import { v4 as uuidv4 } from 'uuid';
import { computed, onMounted, ref } from 'vue';
import FeedbackPanel from './components/FeedbackPanel.vue';
-import Loding from './components/Loding.vue';
import { useAssistantContentOpt } from './hooks/useAssistantContentOpt';
import { useQueryProcess } from './hooks/useQueryProcess';
-import { useScrollLoad } from './hooks/useScrollLoad';
+import { convertProcessItem, 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 { QuestionAi, extCallQuery, questionStreamByPost } from '/@/api/ai/chat';
+import type { ChatContent, StepItem } from './model/types';
+import { AnswerState, AnswerType, RoleEnum, answerTypeMapCom, roleImageMap, stepEnumMap, type ChatMessage } from './model/types';
+import { extCallQuery, 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 router from '/@/router';
import {
activeChatRoom,
@@ -202,7 +246,8 @@
roomConfig,
} from '/@/stores/chatRoom';
import { ErrorCode } from '/@/utils/request';
-
+import { ElMessage } from 'element-plus';
+import useClipboard from 'vue-clipboard3';
const chatWidth = '75%';
const voicePageIsShow = ref(false);
let isTalking = ref(false);
@@ -280,28 +325,36 @@
const { clearQueryProcess, process, processId, queryProcess } = useQueryProcess();
//#region ====================== 姝ラ step ======================
-const enum StepEnum {
- Loading,
- Success,
- Error,
-}
-const stepEnumMap = {
- [StepEnum.Loading]: 'process',
- [StepEnum.Success]: 'success',
- [StepEnum.Error]: 'error',
-};
-
-type StepItem = {
- title: string;
- status: StepEnum;
-};
const activeStep = ref(-1);
-const stepList = ref<StepItem[]>([]);
+const stepList = ref<StepItem[]>([
+ {
+ title: '鎰忓浘鍒嗘瀽涓�...',
+ status: 0,
+ },
+ {
+ title: '鎰忓浘鍒嗘瀽瀹屾垚',
+ status: 1,
+ },
+ {
+ title: '鎬濊�冨浣曟墽琛�:鎸囨爣鏄庣粏鏌ヨ',
+ status: 1,
+ },
+ {
+ title: '鎸囨爣鏄庣粏鏌ヨ瀹屾垚',
+ status: 1,
+ },
+]);
const resetStep = () => {
activeStep.value = -1;
stepList.value = [];
};
+
+const toggleStepLabel = (item: ChatMessage) => (item.stepIsShow ? '鏀惰捣' : '灞曞紑');
+const toggleStepList = (item: ChatMessage) => {
+ item.stepIsShow = !item.stepIsShow;
+};
+
//#endregion
const DEFAULT_SECTION_A_ID = 'knowledge_base';
@@ -309,7 +362,6 @@
let finalCalcSectionAId = null;
const questionAi = async (text) => {
- // processId.value = uuidv4();
let judgeParams = null;
if (!preQuestion.value) {
// const aiContent = computedMessageList.value.filter((item) => item.role === RoleEnum.assistant);
@@ -365,29 +417,42 @@
// queryProcess();
resetStep();
let res = null;
- await questionStreamByPost(params, (chunkRes) => {
- if (chunkRes.mode === 'result') {
- res = chunkRes.value;
- } else {
- switch (chunkRes.mode) {
- case 'begin':
- break;
- case 'end':
- break;
+
+ const resultP = new Promise(async (resolve, reject) => {
+ await questionStreamByPost(params, (chunkRes) => {
+ Logger.info('chunk response锛歕n\n' + JSON.stringify(chunkRes));
+ if (chunkRes.mode === 'result') {
+ res = chunkRes.value;
+ resolve(res);
+ chunkRes.value = '鍑嗗鏁版嵁鍒嗘瀽';
}
- stepList.value.push({
- title: chunkRes.value,
- status: StepEnum.Success,
- });
- scrollToBottom();
+ if (chunkRes.mode === 'conclusion') {
+ computedMessageList.value.at(-1).conclusion = chunkRes.value;
+ chunkRes.value = '鍒嗘瀽缁撴潫';
+ }
- // process.value = chunkRes.value;
- }
- }).finally(() => {
- resetStep();
+ if (chunkRes.mode === 'finish') {
+ isTalking.value = false;
+ return;
+ }
+
+ const stepItem = convertProcessItem(chunkRes);
+ computedMessageList.value.at(-1).stepList.push(stepItem);
+ scrollToBottom();
+ })
+ .catch((err) => {
+ throw err;
+ })
+ .finally(() => {
+ isTalking.value = false;
+
+ computedMessageList.value.at(-1).stepIsShow = false;
+ resetStep();
+ });
});
- questionRes = res;
+
+ questionRes = await resultP;
const content = parseContent(res);
return content;
};
@@ -419,7 +484,13 @@
try {
isTalking.value = true;
const userItem: ChatMessage = { role: RoleEnum.user, content } as any;
- const assistantItem: ChatMessage = { role: RoleEnum.assistant, content: null, state: AnswerState.Null } as any;
+ const assistantItem: ChatMessage = {
+ role: RoleEnum.assistant,
+ content: null,
+ state: AnswerState.Null,
+ stepList: [],
+ stepIsShow: true,
+ } as any;
// 鍙戦�佸綋鍓�
messageList.value.push(userItem);
// 娓呯┖杈撳叆妗�
@@ -458,8 +529,6 @@
// type: AnswerType.Text,
// values: '鍙戠敓閿欒锛�',
// });
- } finally {
- isTalking.value = false;
}
};
@@ -537,8 +606,9 @@
//鏄剧ず涓婁竴鏉℃秷鎭�
const showUpChatClick = () => {
if (computedMessageList.value.length === 0) return;
- if (currentIndex.value === null) {
- currentIndex.value = history_data.value.length - 1;
+ if (currentIndex.value == 0) {
+ messageContent.value.values = history_data.value[currentIndex.value].content.values;
+ return;
} else {
currentIndex.value = (currentIndex.value + history_data.value.length - 1) % history_data.value.length;
}
@@ -547,6 +617,10 @@
//鏄剧ず涓嬩竴鏉℃秷鎭�
const showDownChatClick = () => {
if (computedMessageList.value.length === 0) return;
+ if (currentIndex.value == history_data.value.length - 1) {
+ messageContent.value.values = history_data.value[currentIndex.value].content.values;
+ return;
+ }
if (currentIndex.value === null) {
currentIndex.value = 0;
} else {
@@ -582,6 +656,21 @@
messageContent.value.values = content;
};
//#endregion
+//#region ====================== 鐢ㄦ埛璇㈤棶鐨勯棶棰樿缃负甯哥敤璇� ======================
+const setCommonQuestionInfo = ref({});
+const { toClipboard } = useClipboard();
+
+//鐢ㄦ埛澶嶅埗闂
+const copyUserClick = (item) => {
+ const text = item.content.values;
+ ElMessage.success('澶嶅埗鎴愬姛');
+ toClipboard(text);
+};
+//鐢ㄦ埛闂璁剧疆涓哄父鐢ㄨ
+const setCommonQuestionClick = (item) => {
+ setCommonQuestionInfo.value = item;
+};
+//#endregion
</script>
<style scoped lang="scss">
@@ -602,22 +691,10 @@
}
}
-.el-step.is-horizontal.stepActive {
- .el-step__head.is-finish {
- .el-step__line {
- // 褰撳墠姝ラ鏁版í绾挎牱寮忚缃�
- .el-step__line-inner {
- width: 50% !important;
- border-width: 1px !important;
- }
- }
-
- // 褰撳墠姝ラ鏁板渾鍦堟牱寮忚缃�
- .el-step__icon.is-text {
- // background: #409eff;
- color: #fff;
- }
- }
+:deep(.el-step__icon.is-text) {
+ --radius-size: 24px;
+ width: var(--radius-size);
+ height: var((--radius-size));
}
:deep(.el-step__icon-inner) {
@@ -626,4 +703,26 @@
:deep(.el-step__description) {
height: 20px;
}
+.action {
+ left: 0;
+ padding: 4px;
+ gap: 4px;
+ border-radius: 4px;
+ display: flex;
+ align-items: center;
+ flex-direction: row;
+ position: absolute;
+ top: 0;
+}
+.action {
+ left: 0;
+ padding: 4px;
+ gap: 4px;
+ border-radius: 4px;
+ display: flex;
+ align-items: center;
+ flex-direction: row;
+ position: absolute;
+ top: 0;
+}
</style>
--
Gitblit v1.9.3