diff --git a/src/forge/DevOps/Dispose/List.jsx b/src/forge/DevOps/Dispose/List.jsx index 32bf5d8d6..7abf12d0a 100644 --- a/src/forge/DevOps/Dispose/List.jsx +++ b/src/forge/DevOps/Dispose/List.jsx @@ -10,8 +10,42 @@ const STATUS = { killed:"已撤销", pending:"准备中" } +function renderTableStatus(status) { + switch (status) { + case "running": + return ( + + 运行中 + + ); + case "failure": case 'error': + return ( + + 未通过 + + ); + case "success": + return ( + + 已通过 + + ); + case 'killed': + return ( + + 已撤销 + + ); + case 'pending': + return ( + + 准备中 + + ); + } +} function List({ list, operate , projectsId , owner , showModal , deleteFunc }){ - + const columns = [ { title:"流水线名称", @@ -61,10 +95,10 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){ title:"最近构建状态", dataIndex:"pipeline_status", key:1, - width:"10%", + width:"12%", ellipsis:true, render:(txt)=>{ - return(STATUS[txt]) + return renderTableStatus(txt) } }, { diff --git a/src/forge/DevOps/Infos.jsx b/src/forge/DevOps/Infos.jsx index 8370dfaa6..b5220138d 100644 --- a/src/forge/DevOps/Infos.jsx +++ b/src/forge/DevOps/Infos.jsx @@ -1,9 +1,8 @@ -import React , { useEffect , useState , useRef } from 'react'; +import React , { useEffect , useState } from 'react'; import { Banner } from '../Component/layout'; import { Link } from 'react-router-dom'; import Dispost from './Dispose'; -import Structure from './Structure'; import styled from 'styled-components'; @@ -11,22 +10,11 @@ const Div = styled.div`{ padding:24px 30px; }`; export default ((props)=>{ - const [ menu , setMenu ] = useState(false); const [ permission , setPermission ] = useState(""); - const childRef = useRef(); - const path = props.location.pathname; const owner = props.match.params.owner; - const projectsId = props.match.params.projectsId; const projectDetail = props.projectDetail; - useEffect(()=>{ - if(path === `/projects/${owner}/${projectsId}/devops/list`){ - setMenu(true); - }else{ - setMenu(false); - } - },[path]) useEffect(()=>{ if(projectDetail){ @@ -34,22 +22,13 @@ export default ((props)=>{ } },[projectDetail]) - const updateChildState = () => { - // changeVal就是子组件暴露给父组件的方法 - if (childRef.current) { - childRef.current.changeVal(); - } - } return(
{ permission !=="Reporter" && 工作流配置} - {/* 构建列表 */} - {/* { menu===true && 刷新} */}
- {/* { menu === true && childRef.current = form} ref={childRef}/> } */}
diff --git a/src/forge/DevOps/Manage/Params.jsx b/src/forge/DevOps/Manage/Params.jsx index f6a980251..7cb55276e 100644 --- a/src/forge/DevOps/Manage/Params.jsx +++ b/src/forge/DevOps/Manage/Params.jsx @@ -88,7 +88,6 @@ function Params(props){ ...values,id }).then(result=>{ if(result){ - CancelFunc(); props.showNotification(`${id ? '参数编辑':"新增参数"}成功!`); Init(); } diff --git a/src/forge/DevOps/Manage/ParamsNew.jsx b/src/forge/DevOps/Manage/ParamsNew.jsx index 0464faaa6..97d41f277 100644 --- a/src/forge/DevOps/Manage/ParamsNew.jsx +++ b/src/forge/DevOps/Manage/ParamsNew.jsx @@ -29,15 +29,23 @@ function ParamsNew({ form , visble,successFunc,CancelFunc ,editList }){ validateFields((error,values)=>{ if(!error){ successFunc(values,editList && editList.id); + onCancelFunc(); } }) } + function onCancelFunc(){ + setFieldsValue({ + name:undefined, + data:undefined + }) + CancelFunc(); + } return(