diff --git a/web/src/components/list-filter-bar/use-handle-filter-submit.ts b/web/src/components/list-filter-bar/use-handle-filter-submit.ts index 057e0f2da4..515a108959 100644 --- a/web/src/components/list-filter-bar/use-handle-filter-submit.ts +++ b/web/src/components/list-filter-bar/use-handle-filter-submit.ts @@ -49,16 +49,21 @@ export function useHandleFilterSubmit() { ); const checkValue = useCallback((filters: FilterCollection[]) => { - if (!filters?.length || !filterValue) { + if (!filters?.length) { return; } + const validFields = filters.reduce((pre, cur) => { return [...pre, ...getFilterIds(cur as FilterType)]; }, [] as string[]); + if (!validFields.length) { return; } + setFilterValue((preValue) => { + if (!preValue) return preValue; + const newValue: FilterValue = mergeFilterValue(preValue, validFields); return newValue; }); diff --git a/web/src/hooks/logic-hooks.ts b/web/src/hooks/logic-hooks.ts index 7a4e7509a1..961b6a7a69 100644 --- a/web/src/hooks/logic-hooks.ts +++ b/web/src/hooks/logic-hooks.ts @@ -72,10 +72,14 @@ export const useGetPaginationWithRouter = () => { } = useSetPaginationParams(); const onPageChange: Pagination['onChange'] = useCallback( - (pageNumber: number, pageSize?: number) => { - setPaginationParams(pageNumber, pageSize); + (pageNumber: number, size?: number) => { + if (size !== pageSize) { + setPaginationParams(1, size); + } else { + setPaginationParams(pageNumber, size); + } }, - [setPaginationParams], + [setPaginationParams, pageSize], ); const setCurrentPagination = useCallback( diff --git a/web/src/pages/dataset/dataset-overview/index.tsx b/web/src/pages/dataset/dataset-overview/index.tsx index b61e04cc49..b6e69a35fe 100644 --- a/web/src/pages/dataset/dataset-overview/index.tsx +++ b/web/src/pages/dataset/dataset-overview/index.tsx @@ -10,7 +10,7 @@ import { } from '@/components/ui/card'; import WhatIsThis from '@/components/what-is-this'; -import { RunningStatusMap } from '@/constants/knowledge'; +import { RunningStatusMap, RunningStatusOld } from '@/constants/knowledge'; import { useFetchDocumentList } from '@/hooks/use-document-request'; import { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; @@ -185,7 +185,7 @@ const FileLogsPage: FC = () => { { field: 'operation_status', label: t('knowledgeDetails.status'), - list: Object.values(RunningStatus).map((value) => { + list: Object.values(RunningStatusOld).map((value) => { // const value = key as RunningStatus; return { id: value,