From 98f2147789fadc058adcef82f042fad98dcbee57 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 05 十一月 2024 10:32:29 +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 | 113 +++++++++++++++++++++++---------------------------------
1 files changed, 46 insertions(+), 67 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index c8f3c5c..b1890c7 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -29,14 +29,17 @@
:style="{ backgroundColor: item.role === RoleEnum.user ? 'rgb(197 224 255)' : 'white' }"
>
<div class="flex flex-col" v-if="item?.stepList?.length > 0">
- <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 mb-3 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 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>
<!-- 杩囩▼杈撳嚭 -->
@@ -46,10 +49,9 @@
: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 && index === computedMessageList.length - 1">
+ <span class="ywifont ywicon-loading1 animate-spin !text-[24px]"></span>
+ </template>
<template #title>
<span class="text-sm">{{ subItem.title }}</span>
</template>
@@ -79,38 +81,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"
@@ -131,6 +102,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"
@@ -215,6 +203,7 @@
@showUpChatClick="showUpChatClick"
@showDownChatClick="showDownChatClick"
:style="{ width: chatWidth }"
+ :setCommonQuestionInfo="setCommonQuestionInfo"
></PlayBar>
</div>
</div>
@@ -231,10 +220,10 @@
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 type { ChatContent, StepItem } from './model/types';
+import { AnswerState, AnswerType, RoleEnum, answerTypeMapCom, roleImageMap, type ChatMessage, stepEnumMap } from './model/types';
import { QuestionAi, extCallQuery, questionStreamByPost } from '/@/api/ai/chat';
import PlayBar from '/@/components/chat/components/playBar/PlayBar.vue';
import CustomDrawer from '/@/components/drawer/CustomDrawer.vue';
@@ -363,8 +352,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);
@@ -486,7 +474,7 @@
questionRes = extRes;
resMsgContent = parseContent(extRes);
} else {
- resMsgContent = await questionAi(content.values, assistantItem);
+ resMsgContent = await questionAi(content.values);
}
nextUserMsgEndIndex.value++;
if (isNewChat) {
@@ -634,10 +622,13 @@
};
//#endregion
//#region ====================== 鐢ㄦ埛璇㈤棶鐨勯棶棰樿缃负甯哥敤璇� ======================
+const setCommonQuestionInfo = ref({});
//鐢ㄦ埛澶嶅埗闂
const copyUserClick = () => {};
//鐢ㄦ埛闂璁剧疆涓哄父鐢ㄨ
-const setCommonQuestionClick = () => {};
+const setCommonQuestionClick = (item) => {
+ setCommonQuestionInfo.value = item;
+};
//#endregion
</script>
@@ -659,22 +650,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) {
--
Gitblit v1.9.3