Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
szse
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaochengxiang
szse
Commits
f3377bb8
Commit
f3377bb8
authored
Jun 30, 2022
by
zhaochengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据源管理增加取消抽取任务
parent
9c29f086
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
8 deletions
+42
-8
datasource.js
src/model/datasource.js
+4
-0
datasourcemanager.js
src/service/datasourcemanager.js
+4
-0
TaskItem.jsx
src/view/Manage/DatasourceManage/Component/TaskItem.jsx
+13
-8
index.jsx
src/view/Manage/DatasourceManage/index.jsx
+21
-0
No files found.
src/model/datasource.js
View file @
f3377bb8
...
@@ -60,6 +60,10 @@ export function* startTask(payload) {
...
@@ -60,6 +60,10 @@ export function* startTask(payload) {
return
yield
call
(
service
.
startTask
,
payload
);
return
yield
call
(
service
.
startTask
,
payload
);
}
}
export
function
*
cancelTask
(
payload
)
{
return
yield
call
(
service
.
cancelTask
,
payload
);
}
export
function
*
getTaskReportSummary
(
payload
)
{
export
function
*
getTaskReportSummary
(
payload
)
{
return
yield
call
(
service
.
getTaskReportSummary
,
payload
);
return
yield
call
(
service
.
getTaskReportSummary
,
payload
);
}
}
...
...
src/service/datasourcemanager.js
View file @
f3377bb8
...
@@ -56,6 +56,10 @@ export function startTask(payload) {
...
@@ -56,6 +56,10 @@ export function startTask(payload) {
return
PostJSON
(
"/metadataharvester/task/startHarvestingTask"
,
payload
);
return
PostJSON
(
"/metadataharvester/task/startHarvestingTask"
,
payload
);
}
}
export
function
cancelTask
(
payload
)
{
return
PostJSON
(
"/metadataharvester/task/cancelHarvestingTask"
,
payload
);
}
export
function
getTaskReportSummary
(
payload
)
{
export
function
getTaskReportSummary
(
payload
)
{
return
GetJSON
(
"/metadataharvester/task/getTaskReportSummary"
,
payload
);
return
GetJSON
(
"/metadataharvester/task/getTaskReportSummary"
,
payload
);
}
}
...
...
src/view/Manage/DatasourceManage/Component/TaskItem.jsx
View file @
f3377bb8
import
React
,
{
useContext
}
from
'react'
;
import
React
,
{
useContext
}
from
'react'
;
import
{
Card
,
Typography
,
Space
,
Button
,
Tooltip
,
Progress
}
from
'antd'
;
import
{
Card
,
Typography
,
Space
,
Button
,
Tooltip
,
Progress
}
from
'antd'
;
import
{
EditOutlined
,
DeleteOutlined
,
DatabaseOutlined
,
FileOutlined
,
ScheduleOutlined
}
from
'@ant-design/icons'
;
import
{
EditOutlined
,
DeleteOutlined
,
DatabaseOutlined
,
FileOutlined
,
ScheduleOutlined
,
StopOutlined
}
from
'@ant-design/icons'
;
import
{
DatasourceContext
}
from
'./ContextManager'
;
import
{
DatasourceContext
}
from
'./ContextManager'
;
import
'./TaskItem.less'
;
import
'./TaskItem.less'
;
...
@@ -8,12 +8,12 @@ import './TaskItem.less';
...
@@ -8,12 +8,12 @@ import './TaskItem.less';
const
TaskItem
=
(
props
)
=>
{
const
TaskItem
=
(
props
)
=>
{
const
{
data
}
=
props
;
const
{
data
}
=
props
;
const
{
onStartTask
,
onLogTask
,
onEditTask
,
onDeleteTask
,
onScheduleShow
,
tasksProgress
}
=
useContext
(
DatasourceContext
);
const
{
onStartTask
,
on
CancelTask
,
on
LogTask
,
onEditTask
,
onDeleteTask
,
onScheduleShow
,
tasksProgress
}
=
useContext
(
DatasourceContext
);
let
disableEdi
t
=
false
,
editTip
=
'修改'
;
let
isExtrac
t
=
false
,
editTip
=
'修改'
;
if
(
tasksProgress
&&
tasksProgress
[
data
.
id
]
!==
null
&&
tasksProgress
[
data
.
id
]
!==
undefined
)
{
if
(
tasksProgress
&&
tasksProgress
[
data
.
id
]
!==
null
&&
tasksProgress
[
data
.
id
]
!==
undefined
)
{
disableEdi
t
=
true
;
isExtrac
t
=
true
;
editTip
=
'正在抽取中,不允许修改任务'
;
editTip
=
'正在抽取中,不允许修改任务'
;
}
}
...
@@ -44,14 +44,19 @@ const TaskItem = (props) => {
...
@@ -44,14 +44,19 @@ const TaskItem = (props) => {
<
Tooltip
placement=
'bottom'
title=
'定时调度'
>
<
Tooltip
placement=
'bottom'
title=
'定时调度'
>
<
Button
icon=
{
<
ScheduleOutlined
/>
}
size=
'small'
onClick=
{
()
=>
{
onScheduleShow
&&
onScheduleShow
(
data
);
}
}
/>
<
Button
icon=
{
<
ScheduleOutlined
/>
}
size=
'small'
onClick=
{
()
=>
{
onScheduleShow
&&
onScheduleShow
(
data
);
}
}
/>
</
Tooltip
>
</
Tooltip
>
<
Tooltip
placement=
'bottom'
title=
'抽取'
>
{
<
Button
icon=
{
<
DatabaseOutlined
/>
}
size=
'small'
onClick=
{
()
=>
{
onStartTask
&&
onStartTask
(
data
);
}
}
/>
isExtract
?
<
Tooltip
placement=
'bottom'
title=
'取消抽取'
>
</
Tooltip
>
<
Button
icon=
{
<
StopOutlined
/>
}
size=
'small'
onClick=
{
()
=>
{
onCancelTask
&&
onCancelTask
(
data
);
}
}
/>
</
Tooltip
>
:
<
Tooltip
placement=
'bottom'
title=
'抽取'
>
<
Button
icon=
{
<
DatabaseOutlined
/>
}
size=
'small'
onClick=
{
()
=>
{
onStartTask
&&
onStartTask
(
data
);
}
}
/>
</
Tooltip
>
}
<
Tooltip
placement=
'bottom'
title=
'日志'
>
<
Tooltip
placement=
'bottom'
title=
'日志'
>
<
Button
icon=
{
<
FileOutlined
/>
}
size=
'small'
onClick=
{
()
=>
{
onLogTask
&&
onLogTask
(
data
);
}
}
/>
<
Button
icon=
{
<
FileOutlined
/>
}
size=
'small'
onClick=
{
()
=>
{
onLogTask
&&
onLogTask
(
data
);
}
}
/>
</
Tooltip
>
</
Tooltip
>
<
Tooltip
placement=
'bottom'
title=
{
editTip
}
>
<
Tooltip
placement=
'bottom'
title=
{
editTip
}
>
<
Button
icon=
{
<
EditOutlined
/>
}
size=
'small'
disabled=
{
disableEdi
t
}
onClick=
{
()
=>
{
onEditTask
&&
onEditTask
(
data
);
}
}
/>
<
Button
icon=
{
<
EditOutlined
/>
}
size=
'small'
disabled=
{
isExtrac
t
}
onClick=
{
()
=>
{
onEditTask
&&
onEditTask
(
data
);
}
}
/>
</
Tooltip
>
</
Tooltip
>
<
Tooltip
placement=
'bottom'
title=
'删除'
>
<
Tooltip
placement=
'bottom'
title=
'删除'
>
<
Button
icon=
{
<
DeleteOutlined
/>
}
size=
'small'
onClick=
{
()
=>
{
onDeleteTask
&&
onDeleteTask
(
data
);
}
}
/>
<
Button
icon=
{
<
DeleteOutlined
/>
}
size=
'small'
onClick=
{
()
=>
{
onDeleteTask
&&
onDeleteTask
(
data
);
}
}
/>
...
...
src/view/Manage/DatasourceManage/index.jsx
View file @
f3377bb8
...
@@ -293,6 +293,26 @@ const DatasourceManage = (props) => {
...
@@ -293,6 +293,26 @@ const DatasourceManage = (props) => {
});
});
}
}
const
cancelTask
=
(
task
)
=>
{
modal
.
confirm
({
title
:
'是否取消该任务?'
,
content
:
''
,
onOk
:
()
=>
{
dispatch
({
type
:
'datasource.cancelTask'
,
payload
:
{
params
:
{
harvestingTaskId
:
task
.
id
}
},
callback
:
()
=>
{
}
});
}
});
}
const
editTask
=
(
task
)
=>
{
const
editTask
=
(
task
)
=>
{
setCurrentTaskId
(
task
.
id
);
setCurrentTaskId
(
task
.
id
);
setCurrentDatasourceId
(
task
.
target
.
id
||
''
);
setCurrentDatasourceId
(
task
.
target
.
id
||
''
);
...
@@ -343,6 +363,7 @@ const DatasourceManage = (props) => {
...
@@ -343,6 +363,7 @@ const DatasourceManage = (props) => {
refreshTasksSuccess
:
refreshTasksSuccess
,
refreshTasksSuccess
:
refreshTasksSuccess
,
onScheduleShow
:
scheduleShow
,
onScheduleShow
:
scheduleShow
,
onStartTask
:
startTask
,
onStartTask
:
startTask
,
onCancelTask
:
cancelTask
,
onLogTask
:
logTask
,
onLogTask
:
logTask
,
onEditTask
:
editTask
,
onEditTask
:
editTask
,
onDeleteTask
:
deleteTask
,
onDeleteTask
:
deleteTask
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment