From 942e88a6eaee0eb2033d04a503b9b0d681c961b1 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 9 Sep 2020 16:50:48 +0800
Subject: [PATCH] selectkeys

---
 src/forge/DevOps/OpsDetailLeftpanel.jsx  |  7 ++++---
 src/forge/DevOps/OpsDetailRightpanel.jsx | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/forge/DevOps/OpsDetailLeftpanel.jsx b/src/forge/DevOps/OpsDetailLeftpanel.jsx
index 2df2d0a4..1cf5d552 100644
--- a/src/forge/DevOps/OpsDetailLeftpanel.jsx
+++ b/src/forge/DevOps/OpsDetailLeftpanel.jsx
@@ -19,6 +19,7 @@ const Img = styled.img`
 export default ({ data, repeatSet , chooseSteps }) => {
   const [tamp, setTamp] = useState(undefined);
   const [sha, setSha] = useState(undefined);
+  const [keys, setKeys] = useState(0);
   useEffect(() => {
     if (data && data.started) {
       let t = parseInt(data.started) * 1000;
@@ -93,7 +94,7 @@ export default ({ data, repeatSet , chooseSteps }) => {
           <span className="branchsha">{data && truncateCommitId(data.build_after_sha)}</span>
         </AlignCenter>
       </div>
-      <Menu mode="inline" className="leftMenu" defaultSelectedKeys={[0]}>
+      <Menu mode="inline" className="leftMenu" defaultOpenKeys={[`0`]} defaultSelectedKeys={[`${keys}`]}>
         {data && data.stages ? data.stages.map((item, key) => {
             return item.steps && item.steps.length > 0 ?
               <SubMenu
@@ -103,11 +104,11 @@ export default ({ data, repeatSet , chooseSteps }) => {
                     <span>{item.name}</span>
                   </div>
                 }
-                key={key}
+                key={`${key}`}
               >
                 {item.steps.map((i, k) => {
                   return (
-                    <Menu.Item onClick={(e)=>clickSub(e,item.number,i.id)}>
+                    <Menu.Item key={`${k}`} onClick={(e)=>clickSub(e,item.number,i.id)}>
                       <FlexAJ>
                         <span>
                           {i.name} {i.status ? TagsLine(i.status) : ""}
diff --git a/src/forge/DevOps/OpsDetailRightpanel.jsx b/src/forge/DevOps/OpsDetailRightpanel.jsx
index 0dec667d..1e0ed86a 100644
--- a/src/forge/DevOps/OpsDetailRightpanel.jsx
+++ b/src/forge/DevOps/OpsDetailRightpanel.jsx
@@ -35,9 +35,15 @@ export default ({
           : p[0];
 
         setStep(sub);
-        if (sub) {
+        if (sub && sub.status !== "skipped") {
           getStep(pre.number, sub.number);
         }
+        // 如果状态是skipped就不用去调用接口查询对应的out信息了
+        if(sub.status === "skipped"){
+          setCoders(undefined);
+          setEmpty(true);
+          setSpining(false);
+        }
       } else {
         setSpining(false);
       }
@@ -51,8 +57,6 @@ export default ({
         if (result) {
           setCoders(result.data);
           setSpining(false);
-        } else {
-          setEmpty(true);
         }
       })
       .catch((error) => {