A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
fix(chat): implement HTML rendering for display content
LinkinStars0db88d63e304
diff --git a/ui/src/components/BubbleAi/index.tsx b/ui/src/components/BubbleAi/index.tsxindex 453a61c5..1e79ca7c 100644--- a/ui/src/components/BubbleAi/index.tsx+++ b/ui/src/components/BubbleAi/index.tsx@@ -21,10 +21,9 @@ import { FC, useEffect, useState, useRef } from 'react';import { Button } from 'react-bootstrap';import { useTranslation } from 'react-i18next';-import { marked } from 'marked';import copy from 'copy-to-clipboard';-import { voteConversation } from '@/services';+import { markdownToHtml, voteConversation } from '@/services';import { Icon, htmlRender } from '@/components';interface IProps {@@ -40,6 +39,17 @@ interface IProps {};}+const escapeHtml = (text: string) =>+ text+ .replace(/&/g, '&')+ .replace(/</g, '<')+ .replace(/>/g, '>')+ .replace(/"/g, '"')+ .replace(/'/g, ''');++const renderPlainTextAsHtml = (text: string) =>+ escapeHtml(text).replace(/\r?\n/g, '<br />');+const BubbleAi: FC<IProps> = ({canType = false,isLast,@@ -55,6 +65,7 @@ const BubbleAi: FC<IProps> = ({const [isHelpful, setIsHelpful] = useState(false);const [isUnhelpful, setIsUnhelpful] = useState(false);const [canShowAction, setCanShowAction] = useState(false);+ const [safeHtml, setSafeHtml] = useState('');const typewriterRef = useRef<{timer: NodeJS.Timeout | null;index: number;@@ -64,6 +75,8 @@ const BubbleAi: FC<IProps> = ({index: 0,isTyping: false,});+ const renderTimerRef = useRef<NodeJS.Timeout | null>(null);+ const renderTaskRef = useRef(0);const fmtContainer = useRef<HTMLDivElement>(null);// add ref for ScrollIntoViewconst containerRef = useRef<HTMLDivElement>(null);@@ -194,13 +207,56 @@ const BubbleAi: FC<IProps> = ({};}, [content, isCompleted]);+ useEffect(() => {+ if (renderTimerRef.current) {+ clearTimeout(renderTimerRef.current);+ renderTimerRef.current = null;+ }+ renderTaskRef.current += 1;+ const currentRenderTask = renderTaskRef.current;++ if (!displayContent) {+ setSafeHtml('');+ return undefined;+ }++ // During streaming, render escaped plain text to avoid executing unsanitized HTML.+ if (!isCompleted) {+ setSafeHtml(renderPlainTextAsHtml(displayContent));+ return undefined;+ }++ renderTimerRef.current = setTimeout(() => {+ markdownToHtml(displayContent)+ .then((resp) => {+ if (renderTaskRef.current !== currentRenderTask) {+ return;+ }+ setSafeHtml(resp || renderPlainTextAsHtml(displayContent));+ })+ .catch(() => {+ if (renderTaskRef.current !== currentRenderTask) {+ return;+ }+ setSafeHtml(renderPlainTextAsHtml(displayContent));+ });+ }, 0);++ return () => {+ if (renderTimerRef.current) {+ clearTimeout(renderTimerRef.current);+ renderTimerRef.current = null;+ }+ };+ }, [displayContent, isCompleted]);+useEffect(() => {setIsHelpful(actionData.helpful > 0);setIsUnhelpful(actionData.unhelpful > 0);}, [actionData]);useEffect(() => {- if (fmtContainer.current && isCompleted) {+ if (fmtContainer.current && isCompleted && safeHtml) {htmlRender(fmtContainer.current, {copySuccessText: t('copied', { keyPrefix: 'messages' }),copyText: t('copy', { keyPrefix: 'messages' }),@@ -211,7 +267,7 @@ const BubbleAi: FC<IProps> = ({});setCanShowAction(true);}- }, [isCompleted, fmtContainer.current]);+ }, [isCompleted, safeHtml, t]);return (<div@@ -223,7 +279,7 @@ const BubbleAi: FC<IProps> = ({className="fmt text-break text-wrap"ref={fmtContainer}style={{ transition: 'all 0.2s ease' }}- dangerouslySetInnerHTML={{ __html: marked.parse(displayContent) }}+ dangerouslySetInnerHTML={{ __html: safeHtml }}/>{canShowAction && (diff --git a/ui/src/pages/AiAssistant/index.tsx b/ui/src/pages/AiAssistant/index.tsxindex e2329f85..83ffe8f1 100644--- a/ui/src/pages/AiAssistant/index.tsx+++ b/ui/src/pages/AiAssistant/index.tsx@@ -328,7 +328,7 @@ const Index = () => {canType={isGenerate && isLastMessage}chatId={item.chat_completion_id}isLast={isLastMessage}- isCompleted={!isGenerate}+ isCompleted={!isGenerate || !isLastMessage}content={item.content}actionData={{helpful: item.helpful,diff --git a/ui/src/pages/Search/components/AiCard/index.tsx b/ui/src/pages/Search/components/AiCard/index.tsxindex 2da5cb91..99e21adc 100644--- a/ui/src/pages/Search/components/AiCard/index.tsx+++ b/ui/src/pages/Search/components/AiCard/index.tsx@@ -149,10 +149,10 @@ const Index = () => {<BubbleUser content={item.content} />) : (<BubbleAi- canType+ canType={isGenerate && isLastMessage}chatId={item.chat_completion_id}- isLast- isCompleted={!isGenerate}+ isLast={isLastMessage}+ isCompleted={!isGenerate || !isLastMessage}content={item.content}actionData={{helpful: item.helpful,