diff --git a/src/forge/Issues/Component/datas.jsx b/src/forge/Issues/Component/datas.jsx index b226e0e4..5f6538b6 100644 --- a/src/forge/Issues/Component/datas.jsx +++ b/src/forge/Issues/Component/datas.jsx @@ -68,13 +68,14 @@ function Datas({checkbox ,item , projectsId,owner}){ item.assigners && item.assigners.length > 0 ?
1 ?"principal hovers":"principal"}> - { + {/* { item.assigners.map((i,k)=>{ return( k<5 && ) }) - } + } */} + {renderName(item.assigners)}
:"" diff --git a/src/forge/Issues/Pages/details.jsx b/src/forge/Issues/Pages/details.jsx index d4de52b5..d031695a 100644 --- a/src/forge/Issues/Pages/details.jsx +++ b/src/forge/Issues/Pages/details.jsx @@ -372,48 +372,50 @@ function Details(props){ /> : -
-
-
-
- {details.priority && { details.priority.name } } -

{details.subject}

-
-
-
- #{details.project_issues_index} +
+
+
+
+
+ {details.priority && { details.priority.name } } +

{details.subject}

- { - details.author && -
- {details.author.name} - 添加于{details.created_at} +
+
+ #{details.project_issues_index}
- } + { + details.author && +
+ {details.author.name} + 添加于{details.created_at} +
+ } +
+ { + details.user_permission && + + } +
+
+ {details.description ? + + : + 暂无描述 + } + {details.attachments && details.attachments.length > 0 ? + + : "" + }
- { - details.user_permission && - - } -
-
- {details.description ? - - : - 暂无描述 - } - {details.attachments && details.attachments.length > 0 ? - - : "" - }
{setCommentReload(Math.random())}}/> diff --git a/src/forge/Issues/Pages/list.jsx b/src/forge/Issues/Pages/list.jsx index ee4abe1c..37d5ba3a 100644 --- a/src/forge/Issues/Pages/list.jsx +++ b/src/forge/Issues/Pages/list.jsx @@ -79,12 +79,12 @@ function List(props){ useEffect(()=>{ let v = allValue && allValue > 0; - if((updateIds && !v && (updateIds.author_id || updateIds.issue_priorities_id || updateIds.issue_tag_ids || updateIds.milestone_id || updateIds.sort_by || updateIds.status_id ||updateIds.assigner_id)) || value){ + if((updateIds && !v && (updateIds.author_id || updateIds.issue_priorities_id || updateIds.issue_tag_ids || updateIds.milestone_id || updateIds.sort_by || updateIds.status_id ||updateIds.assigner_id)) || value || end_date || begin_date){ setClearFlag(true); }else{ setClearFlag(false); } - },[updateIds,value,allValue]) + },[updateIds,value,allValue,begin_date,end_date]) // 自定义一个初始不更新的hook const useUpdateEffect = (fn, inputs) => { const didMountRef = useRef(false); @@ -191,7 +191,9 @@ function List(props){ setAllValue([]); setValue(undefined); setNames(undefined); - !value && Init(); + setEnd(undefined); + setBegin(undefined); + (!value || begin_date || end_date ) && Init(); // 清除下拉选项 menuRef.current && menuRef.current.clearChoose(); } @@ -349,13 +351,13 @@ function List(props){ }
- - + */} { permission && permission !== "Reporter" && 标记管理 diff --git a/src/forge/Issues/index.scss b/src/forge/Issues/index.scss index b2fe7a46..fed5f1a6 100644 --- a/src/forge/Issues/index.scss +++ b/src/forge/Issues/index.scss @@ -267,32 +267,35 @@ color: #40424a; .principal{ position: relative; - height: 22px; - &.hovers:hover{ - a{ - position:initial; - } - } - a{ - position: absolute; - right: 0px; - transition: 0.6s; - } - img,span{ - width: 22px; - height: 22px; - border-radius: 50%; - } - span{ - background-color:#ced5ef; - text-align: center; - line-height: 12px; - color:#000000; - z-index: 6; - } + display: flex; + justify-content: flex-end; + width: 150px; + text-align: justify; + // &.hovers:hover{ + // a{ + // position:initial; + // } + // } + // a{ + // position: absolute; + // right: 0px; + // transition: 0.6s; + // } + // img,span{ + // width: 22px; + // height: 22px; + // border-radius: 50%; + // } + // span{ + // background-color:#ced5ef; + // text-align: center; + // line-height: 12px; + // color:#000000; + // z-index: 6; + // } } &>div{ - width: 110px; + width: 90px; text-align: right; } .commentnum{