From 3b9f5d064379a7f56426c3eb2f49405728c58e36 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期一, 19 八月 2024 10:05:38 +0800
Subject: [PATCH] fix: 修改bug
---
src/views/sessionManager/index.vue | 407 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 299 insertions(+), 108 deletions(-)
diff --git a/src/views/sessionManager/index.vue b/src/views/sessionManager/index.vue
index d09263d..9ef1ed5 100644
--- a/src/views/sessionManager/index.vue
+++ b/src/views/sessionManager/index.vue
@@ -1,14 +1,18 @@
<template>
<div class="container">
-<!-- <AddSession-->
-<!-- :modalObj="modalObj"-->
-<!-- @addSession="addSession"-->
-<!-- :dialogId="dialogId"-->
-<!-- ></AddSession>-->
+ <!-- <AddSession-->
+ <!-- :modalObj="modalObj"-->
+ <!-- @addSession="addSession"-->
+ <!-- :dialogId="dialogId"-->
+ <!-- ></AddSession>-->
<!-- <a-card class="top-title">AI浼氳瘽璁板綍</a-card>-->
- <a-row :gutter="[5, 5]" style="margin-top: 3px;">
+ <a-row :gutter="[5, 5]" style="margin-top: 3px">
<a-col :span="1">
- <chatMenu></chatMenu>
+ <chatMenu
+ @createSession="createSession"
+ @querySessionDetail="querySessionDetail"
+ @changeAgentType="changeAgentType"
+ ></chatMenu>
</a-col>
<!-- 鏅鸿兘浣撲細璇�-->
<a-col :span="23" v-show="agentType == '1'">
@@ -16,7 +20,7 @@
<div class="header___lEPyH">
<div class="chatHeader">
<div class="chatHeaderBox">
- <span class="title">{{agentTitle}}</span>
+ <span class="title">{{ agentTitle }}</span>
</div>
</div>
</div>
@@ -25,13 +29,13 @@
id="home"
class="chat-list"
style="
- width: 90%;
+ width: 80%;
overflow: auto;
- height: calc(100vh - 300px);
+ height: calc(100vh - 380px);
margin: 0px auto 20px;
"
>
- <div class="chat-item" v-for="sessionDetail in sessionDetailList">
+ <div class="chat-item" v-for="(sessionDetail,index) in sessionDetailList">
<a-comment v-if="sessionDetail.role === 'user'">
<template #avatar>
<img
@@ -55,11 +59,30 @@
/>
</template>
<template #content>
- <a-card :class="{ chatItemAnswer: theme === 'light' }">
- <div :class="{ light: theme === 'light' }"
- >{{ sessionDetail.content }}
- </div>
- </a-card>
+ <!-- <a-card :class="{ chatItemAnswer: theme === 'light' }">-->
+ <!-- <div-->
+ <!-- :class="{ light: theme === 'light' }"-->
+ <!-- v-html="sessionDetail.content.replace(/\n/g, '<br/>')"-->
+ <!-- >-->
+ <!-- </div>-->
+ <!-- </a-card>-->
+ <a-textarea
+ readonly
+ auto-size
+ v-model="sessionDetail.content"
+ :class="{ chatItemAnswer: theme === 'light' }"
+ :style="{backgroundColor: theme === 'light' ? '#ffffff' : '#000000'}"
+ style="border: none"
+ >
+ </a-textarea>
+ </template>
+ <template #actions>
+ <span class="action" v-if="index != 0" @click="copy(sessionDetail.content)">
+ <icon-copy /> 澶嶅埗
+ </span>
+ <span class="action" v-if="index != 0 && index == sessionDetailList.length - 1" @click="reGenerate()">
+ <icon-refresh /> 閲嶆柊鐢熸垚
+ </span>
</template>
</a-comment>
<a-comment v-else-if="sessionDetail.role === 'last'">
@@ -76,8 +99,18 @@
auto-size
v-model="displayedText"
:class="{ chatItemAnswer: theme === 'light' }"
+ :style="{backgroundColor: theme === 'light' ? '#ffffff' : '#000000'}"
+ style="border: none"
>
</a-textarea>
+ </template>
+ <template #actions>
+ <div class="action"
+ @click="stopChat"
+ style="background: var(--color-bg-2);color: var(--color-primary-light-4);" v-if="displayedText != ''">
+ <icon-record-stop />
+ 鍋滄鐢熸垚
+ </div>
</template>
</a-comment>
</div>
@@ -86,7 +119,8 @@
>
<div class="chartStart v-else" @click="stopChat">閲嶆柊鐢熸垚</div> -->
</a-scrollbar>
- <div class="chat_bottom">
+
+ <div class="chat_bottom" >
<div class="center-bottom">
<!-- <a-textarea
v-model="inputMsg"
@@ -107,23 +141,35 @@
show-word-limit
:disabled="chatDis"
:class="{ textItemAnswer: theme === 'dark' }"
+ :style="{backgroundColor: theme === 'light' ? '#ffffff' : '#000000'}"
+ style="border: none"
:auto-size="{
minRows: 12,
maxRows: 5,
}"
/>
+ <div style="margin-left: 20px">
+ <a-upload
+ ref="uploadRef"
+ :file-list="uploadList"
+ multiple
+ :custom-request="customRequest"
+ style="font-size: 24px;">
+ <template #upload-button>
+ <icon-attachment style="color: #0960bd"/>
+ </template>
+ </a-upload>
+ </div>
+
<div class="btn-send">
- <!-- <icon-send size="32" /> -->
<a-button
:disabled="chatDis"
@click="sentClick"
- type="primary"
+ type="text"
style="border-radius: 24px"
:loading="loading"
- size="large"
- >鍙戦��
- </a-button
- >
+ ><icon-send size="32" style="color: #0960bd"/>
+ </a-button>
</div>
</div>
</div>
@@ -136,12 +182,19 @@
</a-col>
<a-col :span="23" v-show="agentType == '3'">
<div class="center" style="padding: 0">
- <historySession @querySessionDetail="querySessionDetail" @changeAgentType="changeAgentType"></historySession>
+ <historySession
+ @querySessionDetail="querySessionDetail"
+ @changeAgentType="changeAgentType"
+ ></historySession>
</div>
</a-col>
<a-col :span="23" v-show="agentType == '4'">
<div class="center" style="padding: 0">
- <smartAi @createSession="createSession" @querySessionDetail="querySessionDetail" @changeAgentType="changeAgentType"></smartAi>
+ <smartAi
+ @createSession="createSession"
+ @querySessionDetail="querySessionDetail"
+ @changeAgentType="changeAgentType"
+ ></smartAi>
</div>
</a-col>
</a-row>
@@ -154,7 +207,16 @@
IconTiktokColor
} from "@arco-design/web-vue/es/icon";
import { useAppStore, useUserStore } from "@/store";
-import { computed, nextTick, onMounted, watch, reactive, ref, onBeforeMount, onBeforeUnmount } from "vue";
+import {
+ computed,
+ nextTick,
+ onMounted,
+ watch,
+ reactive,
+ ref,
+ onBeforeMount,
+ onBeforeUnmount
+} from "vue";
import { Message } from "@arco-design/web-vue";
import { EventSourceParserStream } from "eventsource-parser/stream";
@@ -170,12 +232,12 @@
chatApi,
getDialogListApi,
getSessionDetailsApi,
- sessionListApi
+ sessionListApi, uploadWithoutKb
} from "@/api/session";
import { getAuthorization } from "@/utils/auth";
import { queryCanvasList } from "@/api/Agent";
import { getAgentSessionDetailsApi } from "@/api/agentSession";
-
+import useClipboard from "vue-clipboard3";
const sessionDetailList = ref([]); //鏍规嵁浼氳瘽id鍑烘潵鐨勪細璇濊鎯�
const sessionList = ref([]); //浼氳瘽鍒楄〃
const modalObj = reactive({ add: false });
@@ -184,7 +246,8 @@
const loading = ref(false);
const agentType = ref("1");
const agentTitle = ref("鏈懡鍚嶄細璇�");
-
+let chatObj = reactive({});
+const isStopChat = ref(false)
const currIndex = ref(0);
const displayedText = ref(""); // 姝ｅ湪鏄剧ず鐨勬枃瀛�
let timer: number | null = null;
@@ -198,6 +261,50 @@
const agentList = ref([]);
const selectValue = ref("");
const sectionList = ref({});
+const uploadList = ref([]);
+const uploadRef = ref();
+const files = ref([]);
+
+const { toClipboard } = useClipboard();
+const copy = async (text) => {
+ await toClipboard(text); //鍙傛暟涓鸿澶嶅埗鐨勬枃鏈�
+}
+
+const onChange = (fileList) => {
+ // files.value = fileList;
+};
+
+const submitOne = (e) => {
+ e.stopPropagation();
+ console.log(files.value);
+ uploadRef.value.submit(files.value.find((x) => x.status === 'init'));
+};
+// 涓婁紶鏂囦欢
+const customRequest = async(option) => {
+ const {onProgress, onError, onSuccess, fileItem, name} = option
+
+ const { code, data } = await getSessionDetailsApi(activeSessionId.value);
+ if (code === 200) {
+ console.log(data, "璇︽儏");
+ if (fileItem.file) {
+ const formData = new FormData();
+ formData.append('file', fileItem.file);
+ formData.append('conversation_id', data.dialog_id);
+ uploadWithoutKb(formData).then((res) => {
+ console.log(res);
+ uploadList.value = [];
+ if (res.code == 0) {
+ console.log(res);
+
+ }
+ });
+ }
+ }
+
+}
+
+
+
const DialogList = async () => {
const { code, data } = await getDialogListApi();
if (code === 200) {
@@ -236,18 +343,19 @@
// }
//鏂板缓浼氳瘽
createSession(dialogs.value[0].id);
-
-
} catch (err) {
// you can report use errorHandler or other
} finally {
}
};
// 鏂板缓浼氳瘽
-const createSession = async (id) => {
+const createSession = async (id, name = "鏈懡鍚嶄細璇�") => {
+ // 濡傛灉鏈変細璇漣d
+ console.log(name, "鏂板缓浼氳瘽鍚嶇О");
+
const res = await addSessionApi({
dialog_id: id,
- conversation_desc: "鏈懡鍚嶄細璇�"
+ conversation_desc: name
});
// console.log(res, "res");
if (res.code == 200) {
@@ -257,9 +365,7 @@
} else {
Message.error("鍒涘缓浼氳瘽澶辫触锛岃閲嶈瘯");
}
-
};
-
const handleShiftEnter = (event) => {
event.preventDefault();
@@ -276,18 +382,26 @@
});
console.log(dialogObj.type, "dialogObj");
if (dialogObj.type == 1) {
- agentType.value = 1;
+ agentType.value = '1';
querySessionList();
} else {
- agentType.value = 2;
+ agentType.value = '2';
queryAgentSessionList();
}
// querySessionList();
};
+
+// 鍙戦��
const sentClick = () => {
sendMessage("click");
};
+// 閲嶆柊鐢熸垚
+const reGenerate = () => {
+ let inputContent = sessionDetailList.value[sessionDetailList.value.length-2].content
+ startChat(inputContent)
+};
+
const sendMessage = async (event) => {
if (event.keyCode == 13 || event === "click") {
if (!event.shiftKey) {
@@ -296,97 +410,146 @@
event.preventDefault(); // 闃绘榛樿琛屼负锛屽嵆涓嶆崲琛�
}
- chatDis.value = true;
- loading.value = true;
- if (!activeSessionId.value) {
- Message.warning("璇烽�夋嫨浼氳瘽");
- chatDis.value = false;
- loading.value = false;
- return;
- }
+
+ // if (!activeSessionId.value) {
+ // Message.warning("璇烽�夋嫨浼氳瘽");
+ // chatDis.value = false;
+ // loading.value = false;
+ // return;
+ // }
// if (displayedText.value) {
// querySessionList();
// }
if (inputMsg.value) {
- sessionDetailList.value.push({
- content: inputMsg.value,
- role: "user"
- });
- sessionDetailList.value.push({ role: "last" });
- refreshScroll();
- const response = await fetch(
- "/api/tech/cloudminds/query?modeltype=localragflow",
- {
- method: "POST",
- headers: {
- "Authorization": getAuthorization(),
- "Content-Type": "application/json"
- },
- body: JSON.stringify({
- conversation_id: activeSessionId.value,
- messages: inputMsg.value
- })
- }
- );
- const reader = response?.body
- ?.pipeThrough(new TextDecoderStream())
- .pipeThrough(new EventSourceParserStream())
- .getReader();
- currIndex.value = 0;
- while (true) {
- const x = await reader?.read();
- if (x) {
- const { done, value } = x;
- console.log(x, 999);
- try {
- const val = JSON.parse(value?.data || "");
- const d = val?.data;
- if (typeof d !== "boolean") {
- console.info("data:", d);
- streamStr.value = d.content;
- startDisplayStr();
- }
- } catch (e) {
- console.warn(e);
- }
- if (done) {
- console.info("done");
- displayedText.value = "";
- queryNewSessionDetail(activeSessionId.value);
- break;
- }
- }
- }
- // querySessionList();
- chatDis.value = false;
- loading.value = false;
+ startChat(inputMsg.value)
+
inputMsg.value = "";
} else {
Message.warning("娑堟伅涓嶈兘涓虹┖");
- chatDis.value = false;
- loading.value = false;
}
}
}
};
+const startChat = async(valMsg)=>{
+ chatDis.value = true;
+ loading.value = true;
+ sessionDetailList.value.push({
+ content: valMsg,
+ role: "user"
+ });
+ sessionDetailList.value.push({ role: "last" });
+ refreshScroll();
+ const response = await fetch(
+ "/api/tech/cloudminds/query?modeltype=localragflow",
+ {
+ method: "POST",
+ headers: {
+ "Authorization": getAuthorization(),
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify({
+ conversation_id: activeSessionId.value,
+ messages: valMsg
+ })
+ }
+ );
+
+ const reader = response?.body
+ ?.pipeThrough(new TextDecoderStream())
+ .pipeThrough(new EventSourceParserStream())
+ .getReader();
+ currIndex.value = 0;
+ while (true) {
+ const x = await reader?.read();
+ if (x) {
+ const { done, value } = x;
+ // console.log(x, 999);
+ try {
+ const val = JSON.parse(value?.data || "");
+ const d = val?.data;
+ if (typeof d !== "boolean") {
+ // console.info("data:", d);
+ streamStr.value = d.content;
+ startDisplayStr();
+ }
+ } catch (e) {
+ console.warn(e);
+ }
+ if (done) {
+ console.info("done");
+ displayedText.value = "";
+ // if(!isStopChat.value){
+ // queryNewSessionDetail(activeSessionId.value);
+ // }
+ queryNewSessionDetail(activeSessionId.value);
+ EventBus.emit("queryAppUsageList");
+ break;
+ }
+ }
+ }
+ // querySessionList();
+ chatDis.value = false;
+ loading.value = false;
+}
+
+const stopChat=async()=>{
+ // const { code, data } = await stopChatApi(activeSessionId.value);
+ // if (code === 200) {
+ // Message.success("宸插仠姝�");
+ // queryNewSessionDetail(activeSessionId.value);
+ // }
+ isStopChat.value = true;
+ console.log('stopChat');
+ console.log(displayedText.value, 'displayedText');
+ console.log(sessionDetailList.value, 'sessionDetailList');
+ let inputText = sessionDetailList.value[sessionDetailList.value.length-2].content
+ // 鏁扮粍鍚堝苟
+ let lastArr = [{
+ content: inputText,
+ role: "user"
+ },{
+ content: displayedText.value,
+ role: "assistant"
+ }]
+ sessionDetailList.value = sessionDetailList.value.splice(0, sessionDetailList.value.length-2).concat(lastArr);
+ console.log(sessionDetailList.value, 'sessionDetailList2');
+ console.log(chatObj, 'chatObj瀵硅薄');
+ chatObj.message = chatObj.message.concat(lastArr);
+ // clearTimeout(timer!);
+ // timer = null;
+ // const { code, data } = await addSessionApi(chatObj);
+ // if (data) {
+ // //鍋滄瀹氭椂鍣�
+ // clearTimeout(timer!);
+ // timer = null;
+ // displayedText.value = "";
+ // queryNewSessionDetail(activeSessionId.value);
+ // }
+
+
+}
+
const queryNewSessionDetail = async (id) => {
activeSessionId.value = id;
const { code, data } = await getSessionDetailsApi(id);
if (code === 200) {
+ console.log(data, "鏂板缓浼氳瘽璇︽儏");
+ Object.assign(chatObj, data);
sessionDetailList.value = data.message;
agentTitle.value = data.name;
refreshScroll(); //鍒锋柊婊氬姩鏉′綅缃�
+ isStopChat.value = false;
}
};
-const changeAgentType = (val,session) => {
+const changeAgentType = (val, session) => {
agentType.value = val;
console.log(val, "val");
-}
+};
const querySessionDetail = async (session) => {
sectionList.value = session;
@@ -442,12 +605,12 @@
onBeforeMount(() => {
// DialogList();
//鏂板缓浼氳瘽
- createSession('');
+ createSession("");
});
onMounted(() => {
EventBus.on("newChat", () => {
- agentType.value = 1;
- createSession('');
+ agentType.value = "1";
+ createSession("");
});
});
onBeforeUnmount(() => {
@@ -515,8 +678,8 @@
.left {
/* height: calc(100vh - 160px);
- overflow-y: auto;
- overflow-x: hidden;*/
+ overflow-y: auto;
+ overflow-x: hidden;*/
border: 0px;
.left-list {
@@ -634,7 +797,8 @@
.chat_bottom {
display: flex;
align-items: center;
-
+ width: 78%;
+ margin: 0 auto;
.center-bottom {
// position: absolute;
// width: 90%;
@@ -656,7 +820,7 @@
.btn-send {
position: absolute !important;
right: 10px;
- bottom: 10px;
+ top: 110px;
z-index: 10;
}
@@ -739,6 +903,7 @@
}
}
}
+
.header___lEPyH {
width: 100%;
height: 46px;
@@ -748,6 +913,7 @@
align-items: center;
justify-content: center;
-webkit-backdrop-filter: blur(15px);
+
.chatHeaderBox {
width: auto;
border-radius: 8px;
@@ -755,6 +921,31 @@
transition: all var(--animation-duration) var(--animation-transition);
display: flex;
align-items: flex-end;
+ overflow: hidden; /* 闅愯棌瓒呭嚭鐨勫唴瀹� */
+ text-overflow: ellipsis; /* 浣跨敤鐪佺暐鍙锋潵浠ｆ浛琚殣钘忕殑鏂囧瓧 */
+ white-space: nowrap; /* 涓嶆崲琛岋紝浣垮唴瀹瑰湪涓�琛屽唴鏄剧ず */
+ max-width: 200px;
+
+ .title {
+ color: var(--color-text-1);
+ font-size: 12px;
+ }
}
}
+
+.action {
+ cursor: pointer;
+ display: inline-block;
+ padding: 0 10px;
+ color: var(--color-text-1);
+ line-height: 24px;
+ background: transparent;
+ border-radius: 2px;
+ cursor: pointer;
+ transition: all 0.1s ease;
+ font-size: 12px;
+}
+.action:hover {
+ background: var(--color-fill-3);
+}
</style>
--
Gitblit v1.8.0