diff --git a/src/store/conversation.ts b/src/store/conversation.ts index 5eb34263428c9e0e92f33941950c47d1570c5b9b..a28a27e618329ec8082624b9150a315c2335b818 100644 --- a/src/store/conversation.ts +++ b/src/store/conversation.ts @@ -66,7 +66,7 @@ export const useSessionStore = defineStore('conversation', () => { // ai回复是否还在生成中 const isAnswerGenerating = ref(false); - const currentTaskId = ref(null); + const currentTaskId = ref(null); // 方法集合 - 用于处理不同类型的event message const dataTransfers = { @@ -181,7 +181,7 @@ export const useSessionStore = defineStore('conversation', () => { progress: messageFlow.stepProgress, status: currentTaskId.value ? messageFlow.flowStatus : 'success', display: true, - taskId: currentTaskId.value, + taskId: currentTaskId.value || undefined, data: conversationItem.flowdata.data, }; } else { @@ -220,7 +220,9 @@ export const useSessionStore = defineStore('conversation', () => { id: flow.stepId, title: flow.stepName, status: flow.stepStatus, - taskId: currentTaskId, + taskId: currentTaskId.value || undefined, + display: true, + progress: flow.stepProgress || '', data: { exData: content, }, @@ -240,7 +242,9 @@ export const useSessionStore = defineStore('conversation', () => { id: flow.stepId, title: flow.stepName, status: flow.stepStatus, - taskId: currentTaskId, + taskId: currentTaskId.value || undefined, + display: true, + progress: flow.stepProgress || '', data: { exParam: content, }, @@ -315,7 +319,6 @@ export const useSessionStore = defineStore('conversation', () => { if ('metadata' in message) { conversationItem.metadata = message.metadata; } - currentTaskId.value = message.taskId; if ('event' in message) { switch (eventType) { case 'text.add': @@ -335,7 +338,8 @@ export const useSessionStore = defineStore('conversation', () => { dataTransfers.suggestionFunc(conversationItem, message); break; case 'init': - //初始化获取 metadata + //初始化获取 metadata 和 taskId + currentTaskId.value = message.taskId || message.id; conversationItem.metadata = message.metadata; conversationItem.createdAt = message.content.createdAt; conversationItem.groupId = message.groupId; @@ -738,7 +742,7 @@ export const useSessionStore = defineStore('conversation', () => { targetItem.message[0] += '暂停生成'; targetItem.isFinish = true; cancel(); - const resp = await api.stopGeneration(currentMessage.value.taskId); + const resp = await api.stopGeneration(currentTaskId.value || ''); if (resp?.[1]?.code === 200) { isAnswerGenerating.value = false; } @@ -930,7 +934,7 @@ export const useSessionStore = defineStore('conversation', () => { ] as RobotConversationItem ).isFinish = true; cancel(); - const resp = await api.stopGeneration(currentMessage.value.taskId); + const resp = await api.stopGeneration(currentTaskId.value || ''); if (resp?.[1]?.code === 200) { isAnswerGenerating.value = false; } diff --git a/src/store/historySession.ts b/src/store/historySession.ts index 7e1aeadeca90f0eb23da34277f2a79dc2f3dd750..9068c8fb9f0f1670aa79e83882c98e889fe10e24 100644 --- a/src/store/historySession.ts +++ b/src/store/historySession.ts @@ -211,12 +211,6 @@ export const useHistorySessionStore = defineStore( historySession.value = allConversations.filter((item) => { const itemAppId = item.appId || ''; const matches = itemAppId === currentAppId; - console.log('🔍 [getHistorySession] 对话过滤:', { - conversationId: item.conversationId, - itemAppId, - currentAppId, - matches - }); return matches; }); diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue index 791a51e923be03b9019a1288a919cee9113c0921..896642bb6cb7b113c4469be442fd5fe48b412989 100644 --- a/src/views/chat/index.vue +++ b/src/views/chat/index.vue @@ -154,7 +154,7 @@ function useStream() { // 2. 然后调用后端停止接口,清理后端连接 try { - const [, res] = await api.stopGeneration() + const [, res] = await api.stopGeneration('') if (res && res.code === 200) { // 后端停止成功 } @@ -250,14 +250,16 @@ async function onSend(q: string) { }; const conversationId = localStorage.getItem('conversationId') || ''; if (!conversationId) { - await api.createSession(p).then((res) => { - localStorage.setItem('conversationId', res[1].result.conversationId); + const res = await api.createSession(p); + if (res?.[1]?.result?.conversationId) { + const newConversationId = res[1].result.conversationId; + localStorage.setItem('conversationId', newConversationId); queryStream( q, - res[1].result.conversationId, + newConversationId, language.value as 'zh' | 'en', ); - }); + } } else { queryStream(q, conversationId, language.value as 'zh' | 'en'); } diff --git a/src/views/createapp/components/AgentAppConfig.vue b/src/views/createapp/components/AgentAppConfig.vue index 0970864978ebb6886712055f42e53e8a7af99d00..c545609aa754b72d7931a8233ec869376bd9a9c1 100644 --- a/src/views/createapp/components/AgentAppConfig.vue +++ b/src/views/createapp/components/AgentAppConfig.vue @@ -677,7 +677,6 @@ onMounted(async () => { flex: 1; display: flex; flex-direction: column; - gap: 8px; .preview-title { line-height: 24px; diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue index 2031780f4c691c8a2fe82c729f4622f482a23487..5c4c9f18b852cc363e00cc4c58c881b608e1b3e9 100644 --- a/src/views/createapp/components/workFlow.vue +++ b/src/views/createapp/components/workFlow.vue @@ -1,6 +1,6 @@