From 551aa6e5c2f92d57cdcc67c579b6259e88ff2b27 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 29 九月 2024 09:50:01 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/mission/MissionList.jsx |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/zy-acs-flow/src/page/mission/MissionList.jsx b/zy-acs-flow/src/page/mission/MissionList.jsx
index 64491f9..4e65cc9 100644
--- a/zy-acs-flow/src/page/mission/MissionList.jsx
+++ b/zy-acs-flow/src/page/mission/MissionList.jsx
@@ -33,7 +33,7 @@
     Title,
 } from 'react-admin';
 import { matchPath, useLocation } from 'react-router';
-import { Box, Typography, Card, Stack } from '@mui/material';
+import { Box, Typography, Card, Stack, LinearProgress } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import EmptyData from "../components/EmptyData";
 import PageDrawer from "../components/PageDrawer";
@@ -59,7 +59,6 @@
 }
 
 const filters = [
-    // <SearchInput source="q" alwaysOn />,
     <ReferenceInput source="agvId" label="table.field.segment.agvId" reference="agv" alwaysOn>
         <AutocompleteInput label="table.field.segment.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
     </ReferenceInput>,
@@ -71,12 +70,11 @@
     const matchShow = matchPath('/mission/:id/show', location.pathname);
     console.log(matchShow);
 
-
     const { data, isPending, filterValues } = useListContext();
-    if (isPending) return null;
-    console.log(data);
+    const hasFilters = filterValues && Object.keys(filterValues).length > 0;
 
-    if (!data?.length) {
+    if (isPending) return <LinearProgress />;
+    if (!data?.length && !hasFilters) {
         return (
             <>
                 {/* <MissionEmpty> */}
@@ -98,8 +96,6 @@
             <Card>
                 <MissionListContent />
             </Card>
-            {/* <DealArchivedList /> */}
-
             <MissionShow open={!!matchShow} id={matchShow?.params.id} />
         </Stack>
     );

--
Gitblit v1.9.1