diff --git a/web/src/components/api-service/embed-modal/index.tsx b/web/src/components/api-service/embed-modal/index.tsx index 697fb983c..f4cb49ea1 100644 --- a/web/src/components/api-service/embed-modal/index.tsx +++ b/web/src/components/api-service/embed-modal/index.tsx @@ -1,5 +1,5 @@ import CopyToClipboard from '@/components/copy-to-clipboard'; -import HightLightMarkdown from '@/components/highlight-markdown'; +import HighLightMarkdown from '@/components/highlight-markdown'; import { SharedFrom } from '@/constants/chat'; import { useTranslate } from '@/hooks/common-hooks'; import { IModalProps } from '@/interfaces/common'; @@ -111,7 +111,7 @@ const EmbedModal = ({ /> - {text} + {text} ), }, diff --git a/web/src/components/embed-dialog/index.tsx b/web/src/components/embed-dialog/index.tsx index 7f0ccd60f..341abd034 100644 --- a/web/src/components/embed-dialog/index.tsx +++ b/web/src/components/embed-dialog/index.tsx @@ -1,5 +1,5 @@ import CopyToClipboard from '@/components/copy-to-clipboard'; -import HightLightMarkdown from '@/components/highlight-markdown'; +import HighLightMarkdown from '@/components/highlight-markdown'; import { SelectWithSearch } from '@/components/originui/select-with-search'; import { Dialog, @@ -277,7 +277,7 @@ function EmbedDialog({
{t('embedCode', { keyPrefix: 'search' })}
- {text} + {text}
diff --git a/web/src/components/highlight-markdown/index.tsx b/web/src/components/highlight-markdown/index.tsx index 8925ae238..50b752680 100644 --- a/web/src/components/highlight-markdown/index.tsx +++ b/web/src/components/highlight-markdown/index.tsx @@ -16,7 +16,7 @@ import { preprocessLaTeX } from '@/utils/chat'; import { useIsDarkTheme } from '../theme-provider'; import styles from './index.less'; -const HightLightMarkdown = ({ +const HighLightMarkdown = ({ children, }: { children: string | null | undefined; @@ -56,4 +56,4 @@ const HightLightMarkdown = ({ ); }; -export default HightLightMarkdown; +export default HighLightMarkdown; diff --git a/web/src/components/hooks/use-toast.tsx b/web/src/components/hooks/use-toast.tsx index ca071d407..2856df6ca 100644 --- a/web/src/components/hooks/use-toast.tsx +++ b/web/src/components/hooks/use-toast.tsx @@ -3,10 +3,7 @@ // Inspired by react-hot-toast library import * as React from 'react'; -import type { - ToastActionElement, - ToastProps, -} from '@/components/ui/toast'; +import type { ToastActionElement, ToastProps } from '@/components/ui/toast'; const TOAST_LIMIT = 1; const TOAST_REMOVE_DELAY = 1000000; diff --git a/web/src/components/prompt-dialog.tsx b/web/src/components/prompt-dialog.tsx index 65dc61a94..f18f00bcd 100644 --- a/web/src/components/prompt-dialog.tsx +++ b/web/src/components/prompt-dialog.tsx @@ -1,6 +1,6 @@ import { IModalProps } from '@/interfaces/common'; import { IFeedbackRequestBody } from '@/interfaces/request/chat'; -import HightLightMarkdown from './highlight-markdown'; +import HighLightMarkdown from './highlight-markdown'; import SvgIcon from './svg-icon'; import { Dialog, DialogContent, DialogHeader, DialogTitle } from './ui/dialog'; @@ -25,7 +25,7 @@ export function PromptDialog({
- {prompt} + {prompt}
diff --git a/web/src/pages/agent/log-sheet/workflow-timeline.tsx b/web/src/pages/agent/log-sheet/workflow-timeline.tsx index 8b9eb5ef7..de24f6636 100644 --- a/web/src/pages/agent/log-sheet/workflow-timeline.tsx +++ b/web/src/pages/agent/log-sheet/workflow-timeline.tsx @@ -1,4 +1,4 @@ -import HightLightMarkdown from '@/components/highlight-markdown'; +import HighLightMarkdown from '@/components/highlight-markdown'; import { Timeline, TimelineContent, @@ -327,9 +327,9 @@ export const WorkFlowTimeline = ({
- + {x.data.thoughts || ''} - +
diff --git a/web/src/pages/memory/memory-message/index.tsx b/web/src/pages/memory/memory-message/index.tsx index c0ec80823..42b56353c 100644 --- a/web/src/pages/memory/memory-message/index.tsx +++ b/web/src/pages/memory/memory-message/index.tsx @@ -43,9 +43,6 @@ export default function MemoryMessage() { // setRowSelection={setRowSelection} // loading={loading} > -
-
message
-
); } diff --git a/web/src/pages/memory/memory-message/message-table.tsx b/web/src/pages/memory/memory-message/message-table.tsx index 2174c2f79..6d3ad7ac9 100644 --- a/web/src/pages/memory/memory-message/message-table.tsx +++ b/web/src/pages/memory/memory-message/message-table.tsx @@ -122,7 +122,7 @@ export function MemoryTable({ cellClassName: 'w-12', }, cell: () => ( -
+
diff --git a/web/src/pages/next-search/embed-app-modal.tsx b/web/src/pages/next-search/embed-app-modal.tsx index 1d443400e..284416d37 100644 --- a/web/src/pages/next-search/embed-app-modal.tsx +++ b/web/src/pages/next-search/embed-app-modal.tsx @@ -1,4 +1,4 @@ -import HightLightMarkdown from '@/components/highlight-markdown'; +import HighLightMarkdown from '@/components/highlight-markdown'; import message from '@/components/ui/message'; import { Modal } from '@/components/ui/modal/modal'; import { RAGFlowSelect } from '@/components/ui/select'; @@ -102,7 +102,7 @@ const EmbedAppModal = (props: IEmbedAppModalProps) => { {/*
*/} {/*
{text}
*/} - {text} + {text} {/*
*/}
diff --git a/web/src/pages/next-search/highlight-markdown/index.tsx b/web/src/pages/next-search/highlight-markdown/index.tsx deleted file mode 100644 index 304a7ed5a..000000000 --- a/web/src/pages/next-search/highlight-markdown/index.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import Markdown from 'react-markdown'; -import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; -import rehypeKatex from 'rehype-katex'; -import rehypeRaw from 'rehype-raw'; -import remarkGfm from 'remark-gfm'; -import remarkMath from 'remark-math'; - -import 'katex/dist/katex.min.css'; // `rehype-katex` does not import the CSS for you - -import { preprocessLaTeX } from '@/utils/chat'; - -const HightLightMarkdown = ({ - children, -}: { - children: string | null | undefined; -}) => { - return ( - - {String(children).replace(/\n$/, '')} - - ) : ( - - {children} - - ); - }, - } as any - } - > - {children ? preprocessLaTeX(children) : children} - - ); -}; - -export default HightLightMarkdown; diff --git a/web/src/pages/next-search/search-view.tsx b/web/src/pages/next-search/search-view.tsx index 46cbf2c02..bddbf744c 100644 --- a/web/src/pages/next-search/search-view.tsx +++ b/web/src/pages/next-search/search-view.tsx @@ -1,5 +1,6 @@ import { EmptyType } from '@/components/empty/constant'; import Empty from '@/components/empty/empty'; +import HighLightMarkdown from '@/components/highlight-markdown'; import { FileIcon } from '@/components/icon-font'; import { ImageWithPopover } from '@/components/image'; import { Input } from '@/components/originui/input'; @@ -20,7 +21,6 @@ import { Dispatch, SetStateAction, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ISearchAppDetailProps } from '../next-searches/hooks'; import PdfDrawer from './document-preview-modal'; -import HightLightMarkdown from './highlight-markdown'; import { ISearchReturnProps } from './hooks'; import './index.less'; import MarkdownContent from './markdown-content'; @@ -217,9 +217,9 @@ export default function SearchingView({
- + {chunk.content_with_weight} - +
diff --git a/web/src/pages/next-searches/hooks.ts b/web/src/pages/next-searches/hooks.ts index 64699e64a..8855afd08 100644 --- a/web/src/pages/next-searches/hooks.ts +++ b/web/src/pages/next-searches/hooks.ts @@ -4,7 +4,7 @@ import message from '@/components/ui/message'; import { useSetModalState } from '@/hooks/common-hooks'; import { useHandleSearchChange } from '@/hooks/logic-hooks'; import { useNavigatePage } from '@/hooks/logic-hooks/navigate-hooks'; -import searchService from '@/services/search-service'; +import searchService, { searchServiceNext } from '@/services/search-service'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { useDebounce } from 'ahooks'; import { useCallback, useState } from 'react'; @@ -103,7 +103,7 @@ export const useFetchSearchList = () => { }, ], queryFn: async () => { - const { data: response } = await searchService.getSearchList( + const { data: response } = await searchServiceNext.getSearchList( { params: { keywords: debouncedSearchString, diff --git a/web/src/services/search-service.ts b/web/src/services/search-service.ts index 86f92b4ce..2e0c6e638 100644 --- a/web/src/services/search-service.ts +++ b/web/src/services/search-service.ts @@ -1,5 +1,6 @@ import api from '@/utils/api'; -import { registerNextServer } from '@/utils/register-server'; +import registerServer, { registerNextServer } from '@/utils/register-server'; +import request from '@/utils/request'; const { createSearch, @@ -48,6 +49,8 @@ const methods = { method: 'get', }, } as const; -const searchService = registerNextServer(methods); +const searchService = registerServer(methods, request); +export const searchServiceNext = + registerNextServer(methods); export default searchService;