feat: jumping from the chunk list page to the file list page keeps th… (#174)

* feat: jumping from the chunk list page to the file list page keeps the original page number.

* feat: jump to the file upload page and reset the file list page number to 1
This commit is contained in:
balibabu
2024-03-31 17:44:34 +08:00
committed by GitHub
parent d9e6b103d4
commit dad0d2eb9d
8 changed files with 60 additions and 19 deletions

View File

@@ -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 = (
<Menu style={{ width: 200 }} items={items} selectable={false} />

View File

@@ -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,

View File

@@ -223,5 +223,24 @@ const model: DvaModel<KFModelState> = {
return data;
},
},
subscriptions: {
setup({ dispatch, history }) {
history.listen(({ location }) => {
const state: { from: string } = (location.state ?? {
from: '',
}) as { from: string };
if (
state.from === '/knowledge' || // TODO: Just directly determine whether the current page is on the knowledge list page.
location.pathname === '/knowledge/dataset/upload'
) {
dispatch({
type: 'kFModel/setPagination',
payload: { current: 1, pageSize: 10 },
});
}
console.info(location);
});
},
},
};
export default model;

View File

@@ -1,9 +1,13 @@
import { useKnowledgeBaseId } from '@/hooks/knowledgeHook';
import { useSecondPathName, useThirdPathName } from '@/hooks/routeHook';
import {
useNavigateWithFromState,
useSecondPathName,
useThirdPathName,
} from '@/hooks/routeHook';
import { Breadcrumb } from 'antd';
import { ItemType } from 'antd/es/breadcrumb/Breadcrumb';
import { useCallback, useEffect, useMemo } from 'react';
import { Link, Outlet, useDispatch, useLocation, useNavigate } from 'umi';
import { useEffect, useMemo } from 'react';
import { Link, Outlet, useDispatch, useLocation } from 'umi';
import Siderbar from './components/knowledge-sidebar';
import {
KnowledgeDatasetRouteKey,
@@ -15,7 +19,6 @@ import styles from './index.less';
const KnowledgeAdding = () => {
const dispatch = useDispatch();
const navigate = useNavigate();
const knowledgeBaseId = useKnowledgeBaseId();
const location = useLocation();
@@ -25,14 +28,12 @@ const KnowledgeAdding = () => {
const datasetActiveKey: KnowledgeDatasetRouteKey =
useThirdPathName() as KnowledgeDatasetRouteKey;
const gotoList = useCallback(() => {
navigate('/knowledge');
}, [navigate]);
const gotoList = useNavigateWithFromState();
const breadcrumbItems: ItemType[] = useMemo(() => {
const items: ItemType[] = [
{
title: <a onClick={gotoList}>Knowledge Base</a>,
title: <a onClick={() => gotoList('/knowledge')}>Knowledge Base</a>,
},
{
title: datasetActiveKey ? (