AI/ragflow
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git synced 2025-08-13 23:05:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Fixed the issue where two consecutive indexes were displayed incorrectly #3839 (#3988)

Browse Source 
### What problem does this PR solve?

Fix: Fixed the issue where two consecutive indexes were displayed
incorrectly #3839

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
balibabu 2024-12-11 16:29:17 +08:00 committed by GitHub
parent 74c6b21f3b
commit 409acf0d9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/pages/chat/markdown-content/index.tsx
View File

@ -23,7 +23,7 @@ import 'katex/dist/katex.min.css'; // `rehype-katex` does not import the CSS for
import { replaceTextByOldReg } from '../utils'; import { replaceTextByOldReg } from '../utils';
import styles from './index.less'; import styles from './index.less';
const reg = /(#{2}\d+@{2})/g; const reg = /(~{2}\d+={2})/g;
const curReg = /(~{2}\d+\${2})/g; const curReg = /(~{2}\d+\${2})/g;
const getChunkIndex = (match: string) => Number(match.slice(2, -2)); const getChunkIndex = (match: string) => Number(match.slice(2, -2));
@ -47,7 +47,8 @@ const MarkdownContent = ({
if (text === '') { if (text === '') {
text = t('chat.searching'); text = t('chat.searching');
} }
return loading ? text?.concat('~~2$$') : text; const nextText = replaceTextByOldReg(text);
return loading ? nextText?.concat('~~2$$') : nextText;
}, [content, loading, t]); }, [content, loading, t]);
useEffect(() => { useEffect(() => {
@ -157,9 +158,7 @@ const MarkdownContent = ({
const renderReference = useCallback( const renderReference = useCallback(
(text: string) => { (text: string) => {
const nextText = replaceTextByOldReg(text); let replacedText = reactStringReplace(text, reg, (match, i) => {
let replacedText = reactStringReplace(nextText, reg, (match, i) => {
const chunkIndex = getChunkIndex(match); const chunkIndex = getChunkIndex(match);
return ( return (
<Popover content={getPopoverContent(chunkIndex)} key={i}> <Popover content={getPopoverContent(chunkIndex)} key={i}>

3
web/src/pages/chat/utils.ts
View File

@ -44,8 +44,9 @@ export const buildMessageItemReference = (
const oldReg = /(#{2}\d+\${2})/g; const oldReg = /(#{2}\d+\${2})/g;
// To be compatible with the old index matching mode
export const replaceTextByOldReg = (text: string) => { export const replaceTextByOldReg = (text: string) => {
return text.replace(oldReg, function (substring) { return text.replace(oldReg, function (substring) {
return `${substring.slice(0, -2)}@@`; return `~~${substring.slice(2, -2)}==`;
}); });
}; };