From 5cce97e0c068dc2a650945c0ab8a22a5e3c1dc39 Mon Sep 17 00:00:00 2001
From: yangyin <18723093654@163.com>
Date: 星期三, 04 十二月 2024 16:21:34 +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 | 223 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 165 insertions(+), 58 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index b38c456..5d5f2ab 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -1,7 +1,7 @@
<template>
<div class="flex h-full">
<div class="flex flex-col h-full flex-auto">
- <div ref="chatListDom" class="relative h-full flex flex-col items-center overflow-y-auto">
+ <div ref="chatListDom" class="relative h-full flex flex-col items-center overflow-y-auto" style="height: calc(100% - 50px)">
<span
class="more-loading absolute text-blue-400 left-[50%] translate-x-[-50%] cursor-pointer w-10"
v-loading="moreIsLoading"
@@ -35,12 +35,14 @@
<div class="inline-flex flex-col" :class="{ 'w-full': item.role === RoleEnum.assistant }">
<div class="w-full">
<div
- class="text-sm rounded-[6px] p-4 leading-relaxed"
+ class="rounded-[6px] p-4 leading-relaxed"
:style="{ backgroundColor: item.role === RoleEnum.user ? 'rgb(197 224 255)' : 'white' }"
:class="{ group: item.role === RoleEnum.user }"
>
+ <!-- #region ====================== 鎰忓浘鍒嗘瀽 ======================-->
<div class="flex flex-col" v-if="item?.stepList?.length > 0">
- <div class="flex items-center mb-3">
+ <!-- #region ====================== 鎰忓浘鍒嗘瀽 ======================-->
+ <div class="flex items-center">
<span class="mr-2">鎰忓浘鍒嗘瀽锛�</span>
<div
@click="toggleStepList(item)"
@@ -55,9 +57,10 @@
></span>
</div>
</div>
+ <!-- #endregion -->
- <!-- 杩囩▼杈撳嚭 -->
- <el-steps v-show="item.stepIsShow" direction="vertical" :active="activeStep">
+ <!-- #region ====================== 杩囩▼杈撳嚭 ======================-->
+ <el-steps v-show="item.stepIsShow" class="mt-3" direction="vertical" :active="activeStep">
<el-step
v-for="(subItem, index) in item.stepList"
:title="subItem.title"
@@ -70,21 +73,24 @@
<span class="ywifont ywicon-loading1 animate-spin !text-[24px]"></span>
</template>
<template #title>
- <span class="text-sm"
+ <span class=""
>{{ subItem.title
}}<span v-if="subItem.ms" class="text-green-600">{{ `锛�${subItem.ms}锛塦 }}</span></span
>
</template>
</el-step>
</el-steps>
+ <!-- #endregion -->
</div>
+ <!-- #endregion -->
+ <!-- #region ====================== 鐢ㄦ埛鎿嶄綔鎸夐挳 ======================-->
<div
v-if="item.role === RoleEnum.user && item.content?.values && !isSharePage && !isShareCheck"
class="absolute flex items-center bottom-0 group invisible"
>
<div
- class="bg-[#fff] flex items-center mr-4 space-x-2 flex-nowrap rounded-[6px] py-2 px-2 group-hover:visible"
+ class="bg-[#fff] flex items-center relative mr-4 space-x-2 flex-nowrap rounded-[6px] py-2 px-2 group-hover:visible"
>
<el-tooltip effect="dark" content="澶嶅埗" placement="top">
<div class="flex items-center justify-center size-[20px]">
@@ -113,20 +119,24 @@
</el-tooltip>
</div>
</div>
+
+ <!-- #endregion -->
+ <!-- #region ====================== 娑堟伅鍐呭 ======================-->
<template v-if="item.content?.values">
+ <!-- #region ====================== 鎶ラ敊淇℃伅 ======================-->
<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" v-if="showFixQuestion(item)">
- <div class="text-gray-600 flex-0 mt-4">
+ <div class="mt-3 flex" v-if="showFixQuestion(item)">
+ <div class="text-gray-600 flex-0 mb-auto py-3">
{{ '鐚滀綘鎯抽棶锛�' }}
</div>
- <div class="ml-1 space-x-2 inline-flex flex-wrap">
+ <div class="flex-auto space-x-2 space-y-1 inline-flex flex-wrap items-center">
<div
v-for="fixItem in item.content.origin?.sample_question"
:key="fixItem"
- class="bg-gray-200 p-3 mt-1 hover:bg-[#c5e0ff] hover:text-[#1c86ff] cursor-pointer rounded-lg"
+ class="bg-gray-200 p-3 hover:bg-[#c5e0ff] hover:text-[#1c86ff] cursor-pointer rounded-lg first-of-type:ml-2 first-of-type:mt-1"
@click="fixQuestionClick(fixItem, item.content.origin)"
>
{{ fixItem }}
@@ -134,6 +144,8 @@
</div>
</div>
</div>
+ <!-- #endregion -->
+ <!-- #region ====================== 鍥炵瓟缁勪欢 ======================-->
<template v-else>
<component
:conclusion="item.conclusion"
@@ -159,9 +171,23 @@
</div>
</div>
</template>
+ <!-- #endregion -->
</template>
- </div>
+ <!-- #endregion -->
+ <!-- #region ====================== 闄勫姞鍐呭 ======================-->
+ <!-- #region ====================== 鍋滄 ======================-->
+ <span v-if="item.isStopMsg && item?.role === RoleEnum.assistant" class="text-gray-400 text-[12px]"
+ >锛堝凡鍋滄锛�</span
+ >
+ <!-- parseContent 杩斿洖涓� null -->
+ <p v-if="!item.content && !isTalking && !item.isStopMsg" class="text-red-500">
+ 鏆傛棤鏁版嵁
+ </p>
+ <!-- #endregion -->
+ <!-- #endregion -->
+ </div>
+ <!-- #region ====================== ai 娑堟伅鎿嶄綔 ======================-->
<div
v-if="item.role === RoleEnum.assistant && item.content?.values && !isSharePage && !isShareCheck"
class="absolute flex items-center right-0 mr-4 mt-2 space-x-2"
@@ -229,6 +255,7 @@
</div>
</el-tooltip>
</div>
+ <!-- #endregion -->
</div>
</div>
</div>
@@ -239,7 +266,7 @@
<span class="text-[15px]"> 鍒嗕韩鐨勫璇濅笉瀛樺湪鎴栧凡澶辨晥 </span>
</template>
</el-empty>
- <div v-if="showAskMore && !isShareCheck" class="ml-4 mt-5 text-sm pb-10">
+ <div v-if="showAskMore" class="ml-4 mt-5 pb-10">
<div class="text-gray-600 mb-5">浣犲彲浠ョ户缁棶鎴戯細</div>
<div class="space-y-2 inline-flex flex-col">
<div
@@ -255,7 +282,10 @@
</div>
</div>
- <div class="sticky bottom-0 w-full p-6 bg-[rgb(247,248,250)] flex justify-center" v-if="!isSharePage && !isShareCheck">
+ <div
+ class="sticky bottom-0 w-full px-6 pt-12 pb-6 bg-[rgb(247,248,250)] flex justify-center"
+ v-if="!isSharePage && !isShareCheck"
+ >
<PlayBar
v-model:voicePageIsShow="voicePageIsShow"
:isTalking="isTalking"
@@ -263,6 +293,7 @@
v-model="messageContent.values"
@sendClick="sendClick"
@showUpChatClick="showUpChatClick"
+ @stopGenClick="stopGenClick"
@showDownChatClick="showDownChatClick"
:style="{ width: chatWidth }"
:setCommonQuestionInfo="setCommonQuestionInfo"
@@ -271,18 +302,28 @@
<div class="sticky bottom-0 w-full p-6 bg-[rgb(247,248,250)] flex justify-center" v-if="isShareCheck"></div>
</div>
<CustomDrawer v-model:isShow="drawerIsShow" @updateChatInput="updateChatInput" />
+ <el-dialog title="鍒嗕韩閾炬帴" v-model="shareCodeIsShow" width="25%" modal-append-to-body lock-scroll :before-close="closeShareClick">
+ <div class="w100 h100 flex justify-center items-center flex-col text-center">
+ <div class="qrcode h100" ref="qrcodeRef"></div>
+ <div class="h100 w100 flex flex-col justify-center items-center">
+ <span class="h100 text-[#8d8e99] text-[12px] mt-2">{{ shareCoderUrl }}</span>
+ <span class="text-[#1d86ff] text-[12px] cursor-pointer" @click="copyShareCodeClick">澶嶅埗</span>
+ </div>
+ </div>
+ </el-dialog>
</div>
</template>
<script setup lang="ts">
+import axios, { CancelTokenSource } from 'axios';
import { ElMessage } from 'element-plus';
-import _ from 'lodash';
+import { findLast, orderBy } from 'lodash-es';
import moment from 'moment';
-import { computed, onMounted, ref } from 'vue';
+import QRCode from 'qrcodejs2-fixes';
+import { computed, nextTick, onActivated, onMounted, ref } from 'vue';
import useClipboard from 'vue-clipboard3';
import FeedbackPanel from './components/FeedbackPanel.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';
@@ -290,7 +331,7 @@
import { extCallQuery, questionStreamByPost, shareChatHistoryByPost } from '/@/api/ai/chat';
import PlayBar from '/@/components/chat/components/playBar/PlayBar.vue';
import CustomDrawer from '/@/components/drawer/CustomDrawer.vue';
-import { SERVE_URL, SHARE_URL } from '/@/constants';
+import { SHARE_URL } from '/@/constants';
import { Logger } from '/@/model/logger/Logger';
import router from '/@/router';
import {
@@ -304,8 +345,10 @@
isSharePage,
roomConfig,
} from '/@/stores/chatRoom';
+import emitter from '/@/utils/mitt';
import { ErrorCode } from '/@/utils/request';
import { toMyFixed } from '/@/utils/util';
+import { loadAmisSource } from '../amis/load';
const chatWidth = '75%';
const voicePageIsShow = ref(false);
let isTalking = ref(false);
@@ -378,13 +421,12 @@
};
break;
}
- content.askMoreList = _.orderBy(res.context_history, [(item) => Number(item.radio)], ['desc']);
+ content.askMoreList = orderBy(res.context_history, [(item) => Number(item.radio)], ['desc']);
content.errCode = res?.err_code;
content.errMsg = res?.json_msg;
content.origin = res;
return content;
};
-const { clearQueryProcess, process, processId, queryProcess } = useQueryProcess();
//#region ====================== 姝ラ step ======================
const activeStep = ref(-1);
@@ -421,8 +463,10 @@
const DEFAULT_SECTION_A_ID = 'knowledge_base';
let questionRes = null;
-
+let position = null;
let finalCalcSectionAId = null;
+
+let lastAxiosSource: CancelTokenSource = null;
const questionAi = async (text) => {
let judgeParams = null;
if (!preQuestion.value) {
@@ -445,7 +489,7 @@
currentSectionAId = activeSectionAId.value;
activeSectionAId.value = '';
} else {
- const lastSectionAItem = _.findLast(
+ const lastSectionAItem = findLast(
computedMessageList.value as any,
(item) => item.role === RoleEnum.assistant && !!item.sectionAId
);
@@ -462,6 +506,12 @@
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(',');
+ }
if (activeGroupType.value) {
params.group_type = activeGroupType.value;
@@ -481,49 +531,58 @@
let res = null;
let lastTimestamp = new Date().getTime();
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 = '鍑嗗鏁版嵁鍒嗘瀽';
- }
+ const currentSource = axios.CancelToken.source();
+ lastAxiosSource = currentSource;
+ await questionStreamByPost(
+ params,
+ (chunkRes) => {
+ Logger.info('chunk response锛歕n\n' + JSON.stringify(chunkRes));
+ if (chunkRes.mode === 'result') {
+ res = chunkRes.value;
+ resolve(res);
+ chunkRes.value = '鍑嗗鏁版嵁鍒嗘瀽';
+ }
- if (chunkRes.mode === 'conclusion') {
- computedMessageList.value.at(-1).conclusion = chunkRes.value;
- chunkRes.value = '鍒嗘瀽缁撴潫';
- }
- const stepList = computedMessageList.value.at(-1).stepList;
- const currentTimeStamp = new Date().getTime();
- const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
- if (chunkRes.mode === 'finish') {
- stepList.at(-1).ms = ms;
+ if (chunkRes.mode === 'conclusion') {
+ computedMessageList.value.at(-1).conclusion = chunkRes.value;
+ chunkRes.value = '鍒嗘瀽缁撴潫';
+ }
+ const stepList = computedMessageList.value.at(-1).stepList;
+ const currentTimeStamp = new Date().getTime();
+ const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
+ if (chunkRes.mode === 'finish') {
+ stepList.at(-1).ms = ms;
- isTalking.value = false;
- return;
- }
+ return;
+ }
- if (stepList?.length >= 1) {
- stepList.at(-1).ms = ms;
- }
- lastTimestamp = currentTimeStamp;
+ if (stepList?.length >= 1) {
+ stepList.at(-1).ms = ms;
+ }
+ lastTimestamp = currentTimeStamp;
- const stepItem = convertProcessItem(chunkRes);
- stepList.push(stepItem);
- scrollToBottom();
- })
+ const stepItem = convertProcessItem(chunkRes);
+ stepList.push(stepItem);
+ scrollToBottom();
+ },
+ {
+ cancelToken: currentSource.token,
+ }
+ )
.catch((err) => {
throw err;
})
.finally(() => {
isTalking.value = false;
-
computedMessageList.value.at(-1).stepIsShow = false;
+
resetStep();
});
});
questionRes = await resultP;
+ isTalking.value = false;
+
const content = parseContent(res, true);
return content;
};
@@ -538,6 +597,14 @@
let currentLLMId = null;
+const stopGenClick = () => {
+ lastAxiosSource?.cancel();
+ isTalking.value = false;
+ chatListLoading.value = false;
+ resetStep();
+ computedMessageList.value.at(-1).isStopMsg = true;
+};
+
const sendChatMessage = async (content: ChatContent = messageContent.value, cb?: any, isCallExtParams?: any) => {
if (!content?.values) {
return;
@@ -546,6 +613,7 @@
ElMessage.warning('ai 姝ｅ湪鍥炲涓紝璇风◢鍚庡皾璇曟彁闂�');
return;
}
+ // position = position ?? (await getCurrentPosition());
const isNewChat = messageList.value.length === 0;
if (isNewChat) {
@@ -568,6 +636,7 @@
state: AnswerState.Null,
stepList: [],
stepIsShow: true,
+ isStopMsg: false,
isChecked: false,
} as any;
// 鍙戦�佸綋鍓�
@@ -635,6 +704,10 @@
chatListDom: chatListDom,
});
+onActivated(() => {
+ emitter.emit('updateHeaderTitle', activeChatRoom.value?.title ?? '');
+});
+
onMounted(async () => {
messageList.value = [];
// 鍔犺浇鍒濆鏁版嵁
@@ -642,6 +715,9 @@
await loadRangeData().finally(() => {
chatListLoading.value = false;
});
+ setTimeout(() => {
+ emitter.emit('updateHeaderTitle', activeChatRoom.value?.title ?? '');
+ }, 300);
if (messageList.value.length === 0) {
messageContent.value = {
@@ -652,10 +728,10 @@
sendChatMessage();
} else {
if (isSharePage.value) {
- setTimeout(() => {
- // 婊氬姩鍒伴《閮�
- scrollToTop();
- }, 300);
+ // setTimeout(() => {
+ // // 婊氬姩鍒伴《閮�
+ // scrollToTop();
+ // }, 300);
} else {
setTimeout(() => {
// 鍒濆鐘舵�佹粴涓�涓�
@@ -667,6 +743,7 @@
}, 300);
}
}
+ loadAmisSource()
});
//#region ====================== 鍏宠仈鏌ヨ ======================
const relativeQueryClick = async (val) => {
@@ -769,17 +846,43 @@
};
const isShareCheck = ref(false);
+const qrcodeRef = ref<HTMLElement | null>(null);
+const shareCodeIsShow = ref(false); //鏄惁寮圭獥鏄剧ず鍒嗕韩浜岀淮鐮�
+const shareCoderUrl = ref('');
const shareClick = async (item: ChatMessage) => {
item.isChecked = true;
shareCheckChange(true, item);
// 鐩墠鍙垎浜竴涓紝涓嶈繘鍏ュ閫夋ā寮忥紝鍒嗕韩澶氫釜
// isShareCheck.value = true;
-
+ shareCodeIsShow.value = true;
const url = await generateShareUrl();
- ElMessage.success('宸插鍒跺垎浜摼鎺�');
- toClipboard(url);
+ shareCoderUrl.value = url;
+ const qrCodeElement = document.querySelector('.qrcode');
+ // ElMessage.success('宸插鍒跺垎浜摼鎺�');
+ nextTick(() => {
+ (<HTMLElement>qrCodeElement && qrCodeElement).innerHTML = '';
+ new QRCode(qrCodeElement, {
+ text: url,
+ width: 100,
+ height: 100,
+ colorDark: '#000000',
+ colorLight: '#ffffff',
+ });
+ });
+ // toClipboard(url);
};
-
+//閾炬帴澶嶅埗
+const copyShareCodeClick = () => {
+ const url = shareCoderUrl.value;
+ if (!url) return;
+ toClipboard(url);
+ ElMessage.success('宸插鍒跺垎浜摼鎺�');
+};
+//鍏抽棴鍒嗕韩寮圭獥
+const closeShareClick = () => {
+ shareCodeIsShow.value = false;
+ resetShare();
+};
const shareCheckChange = (isChecked: boolean, item: ChatMessage) => {
const toFindRole = item.role === RoleEnum.user ? RoleEnum.assistant : RoleEnum.user;
@@ -844,4 +947,8 @@
:deep(.el-step__description) {
height: 20px;
}
+
+:deep(.el-step:last-of-type .el-step__description) {
+ display: none;
+}
</style>
--
Gitblit v1.9.3