From 1bbfafa986b460c2411418663a152b541647fcf9 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期二, 05 十一月 2024 13:20:45 +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 | 75 +++++++++++++++++--------------------
1 files changed, 34 insertions(+), 41 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index ce18505..5293a8d 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>
@@ -49,10 +49,12 @@
:title="subItem.title"
:status="stepEnumMap[subItem.status]"
>
- <!-- <template #icon>
- <span v-if="subItem.status === StepEnum.Loading" class="ywifont ywicon-loading animate-spin"></span>
- <span v-else class="ywifont ywicon-loading1 animate-spin"></span>
- </template> -->
+ <template
+ #icon
+ v-if="index + 1 === item.stepList.length && isTalking && msgIndex === computedMessageList.length - 1"
+ >
+ <span class="ywifont ywicon-loading1 animate-spin !text-[24px]"></span>
+ </template>
<template #title>
<span class="text-sm">{{ subItem.title }}</span>
</template>
@@ -82,38 +84,7 @@
</div>
</div>
<template v-else>
- <el-popover placement="bottom-start" trigger="hover" :popper-style="{ minWidth: '70px' }" :width="70">
- <template #default>
- <div class="action" v-if="item.role === RoleEnum.user">
- <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]"
- @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]"
- @click="setCommonQuestionClick(item)"
- />
- </div>
- </div>
- </template>
- <template #reference>
- <component
- :is="answerTypeMapCom[item.content.type]"
- v-if="item.role === RoleEnum.user"
- :data="item.content.values"
- :originData="item"
- />
- </template>
- </el-popover>
- <component
- :is="answerTypeMapCom[item.content.type]"
- v-if="item.role !== RoleEnum.user"
- :data="item.content.values"
- :originData="item"
- />
+ <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"
@@ -134,6 +105,23 @@
</template>
</div>
<!-- 鎿嶄綔 -->
+ <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"
@@ -218,6 +206,7 @@
@showUpChatClick="showUpChatClick"
@showDownChatClick="showDownChatClick"
:style="{ width: chatWidth }"
+ :setCommonQuestionInfo="setCommonQuestionInfo"
></PlayBar>
</div>
</div>
@@ -253,6 +242,7 @@
roomConfig,
} from '/@/stores/chatRoom';
import { ErrorCode } from '/@/utils/request';
+import { Logger } from '/@/model/logger/Logger';
const chatWidth = '75%';
const voicePageIsShow = ref(false);
let isTalking = ref(false);
@@ -366,8 +356,7 @@
let questionRes = null;
let finalCalcSectionAId = null;
-const questionAi = async (text, assistantMsg: ChatMessage) => {
- // processId.value = uuidv4();
+const questionAi = async (text) => {
let judgeParams = null;
if (!preQuestion.value) {
// const aiContent = computedMessageList.value.filter((item) => item.role === RoleEnum.assistant);
@@ -424,6 +413,7 @@
resetStep();
let res = null;
await questionStreamByPost(params, (chunkRes) => {
+ Logger.info('chunk response锛歕n\n' + JSON.stringify(chunkRes));
if (chunkRes.mode === 'result') {
res = chunkRes.value;
} else {
@@ -489,7 +479,7 @@
questionRes = extRes;
resMsgContent = parseContent(extRes);
} else {
- resMsgContent = await questionAi(content.values, assistantItem);
+ resMsgContent = await questionAi(content.values);
}
nextUserMsgEndIndex.value++;
if (isNewChat) {
@@ -637,10 +627,13 @@
};
//#endregion
//#region ====================== 鐢ㄦ埛璇㈤棶鐨勯棶棰樿缃负甯哥敤璇� ======================
+const setCommonQuestionInfo = ref({});
//鐢ㄦ埛澶嶅埗闂
const copyUserClick = () => {};
//鐢ㄦ埛闂璁剧疆涓哄父鐢ㄨ
-const setCommonQuestionClick = () => {};
+const setCommonQuestionClick = (item) => {
+ setCommonQuestionInfo.value = item;
+};
//#endregion
</script>
--
Gitblit v1.9.3