fix: 解决生成过程中出现错误内容被清空覆盖问题
This commit is contained in:
parent
5a00bdcbc6
commit
7bd644451b
@ -1,4 +1,5 @@
|
||||
import { Message } from '@renderer/types'
|
||||
import { formatErrorMessage } from '@renderer/utils/error'
|
||||
import { Alert as AntdAlert } from 'antd'
|
||||
import { FC } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
@ -8,8 +9,16 @@ import Markdown from '../Markdown/Markdown'
|
||||
const MessageError: FC<{ message: Message }> = ({ message }) => {
|
||||
return (
|
||||
<>
|
||||
<MessageErrorInfo message={message} />
|
||||
<Markdown message={message} />
|
||||
{message.error && (
|
||||
<Markdown
|
||||
message={{
|
||||
...message,
|
||||
content: formatErrorMessage(message.error)
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<MessageErrorInfo message={message} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@ -27,7 +36,7 @@ const MessageErrorInfo: FC<{ message: Message }> = ({ message }) => {
|
||||
}
|
||||
|
||||
const Alert = styled(AntdAlert)`
|
||||
margin-bottom: 15px;
|
||||
margin: 15px 0 8px;
|
||||
padding: 10px;
|
||||
font-size: 12px;
|
||||
`
|
||||
|
||||
@ -2,7 +2,7 @@ import i18n from '@renderer/i18n'
|
||||
import store from '@renderer/store'
|
||||
import { setGenerating } from '@renderer/store/runtime'
|
||||
import { Assistant, Message, Model, Provider, Suggestion } from '@renderer/types'
|
||||
import { formatErrorMessage, formatMessageError } from '@renderer/utils/error'
|
||||
import { formatMessageError } from '@renderer/utils/error'
|
||||
import { isEmpty } from 'lodash'
|
||||
|
||||
import AiProvider from '../providers/AiProvider'
|
||||
@ -94,7 +94,6 @@ export async function fetchChatCompletion({
|
||||
}
|
||||
} catch (error: any) {
|
||||
message.status = 'error'
|
||||
message.content = formatErrorMessage(error)
|
||||
message.error = formatMessageError(error)
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user