diff --git a/react-ui/public/assets/images/fail-icon.png b/react-ui/public/assets/images/fail-icon.png new file mode 100644 index 00000000..da6c16cd Binary files /dev/null and b/react-ui/public/assets/images/fail-icon.png differ diff --git a/react-ui/public/assets/images/omitted-icon.png b/react-ui/public/assets/images/omitted-icon.png new file mode 100644 index 00000000..1c1f2e35 Binary files /dev/null and b/react-ui/public/assets/images/omitted-icon.png differ diff --git a/react-ui/public/assets/images/pending-icon.png b/react-ui/public/assets/images/pending-icon.png new file mode 100644 index 00000000..7f5ea74f Binary files /dev/null and b/react-ui/public/assets/images/pending-icon.png differ diff --git a/react-ui/public/assets/images/running-icon.png b/react-ui/public/assets/images/running-icon.png new file mode 100644 index 00000000..6182ada1 Binary files /dev/null and b/react-ui/public/assets/images/running-icon.png differ diff --git a/react-ui/public/assets/images/success-icon.png b/react-ui/public/assets/images/success-icon.png new file mode 100644 index 00000000..83ff96b7 Binary files /dev/null and b/react-ui/public/assets/images/success-icon.png differ diff --git a/react-ui/src/pages/Experiment/index.jsx b/react-ui/src/pages/Experiment/index.jsx index 2751ee34..2fd83114 100644 --- a/react-ui/src/pages/Experiment/index.jsx +++ b/react-ui/src/pages/Experiment/index.jsx @@ -21,6 +21,25 @@ const Experiment = React.FC = () => { "Skipped":'未执行', "Omitted":'未执行', } + const statusColorObj={ + "Running":'#165bff', + "Succeeded":'#63a728', + "Pending":'#f981eb', + "Failed":'#c73131', + "Error":'#c73131', + "Terminated":'#8a8a8a', + "Skipped":'#8a8a8a', + "Omitted":'#8a8a8ae', + } + const statusImgObj={ + 'Running':'/assets/images/running-icon.png', + 'Succeeded':'/assets/images/success-icon.png', + 'Pending':'/assets/images/pending-icon.png', + 'Failed':'/assets/images/fail-icon.png', + 'Terminated':'/assets/images/omitted-icon.png', + 'Skipped':'/assets/images/omitted-icon.png', + 'Omitted':'/assets/images/omitted-icon.png', + } const [experimentList, setExperimentList] = useState([]); const [workflowList, setWorkflowList] = useState([]); @@ -59,10 +78,11 @@ const Experiment = React.FC = () => { setExpandedRowKeys(val) if(ret.code==200&&ret.data&&ret.data.length>0){ setExperimentInList(ret.data) - + getList() } else{ setExperimentInList([]) + getList() } }) } @@ -160,7 +180,6 @@ const Experiment = React.FC = () => { if(ret.code==200){ message.success('运行成功') getQueryByExperiment(id) - getList() } else{ message.error('运行失败') @@ -230,8 +249,14 @@ const Experiment = React.FC = () => { }, { title: '最近五次运行状态', - dataIndex: 'state', - key: 'state', + dataIndex: 'status_list', + key: 'status_list', + render: (text) => { + + let newText=text&&text.replace(/\s+/g,'').split(',') + console.log(newText); + return <>{ newText&&newText.length>0?newText.map((item,index)=>{console.log(item,statusImgObj[item]); return }):null} + } }, { @@ -321,7 +346,7 @@ const Experiment = React.FC = () => { {experimentInList&&experimentInList.length>0?experimentInList.map((item,index)=>(
routerToText(e,item,record)}>{index+1} -
{statusObj[item.status]}
+
{statusObj[item.status]}
{item.finish_time?timers(new Date(item.finish_time).getTime()-new Date(item.create_time).getTime()):timers(new Date().getTime()-new Date(item.create_time).getTime())}
{momnet(item.create_time).format('YYYY-MM-DD HH:mm:ss')}
diff --git a/react-ui/src/pages/Experiment/index.less b/react-ui/src/pages/Experiment/index.less index 701c4cbd..b015521e 100644 --- a/react-ui/src/pages/Experiment/index.less +++ b/react-ui/src/pages/Experiment/index.less @@ -32,4 +32,16 @@ font-size:15px; padding: 0 65px 0 40px; +} +.statusBox{ + display: flex; + align-items: center; + + .statusIcon{ + visibility: hidden; + transition: all 0.2s; + } +} +.statusBox:hover .statusIcon{ + visibility: visible; } \ No newline at end of file diff --git a/react-ui/src/pages/Pipeline/editPipeline/index.jsx b/react-ui/src/pages/Pipeline/editPipeline/index.jsx index 087f26af..c3f37b14 100644 --- a/react-ui/src/pages/Pipeline/editPipeline/index.jsx +++ b/react-ui/src/pages/Pipeline/editPipeline/index.jsx @@ -13,6 +13,7 @@ import { useNavigate} from 'react-router-dom'; const editPipeline = React.FC = () => { const propsRef=useRef() const navgite=useNavigate(); + const [contextMenu,setContextMenu]=useState({}) const locationParams =useParams () //新版本获取路由参数接口 let graph=null const pipelineContainer = useEmotionCss(() => { @@ -30,6 +31,7 @@ const editPipeline = React.FC = () => { }; }); const graphRef=useRef() + const onDragEnd=(val)=>{ console.log(val,'eee'); const _x = val.x @@ -117,9 +119,49 @@ const editPipeline = React.FC = () => { // graph.render() }) } + const handlerContextMenu=(e)=> { + e.stopPropagation(); + // this.menuType = e.item._cfg.type; + } + const initMenu=()=> { + // const selectedNodes = this.selectedNodes; + setContextMenu(new G6.Menu({ + getContent(evt) { + console.log(11111, evt); + + let ul = `