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 }) => { {data && truncateCommitId(data.build_after_sha)} - + {data && data.stages ? data.stages.map((item, key) => { return item.steps && item.steps.length > 0 ? { {item.name} } - key={key} + key={`${key}`} > {item.steps.map((i, k) => { return ( - clickSub(e,item.number,i.id)}> + clickSub(e,item.number,i.id)}> {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) => {