diff --git a/src/frontend/client/src/api/apps.ts b/src/frontend/client/src/api/apps.ts index 5ebbfc3dc..4faa754c1 100644 --- a/src/frontend/client/src/api/apps.ts +++ b/src/frontend/client/src/api/apps.ts @@ -110,7 +110,7 @@ export async function getChatHistoryApi(flowId: string, chatId: string, flowType return { ...other, category: _category, - chatKey: typeof message === 'string' ? undefined : Object.keys(message)[0], + chatKey: Number(flowType) === 5 ? 'input' : (typeof message === 'string' ? undefined : Object.keys(message)[0]), end: true, files: _files, isSend: _isSend, diff --git a/src/frontend/client/src/pages/appChat/ChatView.tsx b/src/frontend/client/src/pages/appChat/ChatView.tsx index 95b8e1d4c..75057413e 100644 --- a/src/frontend/client/src/pages/appChat/ChatView.tsx +++ b/src/frontend/client/src/pages/appChat/ChatView.tsx @@ -22,7 +22,9 @@ export default function ChatView({ data, v }) { {data.name} */} -
+
diff --git a/src/frontend/client/src/pages/appChat/appUtils/skillMethod.ts b/src/frontend/client/src/pages/appChat/appUtils/skillMethod.ts index 7028b612a..548269eec 100644 --- a/src/frontend/client/src/pages/appChat/appUtils/skillMethod.ts +++ b/src/frontend/client/src/pages/appChat/appUtils/skillMethod.ts @@ -144,7 +144,7 @@ export const SkillMethod = { } } else { if ((prevMessage - && prevMessage.message === newCurrentMessage.message + && prevMessage.message === newCurrentMessage.message && newCurrentMessage.end && prevMessage.thought === newCurrentMessage.thought) || cover) { const removedMsg = messages.pop() diff --git a/src/frontend/client/src/pages/appChat/index.tsx b/src/frontend/client/src/pages/appChat/index.tsx index a1911dc64..b676bfe41 100644 --- a/src/frontend/client/src/pages/appChat/index.tsx +++ b/src/frontend/client/src/pages/appChat/index.tsx @@ -36,8 +36,10 @@ export default function index() { const currentData = chats[cid] let error = '' + setChatId(cid!) // 切换会话 + // 无缓存,从新加载 - if (currentData) return setChatId(cid!); + if (currentData) return; const numericType = Number(type); @@ -111,7 +113,6 @@ export default function index() { } }) - setChatId(cid!) } useEffect(() => { diff --git a/src/frontend/client/src/pages/appChat/useChatHelpers.ts b/src/frontend/client/src/pages/appChat/useChatHelpers.ts index c81a9c670..f2546879a 100644 --- a/src/frontend/client/src/pages/appChat/useChatHelpers.ts +++ b/src/frontend/client/src/pages/appChat/useChatHelpers.ts @@ -146,7 +146,7 @@ export default function useChatHelpers() { is_bot, extra, liked, - message, + message: msg, receiver, type, source, @@ -171,14 +171,14 @@ export default function useChatHelpers() { file_url: el.file_url || el.url })), is_bot, - message, + message: msg, receiver, source, user_id, liked: !!liked, end: type === "over", sender: "", - node_id: message?.node_id || "", + node_id: msg?.node_id || "", create_time: formatDate(new Date(), "yyyy-MM-ddTHH:mm:ss"), extra, reasoning_log, diff --git a/src/frontend/client/src/pages/appChat/useWebsocket.ts b/src/frontend/client/src/pages/appChat/useWebsocket.ts index e9a4cf40c..1187b936a 100644 --- a/src/frontend/client/src/pages/appChat/useWebsocket.ts +++ b/src/frontend/client/src/pages/appChat/useWebsocket.ts @@ -56,6 +56,22 @@ export const useWebSocket = (helpers) => { data: { ...flow, ...data }, } ws?.send(JSON.stringify(msg)) + } else { + const msg = { + chatHistory: [], + chat_id: helpers.chatId, + flow_id: helpers.flow.id, + inputs: { + data: { + id: helpers.flow.id, + chatId: helpers.chatId, + type: helpers.flow.flow_type, + } + }, + name: helpers.flow.name, + description: helpers.flow.description + } + ws?.send(JSON.stringify(msg)) } }