adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/knowledgeBase_yjp' into develop

Browse Source
This commit is contained in:
yujiangping
2026-01-14 17:35:56 +08:00
parent 1afab9248b 7bbe56d20a
commit 167e6a0d11
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/components/Chat/ChatContent.tsx
View File

@@ -55,7 +55,7 @@ const ChatContent: FC<ChatContentProps> = ({
</div> </div>
} }
{/* 消息气泡框 */} {/* 消息气泡框 */}
<div className={clsx('rb:border rb:text-left rb:rounded-lg rb:mt-1.5 rb:leading-4.5 rb:p-[10px_12px_2px_12px] rb:inline-block rb:max-w-100 rb:wrap-break-word', contentClassNames, { <div className={clsx('rb:border rb:text-left rb:rounded-lg rb:mt-1.5 rb:leading-4.5 rb:p-[10px_12px_2px_12px] rb:inline-block rb:max-w-[520px] rb:wrap-break-word', contentClassNames, {
// 错误消息样式（内容为null且非助手消息） // 错误消息样式（内容为null且非助手消息）
'rb:border-[rgba(255,93,52,0.30)] rb:bg-[rgba(255,93,52,0.08)] rb:text-[#FF5D34]': errorDesc && item.role === 'assistant' && item.content === null, 'rb:border-[rgba(255,93,52,0.30)] rb:bg-[rgba(255,93,52,0.08)] rb:text-[#FF5D34]': errorDesc && item.role === 'assistant' && item.content === null,
// 助手消息样式 // 助手消息样式
@@ -68,7 +68,7 @@ const ChatContent: FC<ChatContentProps> = ({
</div> </div>
{/* 底部标签（如时间戳、用户名等） */} {/* 底部标签（如时间戳、用户名等） */}
{labelPosition === 'bottom' && {labelPosition === 'bottom' &&
<div className="rb:text-[#5B6167] rb:text-[12px] rb:leading-4 rb:font-regular"> <div className="rb:text-[#5B6167] rb:text-[12px] rb:leading-4 rb:font-regular rb:mt-2">
{labelFormat(item)} {labelFormat(item)}
</div> </div>
} }

6
web/src/views/Conversation/index.tsx
View File

@@ -259,9 +259,10 @@ const Conversation: FC = () => {
</div> </div>
<div className="rb:relative rb:h-screen rb:px-4 rb:flex-[1_1_auto]"> <div className="rb:relative rb:h-screen rb:px-4 rb:flex-[1_1_auto]">
<div className='rb:w-[760px] rb:h-screen rb:mx-auto rb:pt-10'>
<Chat <Chat
empty={<Empty url={AnalysisEmptyIcon} className="rb:h-full" subTitle={t('memoryConversation.emptyDesc')} />} empty={<Empty url={BgImg} className="rb:h-full" size={[320,180]} subTitle={t('memoryConversation.emptyDesc')} />}
contentClassName="rb:h-[calc(100%-152px)]" contentClassName="rb:h-[calc(100%-152px)] "
data={chatList} data={chatList}
streamLoading={streamLoading} streamLoading={streamLoading}
loading={loading} loading={loading}
@@ -290,6 +291,7 @@ const Conversation: FC = () => {
</Flex> </Flex>
</Form> </Form>
</Chat> </Chat>
</div>
</div> </div>
</Flex> </Flex>
) )