diff --git a/src/API/hooks.ts b/src/API/hooks.ts index 9b30192..1ddc72b 100644 --- a/src/API/hooks.ts +++ b/src/API/hooks.ts @@ -14,14 +14,15 @@ export function useDataPage(application:string, endpoint: string, params:{[ke useEffect( ()=>{ - if (data === null && needLoad){ + if (!needLoad && data !== null){ + setData(null) + } + else if (data === null){ getFetch(`/${application}/${endpoint}/?${createQueryString(params)}`).then((r)=>{ if (r.success){ const pageData = (r as ApiResponse).body as PageResponse; setData(pageData.results); - - } else { setData([]); diff --git a/src/pages/dashboards/DataPage.tsx b/src/pages/dashboards/DataPage.tsx index cd48989..26c203a 100644 --- a/src/pages/dashboards/DataPage.tsx +++ b/src/pages/dashboards/DataPage.tsx @@ -9,7 +9,7 @@ export function DataPage() { const { schema, loading: loadingSchema } = useApiDocumentation(applicationName || "", endpointName || ""); // Получаем данные с помощью пагинации - const dataPage = useDataPage(applicationName || "", endpointName || "", {}, !loadingSchema); + const dataPage = useDataPage(applicationName || "", endpointName || "", {}, !loadingSchema); // Функция для экспорта данных в Excel (пока пустая) const handleExport = () => { @@ -55,7 +55,7 @@ export function DataPage() { {schema?.map((field: FieldInfo) => ( - {item[field.name]} + {item[field.name] || "-"} ))}