From e1164875b0930e6414b8547b2c2892d0dec364db Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 20 Jan 2021 11:39:00 +0800
Subject: [PATCH] update bug

---
 src/forge/DevOps/About.jsx             | 2 +-
 src/forge/DevOps/Dispose/Stage.jsx     | 4 ++--
 src/forge/DevOps/Dispose/StageItem.jsx | 4 ++--
 src/forge/DevOps/disposePipeline.jsx   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index 82bee8e7..35790f8d 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -190,7 +190,7 @@ function About(props, ref) {
                 <ServiceModal sureModal={sureModal}></ServiceModal>
               :""
             }
-            { typeFlag ?
+            { step === 0 && typeFlag ?
               <React.Fragment>
                 <Input.Password style={{display:'none'}} size="large" />
                 <Form style={{marginTop:"20px"}}>
diff --git a/src/forge/DevOps/Dispose/Stage.jsx b/src/forge/DevOps/Dispose/Stage.jsx
index 66118f85..ab94001f 100644
--- a/src/forge/DevOps/Dispose/Stage.jsx
+++ b/src/forge/DevOps/Dispose/Stage.jsx
@@ -75,9 +75,9 @@ function Stage({
     saveDatas(item);
   }
 
-  function deleteItem(id){
+  function deleteItem(id,key){
     setSaveFlag(true);
-    deleteStep(id);
+    deleteStep(id,key);
   }
   // 点击下一步时
   function nextStep(btn){
diff --git a/src/forge/DevOps/Dispose/StageItem.jsx b/src/forge/DevOps/Dispose/StageItem.jsx
index 40d84423..6a85d601 100644
--- a/src/forge/DevOps/Dispose/StageItem.jsx
+++ b/src/forge/DevOps/Dispose/StageItem.jsx
@@ -18,13 +18,13 @@ function StageItem({item, templates,saveItems,k, slideItems , deleteStep}){
   return(
     <div className="stepsItem">
       <FlexAJ className="stepsHead">
-        <span np={k}>{item.step_name}</span>
+        <span>{item.step_name}</span>
         <span className="color-grey-9">
           <Popconfirm
             title={"确定要删除这个步骤吗?"}
             okText="是"
             cancelText="否"
-            onConfirm={() => deleteStep(item.id)}
+            onConfirm={() => deleteStep(item.id,k)}
           ><a>
             <i className="iconfont iconlajitong1 font-14"></i></a>
           </Popconfirm>
diff --git a/src/forge/DevOps/disposePipeline.jsx b/src/forge/DevOps/disposePipeline.jsx
index af869398..0f644c2e 100644
--- a/src/forge/DevOps/disposePipeline.jsx
+++ b/src/forge/DevOps/disposePipeline.jsx
@@ -199,7 +199,7 @@ function disposePipeline(props){
     setStepName(pipeLineName+`-`+item[0].stage_name);
   }
   // 删除步骤
-  function deleteStep(id){
+  function deleteStep(id,index){
     if(id){
       const url =  `/ci/pipelines/${disposeId}/${stageId}/${id}/delete_step.json`;
       axios.delete(url).then(result=>{
@@ -209,7 +209,7 @@ function disposePipeline(props){
         }
       }).catch(error=>{})
     }else{
-      let d = datas.filter(s=>s.template_id !== undefined);
+      let d = datas.filter(s=>s.show_index !== (index+1));
       setDatas(d);
     }
   }