From 89781e8f9bc49ccbf9c3ede426f9237dfa2faa0c Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期四, 15 八月 2024 09:36:20 +0800
Subject: [PATCH] fix: 修改新建会话判断条件，模型页面调整
---
src/views/sessionManager/index.vue | 292 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 203 insertions(+), 89 deletions(-)
diff --git a/src/views/sessionManager/index.vue b/src/views/sessionManager/index.vue
index bc1456f..8243092 100644
--- a/src/views/sessionManager/index.vue
+++ b/src/views/sessionManager/index.vue
@@ -49,7 +49,7 @@
@click="querySessionDetail(session)"
:class="{ isLeftActive: activeSessionId === session.id }"
>
- <div class="text" :class="{ light: theme === 'dark' }"
+ <div class="text" :class="{ time: theme === 'dark' }"
>{{ session.name }}
</div>
<div class="time"
@@ -63,9 +63,10 @@
</a-scrollbar>
</a-card>
</a-col>
- <a-col :span="18">
+ <!-- 鏅鸿兘浣撲細璇�-->
+ <a-col :span="18" v-show="agentType == '1'">
<a-card class="center">
- <div
+ <!-- <div
v-if="sessionDetailList.length === 0"
style="
width: 90%;
@@ -140,16 +141,15 @@
</div>
</a-col>
</a-row>
- </div>
+ </div> -->
<a-scrollbar
ref="scrollbar"
id="home"
- v-else
class="chat-list"
style="
width: 90%;
overflow: auto;
- height: 65vh;
+ height: calc(100vh - 380px);
margin: 0px auto 20px;
"
>
@@ -158,12 +158,12 @@
<template #avatar>
<img
class="icon-user-jpg"
- src="../../../assets/images/icon-user.jpg"
+ src="../../assets/images/icon-user.jpg"
alt="鏈湴鍥剧墖"
/>
</template>
<template #content>
- <div class="chart-user-text"
+ <div :class="{ chartUserText: theme === 'light' }"
>{{ sessionDetail.content }}
</div>
</template>
@@ -172,12 +172,12 @@
<template #avatar>
<img
class="icon-user-jpg"
- src="../../../assets/images/icon-chart.png"
+ src="../../assets/images/icon-chart.png"
alt="鏈湴鍥剧墖"
/>
</template>
<template #content>
- <a-card class="chat-item-answer">
+ <a-card :class="{ chatItemAnswer: theme === 'light' }">
<div :class="{ light: theme === 'light' }"
>{{ sessionDetail.content }}
</div>
@@ -188,7 +188,7 @@
<template #avatar>
<img
class="icon-user-jpg"
- src="../../../assets/images/icon-chart.png"
+ src="../../assets/images/icon-chart.png"
alt="鏈湴鍥剧墖"
/>
</template>
@@ -197,7 +197,7 @@
readonly
auto-size
v-model="displayedText"
- class="chat-item-answer"
+ :class="{ chatItemAnswer: theme === 'light' }"
>
</a-textarea>
</template>
@@ -222,11 +222,13 @@
</a-textarea> -->
<a-textarea
v-model="inputMsg"
+ @keydown.shift.enter="handleShiftEnter"
@keydown.enter="sendMessage"
placeholder="杈撳叆鎮ㄦ兂浜嗚В鐨勫唴瀹癸紝Shift+Enter鎹㈣锛孍nter鍙戦��"
allow-clear
show-word-limit
:disabled="chatDis"
+ :class="{ textItemAnswer: theme === 'dark' }"
:auto-size="{
minRows: 12,
maxRows: 5,
@@ -248,6 +250,12 @@
</div>
</a-card>
</a-col>
+ <a-col :span="18" v-show="agentType == '2'">
+ <a-card class="center">
+ <agentSession :modalObj="agentObj"></agentSession>
+ </a-card>
+ </a-col>
+
<!-- <a-col :span="5">
<a-card class="right">
<div class="right-top">
@@ -317,12 +325,14 @@
IconSearch,
IconTiktokColor,
} from '@arco-design/web-vue/es/icon';
- import { useAppStore } from '@/store';
- import { computed, nextTick, onMounted, reactive, ref } from 'vue';
+ import { useAppStore, useUserStore } from '@/store';
+ import { computed, nextTick, onMounted, watch, reactive, ref } from 'vue';
+
import { Message } from '@arco-design/web-vue';
import { EventSourceParserStream } from 'eventsource-parser/stream';
import moment from 'moment';
import AddSession from '@/views/sessionManager/components/addSession.vue';
+ import agentSession from '@/views/sessionManager/components/agentSession.vue';
import {
chatApi,
getDialogListApi,
@@ -330,6 +340,8 @@
sessionListApi,
} from '@/api/session';
import { getAuthorization } from '@/utils/auth';
+ import { queryCanvasList } from '@/api/Agent';
+ import { getAgentSessionDetailsApi } from '@/api/agentSession';
const sessionDetailList = ref([]); //鏍规嵁浼氳瘽id鍑烘潵鐨勪細璇濊鎯�
const sessionList = ref([]); //浼氳瘽鍒楄〃
@@ -337,6 +349,7 @@
const dialogId = ref('');
const chatDis = ref(false);
const loading = ref(false);
+ const agentType = ref('1');
const currIndex = ref(0);
const displayedText = ref(''); // 姝ｅ湪鏄剧ず鐨勬枃瀛�
@@ -346,6 +359,9 @@
const activeSessionId = ref('');
const fieldNames = { value: 'id', label: 'name' };
const dialogs = ref([]);
+ const dialogObj = reactive({});
+ const agentObj = reactive({});
+ const agentList = ref([]);
const selectValue = ref('');
const sectionList = ref({});
const DialogList = async () => {
@@ -353,88 +369,153 @@
if (code === 200) {
if (data) {
selectValue.value = data[0].id;
- dialogs.value = data;
- querySessionList();
+ dialogs.value = data.map((item) => {
+ return {
+ ...item,
+ type: 1, //鏅鸿兘浣�
+ };
+ });
+ console.log(data, 'dialogs');
+ queryCanvas();
+ // querySessionList();
}
}
+ };
+
+ const queryCanvas = async (params = {}) => {
+ try {
+ const { data } = await queryCanvasList(params);
+ console.log(data, 'agent');
+ agentList.value = data.map((item) => {
+ return {
+ ...item,
+ name: item.title,
+ type: 2, //agent
+ };
+ });
+ // 鍚堝苟鏁扮粍
+ dialogs.value = dialogs.value.concat(agentList.value);
+
+ // 鍒ゆ柇褰撳墠鏄櫤鑳戒綋鎴朼gent
+ // console.log(val, 'val');
+ if (dialogs.value.length > 0) {
+ dialogChange(dialogs.value[0].id);
+ }
+ } catch (err) {
+ // you can report use errorHandler or other
+ } finally {
+ }
+ };
+
+ const handleShiftEnter = (event) => {
+ event.preventDefault();
+ inputMsg.value += '\n';
};
const dialogChange = (val) => {
+ // 鍒ゆ柇褰撳墠鏄櫤鑳戒綋鎴朼gent
+ // console.log(val, 'val');
dialogId.value = val;
- querySessionList();
- };
- const sentClick = (event) => {
- sendMessage(event);
- };
- const sendMessage = async (event) => {
- event.preventDefault();
- chatDis.value = true;
- loading.value = true;
- if (!activeSessionId.value) {
- Message.warning('璇烽�夋嫨浼氳瘽');
- chatDis.value = false;
- loading.value = false;
- return;
+ dialogs.value.forEach((item) => {
+ if (item.id === val) {
+ Object.assign(dialogObj, item);
+ }
+ });
+ console.log(dialogObj.type, 'dialogObj');
+ if (dialogObj.type == 1) {
+ agentType.value = 1;
+ querySessionList();
+ } else {
+ agentType.value = 2;
+ queryAgentSessionList();
}
- // 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,
- }),
+ // querySessionList();
+ };
+ const sentClick = () => {
+ sendMessage('click');
+ };
+ const sendMessage = async (event) => {
+ if (event.keyCode == 13 || event === 'click') {
+ if (!event.shiftKey) {
+ //鍙湁enter娌℃湁shift锛屾垨杩涜浣犵殑鍏朵粬閫昏緫
+ if (event !== 'click') {
+ event.preventDefault(); // 闃绘榛樿琛屼负锛屽嵆涓嶆崲琛�
}
- );
- 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();
+ chatDis.value = true;
+ loading.value = true;
+ 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,
+ }),
}
- } catch (e) {
- console.warn(e);
+ );
+
+ 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 = '';
+ querySessionDetail(sectionList.value);
+ break;
+ }
+ }
}
- if (done) {
- console.info('done');
- displayedText.value = '';
- querySessionDetail(sectionList.value);
- break;
- }
+ querySessionList();
+ chatDis.value = false;
+ loading.value = false;
+ inputMsg.value = '';
+ } else {
+ Message.warning('娑堟伅涓嶈兘涓虹┖');
+ chatDis.value = false;
+ loading.value = false;
}
}
- chatDis.value = false;
- loading.value = false;
- inputMsg.value = '';
- } else {
- Message.warning('娑堟伅涓嶈兘涓虹┖');
- chatDis.value = false;
- loading.value = false;
}
};
const querySessionDetail = async (session) => {
@@ -444,6 +525,14 @@
if (code === 200) {
sessionDetailList.value = data.message;
refreshScroll(); //鍒锋柊婊氬姩鏉′綅缃�
+ }
+ };
+ const queryAgentSessionDetail = async (id) => {
+ const { code, data } = await getAgentSessionDetailsApi(id);
+ if (code == 0) {
+ Object.assign(agentObj, data);
+ // sessionDetailList.value = data.message;
+ // refreshScroll(); //鍒锋柊婊氬姩鏉′綅缃�
}
};
const scrollbar = ref(null);
@@ -464,6 +553,18 @@
Message.warning('鏌ヨ澶辫触');
}
};
+
+ // 鏌ヨ浼氳瘽鍒楄〃
+ const queryAgentSessionList = async () => {
+ // const { code, data } = await sessionListApi(selectValue.value);
+ // if (code === 200) {
+ //
+ // } else {
+ // Message.warning('鏌ヨ澶辫触');
+ // }
+ queryAgentSessionDetail(selectValue.value);
+ };
+
//鏂板浼氳瘽涔嬪悗鍒锋柊浼氳瘽鍒楄〃
const addSession = () => {
querySessionList();
@@ -471,10 +572,12 @@
onMounted(() => {
DialogList();
});
+
const appStore = useAppStore();
const theme = computed(() => {
return appStore.theme;
});
+
//鏂囧瓧鍔ㄦ�佽緭鍑�
const startDisplayStr = () => {
if (timer) {
@@ -528,8 +631,8 @@
.left {
/* height: calc(100vh - 160px);
- overflow-y: auto;
- overflow-x: hidden;*/
+ overflow-y: auto;
+ overflow-x: hidden;*/
border: 0px;
.left-list {
@@ -563,7 +666,7 @@
.card-btn-2 {
margin: 10px 10px;
}
- .chat-item-answer {
+ .chatItemAnswer {
box-sizing: border-box;
background: #f1f1f1;
border-radius: 14px;
@@ -572,6 +675,9 @@
background: #f1f1f1;
border-radius: 14px;
}
+ }
+ .textItemAnswer {
+ background-color: #373739;
}
.center {
@@ -647,22 +753,30 @@
flex-direction: column;
overflow: hidden;
position: relative;
+ // padding-top:10px;
:deep(.arco-textarea-wrapper) {
border-radius: 24px;
}
.btn-send {
position: absolute !important;
- right: 5px;
- bottom: 5px;
+ right: 10px;
+ bottom: 10px;
z-index: 10;
}
+ :deep(.arco-btn-size-large) {
+ height: 28px;
+ width: 60px;
+ }
+ }
+ :deep(.arco-textarea-wrapper) {
+ padding-top: 5px;
}
}
}
.chat-item {
padding: 10px 0;
- .chart-user-text {
+ .chartUserText {
font-weight: 600;
font-size: 14px;
color: #333;
--
Gitblit v1.8.0