From ab003e244aaf8099fc221bdbfdcaa0c43dea1586 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期日, 29 九月 2024 13:59:25 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/mission/MissionListContent.jsx | 30 +++++++++--------------------- zy-acs-flow/src/page/mission/MissionList.jsx | 24 ------------------------ zy-acs-flow/src/page/mission/MissionShow.jsx | 1 + 3 files changed, 10 insertions(+), 45 deletions(-) diff --git a/zy-acs-flow/src/page/mission/MissionList.jsx b/zy-acs-flow/src/page/mission/MissionList.jsx index 1611f8a..f1bb75c 100644 --- a/zy-acs-flow/src/page/mission/MissionList.jsx +++ b/zy-acs-flow/src/page/mission/MissionList.jsx @@ -2,32 +2,11 @@ import { useNavigate } from 'react-router-dom'; import { ListBase, - DatagridConfigurable, - SearchInput, TopToolbar, - SelectColumnsButton, - EditButton, FilterButton, - CreateButton, - ExportButton, - BulkDeleteButton, - WrapperField, - useRecordContext, - useTranslate, useListContext, - useCreatePath, - TextField, - NumberField, - DateField, - BooleanField, - ReferenceField, TextInput, - DateTimeInput, - DateInput, - SelectInput, - NumberInput, ReferenceInput, - ReferenceArrayInput, AutocompleteInput, ListToolbar, Title, @@ -35,9 +14,7 @@ import { matchPath, useLocation } from 'react-router'; 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"; -import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting'; import * as Common from '@/utils/common'; import MissionShow from "./MissionShow"; import { MissionListContent } from "./MissionListContent"; @@ -68,7 +45,6 @@ const MissionLayout = () => { const location = useLocation(); const matchShow = matchPath('/mission/:id/show', location.pathname); - console.log(matchShow?.params.id); const { data, isPending, filterValues } = useListContext(); const hasFilters = filterValues && Object.keys(filterValues).length > 0; diff --git a/zy-acs-flow/src/page/mission/MissionListContent.jsx b/zy-acs-flow/src/page/mission/MissionListContent.jsx index a6244d7..159ca0f 100644 --- a/zy-acs-flow/src/page/mission/MissionListContent.jsx +++ b/zy-acs-flow/src/page/mission/MissionListContent.jsx @@ -45,34 +45,22 @@ return () => clearInterval(intervalId); }, [refetch]) - useEffect(() => { - // if (data) { - // const newDealsByStage = getDealsByStage(unorderedDeals, dealStages); - // if (!isEqual(newDealsByStage, dealsByStage)) { - // setDealsByStage(newDealsByStage); - // } - // } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [data]); - if (isPending) return <LinearProgress />; const onDragEnd = result => { const { destination, source } = result; + if (!destination) { + return; + } + const { droppableId: sourceStage, index: sourceIdx } = source; + const { droppableId: destinationStage, index: destinationIdx } = destination; - // if (!destination) { - // return; - // } + if (destinationStage === sourceStage + && destinationIdx === sourceIdx) { + return; + } - // if ( - // destination.droppableId === source.droppableId && - // destination.index === source.index - // ) { - // return; - // } - // const sourceStage = source.droppableId; - // const destinationStage = destination.droppableId; // const sourceDeal = dealsByStage[sourceStage][source.index]; // const destinationDeal = dealsByStage[destinationStage][ // destination.index diff --git a/zy-acs-flow/src/page/mission/MissionShow.jsx b/zy-acs-flow/src/page/mission/MissionShow.jsx index fb0c7ce..287d997 100644 --- a/zy-acs-flow/src/page/mission/MissionShow.jsx +++ b/zy-acs-flow/src/page/mission/MissionShow.jsx @@ -60,6 +60,7 @@ const MissionShowContent = ({ handleClose }) => { const record = useRecordContext(); if (!record) return null; + console.log(record); return ( <> -- Gitblit v1.9.1