From 21c3a7214597507d5173b78bc2a8924f90b21d3b Mon Sep 17 00:00:00 2001 From: yms Date: Thu, 14 Nov 2024 20:42:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/detail/index.tsx | 4 ++- src/pages/list/index.tsx | 61 +++++++++++++++++++++----------------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/pages/detail/index.tsx b/src/pages/detail/index.tsx index 7d8ecc8..c83cdb3 100644 --- a/src/pages/detail/index.tsx +++ b/src/pages/detail/index.tsx @@ -73,7 +73,9 @@ const Detail = () => { - {actionObj?.subjectName} + + {actionObj?.subjectName}-{actionObj?.name} + {actionObj?.caseStatus?.name} { const { updateActionObj } = useGlobalStore(); const [historyPaginationInfo, setHistoryPaginationInfo] = useState(); const [historyDataSource, setHistoryDataSource] = useState([]); -const [historyRefresherTriggered,setHistoryRefresherTriggered] = useState(false) -const [refresherTriggered,setRefresherTriggered] = useState(false) + const [historyRefresherTriggered, setHistoryRefresherTriggered] = + useState(false); + const [refresherTriggered, setRefresherTriggered] = useState(false); useDidShow(() => { getData(1); getHistory(1); @@ -34,18 +35,21 @@ const [refresherTriggered,setRefresherTriggered] = useState(false) page: pageNum, count: 10, }; - services.login.getBacklog(params).then((res: any) => { - if (res.code === 200) { - if (pageNum === 1) { - setBacklogDataSource([...res.data?.items]); - } else { - setBacklogDataSource([...backlogDataSource, ...res.data?.items]); + services.login + .getBacklog(params) + .then((res: any) => { + if (res.code === 200) { + if (pageNum === 1) { + setBacklogDataSource([...res.data?.items]); + } else { + setBacklogDataSource([...backlogDataSource, ...res.data?.items]); + } + setPaginationInfo(res.data); } - setPaginationInfo(res.data); - } - }).finally(()=>{ - setRefresherTriggered(false) - });; + }) + .finally(() => { + setRefresherTriggered(false); + }); }; const getHistory = (pageNum) => { @@ -69,8 +73,9 @@ const [refresherTriggered,setRefresherTriggered] = useState(false) }) .catch((e) => { console.log(e); - }).finally(()=>{ - setHistoryRefresherTriggered(false) + }) + .finally(() => { + setHistoryRefresherTriggered(false); }); }; @@ -100,8 +105,6 @@ const [refresherTriggered,setRefresherTriggered] = useState(false) return ( - - @@ -123,9 +126,9 @@ const [refresherTriggered,setRefresherTriggered] = useState(false) scrollY refresherTriggered={refresherTriggered} refresherEnabled - onRefresherRefresh={()=>{ - setRefresherTriggered(true) - getData(1) + onRefresherRefresh={() => { + setRefresherTriggered(true); + getData(1); }} refresherBackground="#eff2f6" onScrollToLower={onScrollToLower} @@ -143,7 +146,9 @@ const [refresherTriggered,setRefresherTriggered] = useState(false) onClick={onClick.bind(this, item)} > - {item?.subjectName} + + {item?.subjectName}-{item.name} + {item?.caseStatus.name} @@ -162,13 +167,11 @@ const [refresherTriggered,setRefresherTriggered] = useState(false) scrollY refresherEnabled refresherBackground="#eff2f6" - refresherTriggered={historyRefresherTriggered} - - onRefresherRefresh={()=>{ - setHistoryRefresherTriggered(true) - getHistory(1) + refresherTriggered={historyRefresherTriggered} + onRefresherRefresh={() => { + setHistoryRefresherTriggered(true); + getHistory(1); }} - onScrollToLower={onScrollToLowerInHistory} > {historyDataSource.length === 0 && ( @@ -184,7 +187,9 @@ const [refresherTriggered,setRefresherTriggered] = useState(false) onClick={onClick.bind(this, item)} > - {item?.subjectName} + + {item?.subjectName}-{item.name} + {item?.caseStatus.name} -- GitLab