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 | 129 ++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 49 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index 6827430..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>
@@ -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,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>
@@ -80,7 +85,6 @@
</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"
@@ -100,8 +104,24 @@
</template>
</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"
@@ -186,10 +206,10 @@
@showUpChatClick="showUpChatClick"
@showDownChatClick="showDownChatClick"
:style="{ width: chatWidth }"
+ :setCommonQuestionInfo="setCommonQuestionInfo"
></PlayBar>
</div>
</div>
-
<CustomDrawer v-model:isShow="drawerIsShow" @updateChatInput="updateChatInput" />
</div>
</template>
@@ -197,24 +217,17 @@
<script setup lang="ts">
import _ from 'lodash';
import moment from 'moment';
-import { computed, onMounted, ref, triggerRef } from 'vue';
+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 { convertProcessItem, useScrollLoad } from './hooks/useScrollLoad';
import { useScrollToBottom } from './hooks/useScrollToBottom';
import type { ChatContent, StepItem } from './model/types';
-import {
- AnswerState,
- AnswerType,
- RoleEnum,
- answerTypeMapCom,
- roleImageMap,
- type ChatMessage,
- StepEnum,
- stepEnumMap,
-} from './model/types';
-import { extCallQuery, questionStreamByPost } from '/@/api/ai/chat';
+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';
import router from '/@/router';
@@ -228,9 +241,8 @@
getRoomConfig,
roomConfig,
} from '/@/stores/chatRoom';
-import { deepClone } from '/@/utils/other';
import { ErrorCode } from '/@/utils/request';
-
+import { Logger } from '/@/model/logger/Logger';
const chatWidth = '75%';
const voicePageIsShow = ref(false);
let isTalking = ref(false);
@@ -344,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);
@@ -402,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 {
@@ -467,7 +479,7 @@
questionRes = extRes;
resMsgContent = parseContent(extRes);
} else {
- resMsgContent = await questionAi(content.values, assistantItem);
+ resMsgContent = await questionAi(content.values);
}
nextUserMsgEndIndex.value++;
if (isNewChat) {
@@ -614,6 +626,15 @@
messageContent.value.values = content;
};
//#endregion
+//#region ====================== 鐢ㄦ埛璇㈤棶鐨勯棶棰樿缃负甯哥敤璇� ======================
+const setCommonQuestionInfo = ref({});
+//鐢ㄦ埛澶嶅埗闂
+const copyUserClick = () => {};
+//鐢ㄦ埛闂璁剧疆涓哄父鐢ㄨ
+const setCommonQuestionClick = (item) => {
+ setCommonQuestionInfo.value = item;
+};
+//#endregion
</script>
<style scoped lang="scss">
@@ -634,22 +655,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) {
@@ -658,4 +667,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