From e65a1debc51ec95bf7c519e524b0e47c503d80ed Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 1 Feb 2021 15:28:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/DevOps/Dispose.jsx | 2 +- src/forge/DevOps/Dispose/List.jsx | 8 ++++++-- src/forge/DevOps/disposePipeline.jsx | 5 ++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx index 24b49141f..65db7a78b 100644 --- a/src/forge/DevOps/Dispose.jsx +++ b/src/forge/DevOps/Dispose.jsx @@ -39,7 +39,7 @@ function Dispose(props){ const url = `/ci/pipelines/list.json`; axios.get(url,{ params:{ - identifier:projectsId, + identifier:projectsId,owner, page,limit } }).then(result=>{ diff --git a/src/forge/DevOps/Dispose/List.jsx b/src/forge/DevOps/Dispose/List.jsx index 6550b77f9..ebaac4b0f 100644 --- a/src/forge/DevOps/Dispose/List.jsx +++ b/src/forge/DevOps/Dispose/List.jsx @@ -29,8 +29,12 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){ dataIndex:"file_name", key:1, width:"15%", - className:"color-blue", - ellipsis:true + ellipsis:true, + render:(value,item)=>{ + return( + {value} + ) + } }, { title:"触发分支", diff --git a/src/forge/DevOps/disposePipeline.jsx b/src/forge/DevOps/disposePipeline.jsx index f39f7e6f1..1da142f64 100644 --- a/src/forge/DevOps/disposePipeline.jsx +++ b/src/forge/DevOps/disposePipeline.jsx @@ -34,7 +34,7 @@ function disposePipeline(props){ function InitTemplates(){ const url = `/ci/templates/templates_by_stage.json`; axios.get(url,{ - params:{ stage_type:stageType } + params:{ stage_type:stageType, id:disposeId } }).then(result=>{ if(result && result.data){ setTemplates(result.data); @@ -261,9 +261,8 @@ function disposePipeline(props){ // 确认提交 function sureSubmit(){ setLoading(true); - const { defaultBranch } = props; let params = { - branch: defaultBranch, + branch: datas.branch, content:datas.content, filepath:'.trustie-pipeline.yml', message:'',