diff --git a/src/forge/Divert/DivertModal.jsx b/src/forge/Divert/DivertModal.jsx index dd9475010..3ff4439d4 100644 --- a/src/forge/Divert/DivertModal.jsx +++ b/src/forge/Divert/DivertModal.jsx @@ -152,18 +152,18 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){ } - + {getFieldDecorator("identifier", { rules:[ - {required:true,message:"请输入仓库名称"}, + {required:true,message:"请输入仓库标识!"}, { validator:checkIdentifier } ] } )( - + )} diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 4ac186321..cfe3c6a8d 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -359,7 +359,7 @@ function CoderDepot(props){ { - baseOperate && + baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&&
{ projectDetail.type !== 2 && pullsFlag && diff --git a/src/forge/Notice/Index.jsx b/src/forge/Notice/Index.jsx index 94c63804e..63d097486 100644 --- a/src/forge/Notice/Index.jsx +++ b/src/forge/Notice/Index.jsx @@ -70,9 +70,9 @@ function Index(props){ function deleteEvent(type,count) { let c = count; if(type==="apply"){ - setApplyCount(applyCount-count); + setTransferCount(transferCount-count); }else if(type==="undo"){ - setTransferCount(applyCount-count); + setApplyCount(applyCount-count); }else{ setMessagesCount(0); c = messagesCount; diff --git a/src/forge/Notice/UndoEvent.jsx b/src/forge/Notice/UndoEvent.jsx index c8c579dc1..d93a1f83a 100644 --- a/src/forge/Notice/UndoEvent.jsx +++ b/src/forge/Notice/UndoEvent.jsx @@ -53,7 +53,7 @@ function UndoEvent(props){ Axios.post(url).then(result=>{ if(result && result.data){ getList(); - props && props.deleteEvent("undo",1); + props && props.deleteEvent("apply",1); } }).catch(error=>{}) }