From 4b6dad1f0b7be7ce1354fa2e5cf3f385734c89f8 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期五, 08 十一月 2024 11:19:17 +0800
Subject: [PATCH] 操作 bug
---
src/components/chat/Chat.vue | 300 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 194 insertions(+), 106 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index ae163a0..ebbcd1f 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -8,12 +8,21 @@
></span>
<div class="h-full relative" v-loading="chatListLoading" :style="{ width: chatWidth }">
<div
- class="group flex px-4 py-6 hover:bg-slate-100 rounded-lg relative"
- :class="{ 'flex-row-reverse': item.role === RoleEnum.user }"
+ class="flex px-4 py-6 rounded-lg relative"
+ :class="{ 'flex-row-reverse': item.role === RoleEnum.user, 'px-10': isShareCheck }"
v-for="(item, msgIndex) of computedMessageList"
:key="`${item.historyId}_${item.role}`"
>
<div class="absolute top-0 left-[72px] text-[#8d8e99]">{{ item?.createTime }}</div>
+ <!-- :class="{ 'top-[30px]': item.role === RoleEnum.user, 'top-[30px]': item.role === RoleEnum.assistant }" -->
+
+ <el-checkbox
+ v-if="isShareCheck"
+ class="absolute left-0 top-[28px]"
+ size="large"
+ v-model="item.isChecked"
+ @change="(isChecked) => shareCheckChange(isChecked as boolean, item)"
+ ></el-checkbox>
<img
class="rounded-full size-12 flex-0"
:class="{ 'mr-4': item.role === RoleEnum.assistant, 'ml-4': item.role === RoleEnum.user }"
@@ -27,6 +36,7 @@
<div
class="text-sm rounded-[6px] p-4 leading-relaxed"
:style="{ backgroundColor: item.role === RoleEnum.user ? 'rgb(197 224 255)' : 'white' }"
+ :class="{ group: item.role === RoleEnum.user }"
>
<div class="flex flex-col" v-if="item?.stepList?.length > 0">
<div class="flex items-center mb-3">
@@ -56,12 +66,46 @@
<span class="ywifont ywicon-loading1 animate-spin !text-[24px]"></span>
</template>
<template #title>
- <span class="text-sm">{{ subItem.title }}<span v-if="subItem.ms" class="text-green-600">{{ `锛�${subItem.ms}锛塦 }}</span></span>
+ <span class="text-sm"
+ >{{ subItem.title }}<span v-if="subItem.ms" class="text-green-600">{{ `锛�${subItem.ms}锛塦 }}</span></span
+ >
</template>
</el-step>
</el-steps>
</div>
+ <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">
+ <el-tooltip effect="dark" content="澶嶅埗" placement="top">
+ <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>
+ </el-tooltip>
+ <el-tooltip effect="dark" content="璁句负甯哥敤璇�" placement="top">
+ <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>
+ </el-tooltip>
+ <el-tooltip effect="dark" content="鍒嗕韩" placement="top">
+ <div class="flex items-center justify-center size-[15px]">
+ <i
+ :class="{ 'text-[#0284ff]': item.state === AnswerState.Unlike }"
+ class="p-2 ywifont ywicon-fenxiang cursor-pointer hover:text-[#0284ff] !text-[15px] hover:!text-[18px]"
+ @click="shareClick(item)"
+ />
+ </div>
+ </el-tooltip>
+ </div>
+ </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">
@@ -110,26 +154,9 @@
</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"
+ 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"
>
<div
@@ -142,51 +169,65 @@
/>
</div>
<template v-if="item.content.errCode !== ErrorCode.Message">
- <div class="flex items-center justify-center size-[15px]">
- <i
- :class="{ 'text-[#0284ff]': item.state === AnswerState.Like }"
- class="p-2 ywifont ywicon-dianzan cursor-pointer hover:text-[#0284ff] font-medium hover:!text-[18px]"
- @click="likeClick(item)"
- />
- </div>
+ <el-tooltip effect="dark" content="鐐硅禐" placement="top">
+ <div class="flex items-center justify-center size-[15px]">
+ <i
+ :class="{ 'text-[#0284ff]': item.state === AnswerState.Like }"
+ class="p-2 ywifont ywicon-dianzan cursor-pointer hover:text-[#0284ff] font-medium hover:!text-[18px]"
+ @click="likeClick(item)"
+ />
+ </div>
+ </el-tooltip>
+ <el-tooltip effect="dark" content="鐐硅俯" placement="top">
+ <div class="flex items-center justify-center size-[15px]">
+ <i
+ :class="{ 'text-[#0284ff]': item.state === AnswerState.Unlike }"
+ class="p-2 ywifont ywicon-buzan cursor-pointer hover:text-[#0284ff] !text-[13px] hover:!text-[15px]"
+ @click="unLikeClick(item)"
+ />
+ </div>
+ </el-tooltip>
+ </template>
+ <el-tooltip effect="dark" content="鍒嗕韩" placement="top">
<div class="flex items-center justify-center size-[15px]">
<i
:class="{ 'text-[#0284ff]': item.state === AnswerState.Unlike }"
- class="p-2 ywifont ywicon-buzan cursor-pointer hover:text-[#0284ff] !text-[13px] hover:!text-[15px]"
- @click="unLikeClick(item)"
+ class="p-2 ywifont ywicon-fenxiang cursor-pointer hover:text-[#0284ff] !text-[15px] hover:!text-[18px]"
+ @click="shareClick(item)"
/>
</div>
- </template>
-
- <div class="flex items-center justify-center size-[15px] relative">
- <i
- class="p-2 ywifont ywicon-wentifankui cursor-pointer hover:text-[#0284ff] !text-[13px] hover:!text-[15px]"
- @click="
- ($event) =>
- feedbackClick(
- $event,
- item,
- computedMessageList
- .filter((v) => v.role === RoleEnum.assistant)
- .findIndex((v) => v.historyId === item.historyId)
- )
- "
- />
- <FeedbackPanel
- v-show="feedbackIsShow && currentFeedbackMapItem === item"
- ref="feedbackPanelRef"
- v-model:isShow="feedbackIsShow"
- v-model:content="feedbackContent"
- :chatItem="currentFeedbackMapItem"
- :position="feedbackPosition"
- />
- </div>
+ </el-tooltip>
+ <el-tooltip effect="dark" content="鍙嶉" placement="top">
+ <div class="flex items-center justify-center size-[15px] relative">
+ <i
+ class="p-2 ywifont ywicon-wentifankui cursor-pointer hover:text-[#0284ff] !text-[13px] hover:!text-[15px]"
+ @click="
+ ($event) =>
+ feedbackClick(
+ $event,
+ item,
+ computedMessageList
+ .filter((v) => v.role === RoleEnum.assistant)
+ .findIndex((v) => v.historyId === item.historyId)
+ )
+ "
+ />
+ <FeedbackPanel
+ v-show="feedbackIsShow && currentFeedbackMapItem === item"
+ ref="feedbackPanelRef"
+ v-model:isShow="feedbackIsShow"
+ v-model:content="feedbackContent"
+ :chatItem="currentFeedbackMapItem"
+ :position="feedbackPosition"
+ />
+ </div>
+ </el-tooltip>
</div>
</div>
</div>
</div>
</div>
- <div v-if="showAskMore" class="ml-4 mt-5 text-sm pb-10">
+ <div v-if="showAskMore && !isShareCheck" class="ml-4 mt-5 text-sm pb-10">
<div class="text-gray-600 mb-5">浣犲彲浠ョ户缁棶鎴戯細</div>
<div class="space-y-2 inline-flex flex-col">
<div
@@ -202,7 +243,10 @@
</div>
</div>
- <div class="sticky bottom-0 w-full p-6 bg-[rgb(247,248,250)] flex justify-center">
+ <div
+ class="sticky bottom-0 w-full p-6 bg-[rgb(247,248,250)] flex justify-center"
+ v-if="!isSharePage && !isShareCheck"
+ >
<PlayBar
v-model:voicePageIsShow="voicePageIsShow"
:isTalking="isTalking"
@@ -215,15 +259,18 @@
:setCommonQuestionInfo="setCommonQuestionInfo"
></PlayBar>
</div>
+ <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" />
</div>
</template>
<script setup lang="ts">
+import { ElMessage } from 'element-plus';
import _ from 'lodash';
import moment from 'moment';
import { computed, 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';
@@ -231,25 +278,25 @@
import { useScrollToBottom } from './hooks/useScrollToBottom';
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 { 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 } from '/@/constants';
import { Logger } from '/@/model/logger/Logger';
import router from '/@/router';
import {
- activeChatRoom,
- activeGroupType,
- activeLLMId,
- activeRoomId,
- activeSampleId,
- activeSectionAId,
- getRoomConfig,
- roomConfig,
+activeChatRoom,
+activeGroupType,
+activeLLMId,
+activeRoomId,
+activeSampleId,
+activeSectionAId,
+getRoomConfig,
+isSharePage,
+roomConfig,
} from '/@/stores/chatRoom';
import { ErrorCode } from '/@/utils/request';
-import { ElMessage } from 'element-plus';
-import useClipboard from 'vue-clipboard3';
-import { toMyFixed, toPercent } from '/@/utils/util';
+import { toMyFixed } from '/@/utils/util';
const chatWidth = '75%';
const voicePageIsShow = ref(false);
let isTalking = ref(false);
@@ -265,6 +312,7 @@
const computedMessageList = computed(() => {
return messageList.value.filter((v) => !!v);
});
+
const parseContent = (res, reportIsShow = false) => {
if (!res) return null;
let content: ChatContent = {
@@ -440,8 +488,6 @@
const currentTimeStamp = new Date().getTime();
const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
if (chunkRes.mode === 'finish') {
- const title = stepList.at(-1).title;
- // stepList.at(-1).title = `${title}锛�${ms}锛塦;
stepList.at(-1).ms = ms;
isTalking.value = false;
@@ -449,10 +495,7 @@
}
if (stepList?.length >= 1) {
- const title = stepList.at(-1).title;
- // stepList.at(-1).title = `${title}锛�${ms}锛塦;
stepList.at(-1).ms = ms;
-
}
lastTimestamp = currentTimeStamp;
@@ -502,13 +545,14 @@
try {
isTalking.value = true;
- const userItem: ChatMessage = { role: RoleEnum.user, content } as any;
+ const userItem: ChatMessage = { role: RoleEnum.user, content, isChecked: false } as any;
const assistantItem: ChatMessage = {
role: RoleEnum.assistant,
content: null,
state: AnswerState.Null,
stepList: [],
stepIsShow: true,
+ isChecked: false,
} as any;
// 鍙戦�佸綋鍓�
messageList.value.push(userItem);
@@ -561,7 +605,10 @@
messageList.value.at(-1).createTime = currentTime;
}
};
+
+
const { loadRangeData, onChatListScroll, moreIsLoading, nextUserMsgEndIndex } = useScrollLoad({
+ isSharePage: isSharePage,
container: chatListDom,
historyGroupId: currentRouteId,
messageList,
@@ -570,11 +617,12 @@
const chatListLoading = ref(false);
-const { scrollToBottom } = useScrollToBottom({
+const { scrollToBottom, scrollToTop } = useScrollToBottom({
chatListDom: chatListDom,
});
onMounted(async () => {
+
messageList.value = [];
// 鍔犺浇鍒濆鏁版嵁
chatListLoading.value = true;
@@ -585,19 +633,26 @@
if (messageList.value.length === 0) {
messageContent.value = {
type: AnswerType.Text,
- values: activeChatRoom.value.title,
+ values: activeChatRoom.value?.title,
};
sendChatMessage();
} else {
- setTimeout(() => {
- // 鍒濆鐘舵�佹粴涓�涓�
- scrollToBottom();
-
+ if (isSharePage.value) {
setTimeout(() => {
- chatListDom.value.addEventListener('scroll', onChatListScroll);
+ // 婊氬姩鍒伴《閮�
+ scrollToTop();
}, 300);
- }, 300);
+ } else {
+ setTimeout(() => {
+ // 鍒濆鐘舵�佹粴涓�涓�
+ scrollToBottom();
+
+ setTimeout(() => {
+ chatListDom.value.addEventListener('scroll', onChatListScroll);
+ }, 300);
+ }, 300);
+ }
}
});
//#region ====================== 鍏宠仈鏌ヨ ======================
@@ -690,6 +745,61 @@
setCommonQuestionInfo.value = item;
};
//#endregion
+
+//#region ====================== 鍒嗕韩 ======================
+
+const resetShare = () => {
+ computedMessageList.value.forEach((item) => {
+ item.isChecked = false;
+ });
+ isShareCheck.value = false;
+};
+
+const isShareCheck = ref(false);
+const shareClick = async (item: ChatMessage) => {
+ item.isChecked = true;
+ shareCheckChange(true, item);
+ // 鐩墠鍙垎浜竴涓紝涓嶈繘鍏ュ閫夋ā寮忥紝鍒嗕韩澶氫釜
+ // isShareCheck.value = true;
+
+ const url = await generateShareUrl();
+ ElMessage.success('宸插鍒跺垎浜摼鎺�');
+ toClipboard(url);
+};
+
+const shareCheckChange = (isChecked: boolean, item: ChatMessage) => {
+ const toFindRole = item.role === RoleEnum.user ? RoleEnum.assistant : RoleEnum.user;
+
+ const foundMapItem = computedMessageList.value.find(
+ (msgItem) => msgItem.historyId === item.historyId && msgItem.role === toFindRole
+ );
+ if (!foundMapItem) return;
+ foundMapItem.isChecked = isChecked;
+};
+
+const generateShareUrl = async () => {
+ const shareList = computedMessageList.value.filter((item) => item.isChecked && item.role === RoleEnum.user && !!item.historyId);
+ if (shareList.length === 0) {
+ // ElMessage.warning('璇烽�夋嫨瑕佸垎浜殑鍐呭');
+ return;
+ }
+ const historyIdStr = shareList.map((item) => item.historyId).join(',');
+ const res = await shareChatHistoryByPost({
+ history_ids: historyIdStr,
+ share_days: 1,
+ }).finally(() => {
+ resetShare();
+ });
+
+ if (!res.values) return;
+ const shareId = Object.values(res.values)[0];
+ if (!shareId) return;
+ const relativeHref = router.resolve(`share?id=${shareId}`).href;
+ const shareLink = `${SERVE_URL}${relativeHref}`;
+ return shareLink;
+};
+
+//#endregion
</script>
<style scoped lang="scss">
@@ -721,27 +831,5 @@
}
: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