Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-05 04:19:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: prevent overriding block status on aborting (#5547)

Browse Source
This commit is contained in:
one 2025-04-30 20:15:13 +08:00 committed by GitHub
parent 49658c6437
commit 28ec990100
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/renderer/src/store/thunk/messageThunk.ts
View File

@ -119,7 +119,11 @@ const throttledBlockUpdate = throttle((id, blockUpdate) => {
const state = store.getState() const state = store.getState()
const block = state.messageBlocks.entities[id] const block = state.messageBlocks.entities[id]
// throttle是异步函数,可能会在complete事件触发后才执行 // throttle是异步函数,可能会在complete事件触发后才执行
if (blockUpdate.status === MessageBlockStatus.STREAMING && block?.status === MessageBlockStatus.SUCCESS) return if (
blockUpdate.status === MessageBlockStatus.STREAMING &&
(block?.status === MessageBlockStatus.SUCCESS || block?.status === MessageBlockStatus.ERROR)
)
return
store.dispatch(updateOneBlock({ id, changes: blockUpdate })) store.dispatch(updateOneBlock({ id, changes: blockUpdate }))
}, 150) }, 150)
@ -135,7 +139,11 @@ export const throttledBlockDbUpdate = throttle(
const state = store.getState() const state = store.getState()
const block = state.messageBlocks.entities[blockId] const block = state.messageBlocks.entities[blockId]
// throttle是异步函数,可能会在complete事件触发后才执行 // throttle是异步函数,可能会在complete事件触发后才执行
if (blockChanges.status === MessageBlockStatus.STREAMING && block?.status === MessageBlockStatus.SUCCESS) return if (
blockChanges.status === MessageBlockStatus.STREAMING &&
(block?.status === MessageBlockStatus.SUCCESS || block?.status === MessageBlockStatus.ERROR)
)
return
console.log(`[DB Throttle Block Update] Updating block ${blockId} with changes:`, blockChanges) console.log(`[DB Throttle Block Update] Updating block ${blockId} with changes:`, blockChanges)
try { try {
await db.message_blocks.update(blockId, blockChanges) await db.message_blocks.update(blockId, blockChanges)