Commit 0580c640 by zhaochengxiang

bug fix

parent c4ce3bc9
import React from "react"
import { Modal, Typography } from 'antd'
const FC = ({ visible, item, onCancel }) => {
const close = () => {
onCancel?.()
}
return (
<Modal
title='任务异常信息'
width={600}
visible={visible}
footer={null}
onCancel={close}
bodyStyle={{
height: 400,
overflow: 'auto'
}}
>
<Typography.Paragraph>{item?.errorMsg}</Typography.Paragraph>
</Modal>
)
}
export default FC
\ No newline at end of file
import React from 'react' import React from 'react'
import { Space, Input, Select, DatePicker, Typography, Tooltip, Modal } from 'antd' import { Space, Input, Select, DatePicker, Typography, Tooltip, Modal, Button } from 'antd'
import { useDebounceEffect } from 'ahooks' import { useDebounceEffect } from 'ahooks'
import { defaultPage } from '../../../util/hooks/page' import { defaultPage } from '../../../util/hooks/page'
...@@ -8,6 +8,7 @@ import Table from '../../../util/Component/Table' ...@@ -8,6 +8,7 @@ import Table from '../../../util/Component/Table'
import UpdateTask from './update-task' import UpdateTask from './update-task'
import ResultDetail from './result-detail' import ResultDetail from './result-detail'
import Log from './log' import Log from './log'
import Error from './error'
import '../AssetTask/index.less' import '../AssetTask/index.less'
import { showMessage } from '../../../util' import { showMessage } from '../../../util'
...@@ -39,6 +40,10 @@ const FC = (props) => { ...@@ -39,6 +40,10 @@ const FC = (props) => {
visible: false, visible: false,
item: undefined, item: undefined,
}) })
const [errorParams, setErrorParams] = React.useState({
visible: false,
item: undefined
})
const [rightRow, setRightRow] = React.useState() const [rightRow, setRightRow] = React.useState()
const [modal, contextHolder] = Modal.useModal() const [modal, contextHolder] = Modal.useModal()
...@@ -58,9 +63,19 @@ const FC = (props) => { ...@@ -58,9 +63,19 @@ const FC = (props) => {
}, [args], { wait:300 }) }, [args], { wait:300 })
const menuData = React.useMemo(() => { const menuData = React.useMemo(() => {
if (rightRow) { if (rightRow?.runStateId === 'STARTED') {
return rightRow?.runStateId === 'STARTED' ? ['执行日志', '取消'] : ['执行日志', '执行结果', '重跑'] return ['执行日志', '取消']
}
if (rightRow?.runStateId === 'DONE') {
return ['执行日志', '执行结果', '重跑']
}
if (rightRow?.runStateId === 'ERROR') {
return ['执行日志', '异常信息', '重跑']
}
if (rightRow?.runStateId === 'CANCEL') {
return ['执行日志', '重跑']
} }
return [] return []
}, [rightRow]) }, [rightRow])
...@@ -156,6 +171,10 @@ const FC = (props) => { ...@@ -156,6 +171,10 @@ const FC = (props) => {
}) })
} }
const onRefreshClick = () => {
getResults()
}
const onRightMenuItemClick = (key, record) => { const onRightMenuItemClick = (key, record) => {
if (key === '执行日志') { if (key === '执行日志') {
setLogParams({ setLogParams({
...@@ -205,13 +224,18 @@ const FC = (props) => { ...@@ -205,13 +224,18 @@ const FC = (props) => {
}) })
} }
}) })
} else if (key === '异常信息') {
setErrorParams({
visible: true,
item: record
})
} }
} }
return ( return (
<div className='task-manage'> <div className='task-manage'>
<div className='header px-3'> <div className='header px-3'>
<div /> <Button onClick={onRefreshClick}>刷新</Button>
<Space> <Space>
<DatePicker.RangePicker <DatePicker.RangePicker
format="YYYY-MM-DD" format="YYYY-MM-DD"
...@@ -271,6 +295,15 @@ const FC = (props) => { ...@@ -271,6 +295,15 @@ const FC = (props) => {
}) })
}} }}
/> />
<Error
{...errorParams}
onCancel={() => {
setErrorParams({
visible: false,
item: undefined,
})
}}
/>
<UpdateTask <UpdateTask
{...updateTaskParams} {...updateTaskParams}
onCancel={(refresh) => { onCancel={(refresh) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment