diff --git a/src/forge/DevOps/Dispose/List.jsx b/src/forge/DevOps/Dispose/List.jsx index 90e6b8be..76896b63 100644 --- a/src/forge/DevOps/Dispose/List.jsx +++ b/src/forge/DevOps/Dispose/List.jsx @@ -46,7 +46,7 @@ function List({ list, permission , projectsId , owner , showModal , deleteFunc } 删除 } - 查看运行记录 + 查看运行记录 ) } diff --git a/src/forge/DevOps/Dispose/menus.jsx b/src/forge/DevOps/Dispose/menus.jsx index 65778bb2..40b0c9db 100644 --- a/src/forge/DevOps/Dispose/menus.jsx +++ b/src/forge/DevOps/Dispose/menus.jsx @@ -27,7 +27,7 @@ function Menus({step,changeStep, menuList , renameFunc , checkDatas , addFunc }) - { key !== (menuList.length-1) && menuList.length <= 7 ? + { key !== (menuList.length-1) && menuList.length < 7 ? :"" } diff --git a/src/forge/DevOps/Dispose/menusAdd.jsx b/src/forge/DevOps/Dispose/menusAdd.jsx index 27e610a1..a7b16466 100644 --- a/src/forge/DevOps/Dispose/menusAdd.jsx +++ b/src/forge/DevOps/Dispose/menusAdd.jsx @@ -24,6 +24,7 @@ function menusAdd ({ getName , checkDatas , k }){ if(value){ getName(value , index); } + setValue(undefined); setShow(false); setPut(false); } diff --git a/src/forge/DevOps/disposePipeline.jsx b/src/forge/DevOps/disposePipeline.jsx index 3b4c9a71..af869398 100644 --- a/src/forge/DevOps/disposePipeline.jsx +++ b/src/forge/DevOps/disposePipeline.jsx @@ -7,7 +7,6 @@ import Init from './Dispose/Init'; import Sure from './Dispose/Sure'; import Stage from './Dispose/Stage'; import axios from 'axios'; -import { data } from 'autoprefixer'; function disposePipeline(props){ const [ spining , setSpining ] = useState(true); @@ -185,16 +184,16 @@ function disposePipeline(props){ // 上一步、下一步 function enters(btn){ - let s; + let s = stage; if(btn === "next"){ // 点击阶段里面的下一步 - s = stage+1; + s = s+1; }else{ // 上一步 - s = stage-1; + s = s-1; } let item = menuList && menuList.filter(i=>i.show_index === (s)); - setStage(item[0].show_index); + setStage(s); setStageType(item[0].stage_type); setStageId(item[0].id); setStepName(pipeLineName+`-`+item[0].stage_name); @@ -247,12 +246,13 @@ function disposePipeline(props){ let nextStageType = next && next.length>0 && next[0].stage_type; const url = `/ci/pipelines/${disposeId}/${stageId}/delete_stage.json`; axios.delete(url,{ - show_index:stage + params:{show_index:stage} }).then(result=>{ if(result && result.data){ - props.showNotification("阶段删除成功!"); getData(stage-1); setStageType(nextStageType); + }else{ + props.showNotification("阶段删除失败!"); } }).catch(error=>{}) }