diff --git a/src/forge/Issues/Component/datas.jsx b/src/forge/Issues/Component/datas.jsx index 2d7e2302d..65390292b 100644 --- a/src/forge/Issues/Component/datas.jsx +++ b/src/forge/Issues/Component/datas.jsx @@ -35,12 +35,12 @@ function Datas({checkbox ,item , projectsId,owner}){
{/* */} - {item.subject} + {item.subject} { item.tags && item.tags.length>0? item.tags.map((i,k)=>{ return( - {i.name} + {i.name} ) }) :"" diff --git a/src/forge/Issues/Pages/list.jsx b/src/forge/Issues/Pages/list.jsx index e9c197f0c..08572e94e 100644 --- a/src/forge/Issues/Pages/list.jsx +++ b/src/forge/Issues/Pages/list.jsx @@ -55,7 +55,7 @@ function List(props){ },[projectDetail]) useEffect(()=>{ - const datas = cookie.load('states'); + const datas = cookie.load('issuestates'); let states = datas === "undefined" ? undefined : datas; if(states){ setAboutMe(states.participant_category); @@ -121,10 +121,10 @@ function List(props){ // 获取issue列表数据 function Init(params,p,names){ - const datas = cookie.load('states'); + const datas = cookie.load('issuestates'); let states = datas === "undefined" ? undefined : datas; if(states){ - cookie.remove('states'); + cookie.remove('issuestates'); } const url = `/v1/${owner}/${projectsId}/issues`; axios.get(url,{ @@ -154,7 +154,7 @@ function List(props){ sort_by:getBy(params && params.sort_by),names:names}; let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000); - cookie.save('states', {...d},{ expires: inFifteenMinutes,path:`/` }); + cookie.save('issuestates', {...d},{ expires: inFifteenMinutes,path:`/` }); } }).then(error=>{}) } @@ -291,6 +291,13 @@ function List(props){ setPage(1); setTotal(undefined); } + + function changeSearchValueFunc(e){ + setValue(e.target.value); + if(e.target.value===""){ + setKeyword(undefined); + } + } return(
@@ -309,7 +316,7 @@ function List(props){ {setValue(e.target.value);}} + onChange={changeSearchValueFunc} onSearch={()=>setKeyword(value)} style={{ width: 354 , height : 32 }} allowClear diff --git a/src/forge/Issues/Pages/new.jsx b/src/forge/Issues/Pages/new.jsx index 1b3657dd4..74c14b3c3 100644 --- a/src/forge/Issues/Pages/new.jsx +++ b/src/forge/Issues/Pages/new.jsx @@ -121,7 +121,6 @@ function New(props){ if(milepostId && milepostId === keyword){ setMillstone_choose(milestones); }else{ - setMillstone_choose([]); setMillstoneList(milestones); } } diff --git a/src/forge/Issues/Pages/sign.jsx b/src/forge/Issues/Pages/sign.jsx index d908e9b01..8ddfccbcb 100644 --- a/src/forge/Issues/Pages/sign.jsx +++ b/src/forge/Issues/Pages/sign.jsx @@ -110,7 +110,11 @@ function Sign(props){ axios.delete(url).then(result=>{ if(result){ props.showNotification("项目标记删除成功!"); - Init(); + if(list && list.length === 1 && page>1){ + setPage(page-1); + }else{ + Init(); + } setDelVisible(false); } }).catch(error=>{}) @@ -224,7 +228,7 @@ function Sign(props){

- {i.name} + {i.name}

{i.description}

diff --git a/src/forge/Issues/index.scss b/src/forge/Issues/index.scss index a968ac396..eb31c3b22 100644 --- a/src/forge/Issues/index.scss +++ b/src/forge/Issues/index.scss @@ -218,16 +218,17 @@ display: block; overflow: hidden; text-overflow: ellipsis; - max-width: 600px; + max-width: 519px; white-space: nowrap; } .tagscolor{ padding:0px 6px; - color: #fff; border-radius: 3px; height: 20px; - line-height: 20px; - max-width: 200px; + line-height: 18px; + max-width: 60px; + border:1px solid ; + cursor: default; } } .infos{ @@ -390,15 +391,17 @@ padding:10px 20px; &>p{ flex:1; - text-align: center; - display: flex; - align-items: center; - justify-content: flex-start; color: 40424a; &:first-child{ flex:1.2; + display: flex; + align-items: center; + justify-content: flex-start; } &:last-child{ + display: flex; + align-items: center; + justify-content: flex-start; justify-content: flex-end; } .square{ diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 13f8d2a6b..ee6a8b78d 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -247,6 +247,7 @@ class Detail extends Component { let currentIssue = pathname.indexOf(`/${owner}/${projectsId}/issues`) === -1; if (currentIssue) { cookie.save('states', undefined, { expires: 0, path: `/` }); + cookie.save('issuestates', undefined, { expires: 0, path: `/` }); } }