From e5bc4b3b04303b64cfdd839567b99cf5103f4bbb Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 14 Jun 2023 22:38:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E4=BB=BB=E5=8A=A1=E8=A7=86=E5=9B=BE=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=A7=86=E5=9B=BE=E7=AD=9B=E9=80=89=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/crontab/index.tsx | 18 +++++++++++------- src/pages/crontab/viewManageModal.tsx | 13 ++++++++++--- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/pages/crontab/index.tsx b/src/pages/crontab/index.tsx index 1f89e709..95db490c 100644 --- a/src/pages/crontab/index.tsx +++ b/src/pages/crontab/index.tsx @@ -824,12 +824,6 @@ const Crontab = () => { }, [viewConf, enabledCronViews]); useEffect(() => { - setPageConf({ - page: 1, - size: parseInt(localStorage.getItem('pageSize') || '20'), - sorter: {}, - filters: {}, - }); getCronViews(); }, []); @@ -889,7 +883,17 @@ const Crontab = () => { .then(({ code, data }) => { if (code === 200) { setCronViews(data); - setEnabledCronViews(data.filter((x) => !x.isDisabled)); + const firstEnableView = data.filter((x) => !x.isDisabled); + setEnabledCronViews(firstEnableView); + setPageConf({ + page: 1, + size: parseInt(localStorage.getItem('pageSize') || '20'), + sorter: {}, + filters: {}, + }); + setViewConf({ + ...firstEnableView[0], + }); } }) .finally(() => { diff --git a/src/pages/crontab/viewManageModal.tsx b/src/pages/crontab/viewManageModal.tsx index 0ec02a3a..b25ba9fa 100644 --- a/src/pages/crontab/viewManageModal.tsx +++ b/src/pages/crontab/viewManageModal.tsx @@ -75,6 +75,10 @@ const ViewManageModal = ({ handleCancel: () => void; cronViewChange: (data?: any) => void; }) => { + const islastEnableView = (record) => { + return list.filter((x) => !x.isDisabled).length <= 1 && !record.isDisabled; + }; + const columns: any = [ { title: '名称', @@ -95,6 +99,7 @@ const ViewManageModal = ({ render: (text: string, record: any, index: number) => { return ( onShowChange(checked, record, index)} /> @@ -111,9 +116,11 @@ const ViewManageModal = ({ editView(record, index)}> - deleteView(record, index)}> - - + {!islastEnableView(record) && ( + deleteView(record, index)}> + + + )} ) : ( '-'