diff --git a/web/src/hooks/routeHook.ts b/web/src/hooks/routeHook.ts index f03e4a074..21829fde4 100644 --- a/web/src/hooks/routeHook.ts +++ b/web/src/hooks/routeHook.ts @@ -1,5 +1,6 @@ import { KnowledgeSearchParams } from '@/constants/knowledge'; -import { useLocation, useSearchParams } from 'umi'; +import { useCallback } from 'react'; +import { useLocation, useNavigate, useSearchParams } from 'umi'; export enum SegmentIndex { Second = '2', @@ -31,3 +32,13 @@ export const useGetKnowledgeSearchParams = () => { currentQueryParameters.get(KnowledgeSearchParams.KnowledgeId) || '', }; }; + +export const useNavigateWithFromState = () => { + const navigate = useNavigate(); + return useCallback( + (path: string) => { + navigate(path, { state: { from: path } }); + }, + [navigate], + ); +}; diff --git a/web/src/layouts/components/header/index.tsx b/web/src/layouts/components/header/index.tsx index bb6da36a6..c8f2403f5 100644 --- a/web/src/layouts/components/header/index.tsx +++ b/web/src/layouts/components/header/index.tsx @@ -6,8 +6,9 @@ import Toolbar from '../right-toolbar'; import styles from './index.less'; +import { useNavigateWithFromState } from '@/hooks/routeHook'; import { useCallback, useMemo } from 'react'; -import { useLocation, useNavigate } from 'umi'; +import { useLocation } from 'umi'; const { Header } = Layout; @@ -15,7 +16,7 @@ const RagHeader = () => { const { token: { colorBgContainer }, } = theme.useToken(); - const navigate = useNavigate(); + const navigate = useNavigateWithFromState(); const { pathname } = useLocation(); const tagsData = useMemo( diff --git a/web/src/layouts/components/right-toolbar/index.tsx b/web/src/layouts/components/right-toolbar/index.tsx index 02b516814..a4cce7403 100644 --- a/web/src/layouts/components/right-toolbar/index.tsx +++ b/web/src/layouts/components/right-toolbar/index.tsx @@ -11,7 +11,7 @@ const Circle = ({ children }: React.PropsWithChildren) => { }; const handleGithubCLick = () => { - window.open('https://github.com/infiniflow/infinity', 'target'); + window.open('https://github.com/infiniflow/ragflow', 'target'); }; const RightToolBar = () => { diff --git a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-toolbar/index.tsx b/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-toolbar/index.tsx index 36c07e86a..fd02a1b10 100644 --- a/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-toolbar/index.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-chunk/components/chunk-toolbar/index.tsx @@ -80,12 +80,13 @@ const ChunkToolBar = ({ removeChunk(); }, [removeChunk]); - const handleEnabledClick = () => { + const handleEnabledClick = useCallback(() => { switchChunk(1); - }; - const handleDisabledClick = () => { + }, [switchChunk]); + + const handleDisabledClick = useCallback(() => { switchChunk(0); - }; + }, [switchChunk]); const items: MenuProps['items'] = useMemo(() => { return [ @@ -129,7 +130,13 @@ const ChunkToolBar = ({ ), }, ]; - }, [checked, handleSelectAllCheck, handleDelete]); + }, [ + checked, + handleSelectAllCheck, + handleDelete, + handleEnabledClick, + handleDisabledClick, + ]); const content = (
diff --git a/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts b/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts index c52da8d14..236324033 100644 --- a/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts +++ b/web/src/pages/add-knowledge/components/knowledge-file/hooks.ts @@ -74,7 +74,7 @@ export const useGetPagination = (fetchDocumentList: () => void) => { showQuickJumper: true, total: kFModel.total, showSizeChanger: true, - current: kFModel.pagination.currentPage, + current: kFModel.pagination.current, pageSize: kFModel.pagination.pageSize, pageSizeOptions: [1, 2, 10, 20, 50, 100], onChange: onPageChange, diff --git a/web/src/pages/add-knowledge/components/knowledge-file/model.ts b/web/src/pages/add-knowledge/components/knowledge-file/model.ts index 2c42b01a8..4405b5bc2 100644 --- a/web/src/pages/add-knowledge/components/knowledge-file/model.ts +++ b/web/src/pages/add-knowledge/components/knowledge-file/model.ts @@ -223,5 +223,24 @@ const model: DvaModel