From f6dbcaf1b28c83d02469720bc97f6aa4df6866b6 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 15 Mar 2023 15:21:57 +0800 Subject: [PATCH] issue #2598 --- src/forge/Issues/Component/allMenus.jsx | 1 + src/forge/Issues/Pages/list.jsx | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/forge/Issues/Component/allMenus.jsx b/src/forge/Issues/Component/allMenus.jsx index 740fb0301..302f27faf 100644 --- a/src/forge/Issues/Component/allMenus.jsx +++ b/src/forge/Issues/Component/allMenus.jsx @@ -44,6 +44,7 @@ function AllMenus({owner,projectsId,chooseFunc,update,defaultNames,defaultIds,op useEffect(()=>{ if(defaultIds){ + console.log("defaule:",defaultIds); setIds(defaultIds); } },[defaultIds]) diff --git a/src/forge/Issues/Pages/list.jsx b/src/forge/Issues/Pages/list.jsx index 1cc6f590d..e3488ac81 100644 --- a/src/forge/Issues/Pages/list.jsx +++ b/src/forge/Issues/Pages/list.jsx @@ -146,7 +146,7 @@ function List(props){ limit, begin_date,end_date, sort_direction:getDirection(params && params.sort_by), - sort_by:getBy(params && params.sort_by), + sort_by:getBy(params && params.sort_by),names:undefined } }).then(result=>{ if(result){ @@ -292,6 +292,11 @@ function List(props){ // setUpdateIds(ids); setUpdateChooseIds(ids); }else{ + if(ids.status_id === "5"){ + setCategory("closed"); + }else{ + setCategory("opened"); + } setUpdateIds(ids); setTotal(undefined); // Init(ids,1,n); @@ -304,6 +309,19 @@ function List(props){ } function changeCategory(value){ if(value !== category){ + let ids = {...updateIds}; + let ns = {...names}; + if(value === "closed"){ + ns = {...ns,status_name:"关闭"} + ids = {...ids,status_id:'5'}; + setNames(ns) + setUpdateIds(ids); + }else{ + ns = {...ns,status_name:undefined} + ids = {...ids,status_id:undefined}; + setNames(ns) + setUpdateIds(ids); + } setCategory(value); setPage(1); setTotal(undefined);