diff --git a/src/forge/DevOps/cardList/index.jsx b/src/forge/DevOps/cardList/index.jsx index d80a0a0fe..b1e857961 100644 --- a/src/forge/DevOps/cardList/index.jsx +++ b/src/forge/DevOps/cardList/index.jsx @@ -14,6 +14,10 @@ function CardDevops(props) { const [list, setList] = useState([]) const [ visible , setVisible ] = useState(false); +let settings = JSON.parse(localStorage.chromesetting); +let pipelineUrl = settings && settings.common.pipeline; + + useEffect(() => { const { author, name } = project || {} document.title = `流水线-${author && author.name}/${name}`; @@ -66,7 +70,7 @@ function CardDevops(props) { runPipeline( owner, projectsId, { ref: item.branch, workflow: item.file_name.split('/').pop() }).then(res => { if(res && res.status === 0) { message.success('运行成功!') - window.open(`http://localhost:8000/devops/${owner}/${projectsId}/${item.id}`) + window.open(`${ pipelineUrl }/devops/${owner}/${projectsId}/${item.id}`) } }) } @@ -112,7 +116,7 @@ function CardDevops(props) {
{ // window.location.href = `${mygetHelmetapi && mygetHelmetapi.common.zone}/${owner}/pipeline/${e.id}` - window.open(`http://localhost:8000/devops/${owner}/${projectsId}/${e.id}`) + window.open(`${ pipelineUrl }/devops/${owner}/${projectsId}/${e.id}`) }}>
{listType[e.pipeline_type]}
@@ -132,7 +136,7 @@ function CardDevops(props) {
run(e) }/> - window.open(`http://localhost:8000/devops/${owner}/${projectsId}/${e.id}/edit`) }/> + window.open(`${ pipelineUrl }/devops/${owner}/${projectsId}/${e.id}/edit`) }/> delPipelineFunc(e.id) }/>
diff --git a/src/forge/DevOps/cardList/newModal.jsx b/src/forge/DevOps/cardList/newModal.jsx index f43d086f6..1b642231c 100644 --- a/src/forge/DevOps/cardList/newModal.jsx +++ b/src/forge/DevOps/cardList/newModal.jsx @@ -26,12 +26,15 @@ const New =({ const { getFieldDecorator } = form; const {owner, projectsId} = match.params; - const [ loading, setLoading ] = useState(false); + // const [ loading, setLoading ] = useState(false); const [ pipelineType, setPipelineType ] = useState(pipType.code); const [ branchList, setBranchList] = useState([]); const [ templateList, setTemplateList ] = useState([]); const [ templateSelected, setTemplateSelected ] = useState(-1); + let settings = JSON.parse(localStorage.chromesetting); + let pipelineUrl = settings && settings.common.pipeline; + useEffect(() => { if(open){ getTemplates(); @@ -69,7 +72,7 @@ const New =({ if(res.id){ form.resetFields(); onOk() - window.open(`http://localhost:8000/devops/${owner}/${projectsId}/${res.id}/edit`) + window.open(`${ pipelineUrl }/devops/${owner}/${projectsId}/${res.id}/edit`) } }) }