Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
bkunyun
Project
Project
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
sunyihao
bkunyun
Commits
19848612
Commit
19848612
authored
Jun 28, 2022
by
chenshouchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 完成任务详情联调
parent
19af5d31
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
128 additions
and
7 deletions
+128
-7
api_manager.ts
src/api/api_manager.ts
+1
-0
project_api.ts
src/api/project_api.ts
+9
-0
index.module.css
src/views/Project/ProjectJobDetail/index.module.css
+99
-4
index.tsx
src/views/Project/ProjectJobDetail/index.tsx
+0
-0
index.tsx
src/views/Project/ProjectSubmitWork/ConfigForm/index.tsx
+1
-1
index.tsx
src/views/Project/ProjectSubmitWork/index.tsx
+1
-1
interface.ts
src/views/Project/ProjectSubmitWork/interface.ts
+16
-0
index.tsx
src/views/Project/components/Flow/index.tsx
+1
-1
No files found.
src/api/api_manager.ts
View file @
19848612
...
...
@@ -35,6 +35,7 @@ const RESTAPI = {
API_WORKBENCH_DEL_WORKFLOWJOB
:
`
${
BACKEND_API_URI_PREFIX
}
/cpp/workflow/job/`
,
//删除工作流任务
API_WORKBENCH_CANCEL_WORKFLOWJOB
:
`
${
BACKEND_API_URI_PREFIX
}
/cpp/workflow/cancel`
,
//取消工作流
API_SUBMIT_WORKFLOW
:
`
${
BACKEND_API_URI_PREFIX
}
/cpp/workflow/submit`
,
//提交工作流
API_WORKBENCH_WORKFLOW_TASKINFO
:
`
${
BACKEND_API_URI_PREFIX
}
/cpp/workbench/workflowjob/task-info`
,
//查询任务某个算子详情
};
export
default
RESTAPI
;
src/api/project_api.ts
View file @
19848612
...
...
@@ -235,6 +235,14 @@ const submitWorkFlow = (params: submitWorkFlowParams) => {
});
};
// 查询任务某个算子详情
const
getworkFlowTaskInfo
=
(
params
:
{
jobId
:
string
;
taskId
:
string
})
=>
{
return
request
({
url
:
`
${
Api
.
API_WORKBENCH_WORKFLOW_TASKINFO
}
?jobId=
${
params
.
jobId
}
&taskId=
${
params
.
taskId
}
`
,
method
:
"get"
,
});
};
export
{
current
,
menu
,
...
...
@@ -254,4 +262,5 @@ export {
fetchTemplateConfigInfo
,
fetchWorkFlowJob
,
submitWorkFlow
,
getworkFlowTaskInfo
,
};
src/views/Project/ProjectJobDetail/index.module.css
View file @
19848612
...
...
@@ -31,8 +31,6 @@
font-size
:
14px
;
color
:
rgba
(
30
,
38
,
51
,
1
);
font-weight
:
600
;
padding-right
:
20px
;
border-right
:
1px
solid
rgba
(
235
,
237
,
240
,
1
);
}
.swContent
{
...
...
@@ -42,12 +40,109 @@
.swFormBox
{
background-color
:
#fff
;
border-right
:
1
xp
solid
rgba
(
235
,
237
,
240
,
1
);
width
:
608
px
;
width
:
360
px
;
overflow-y
:
scroll
;
box-sizing
:
border-box
;
padding
:
36
px
;
padding
:
24
px
;
}
.swFlowBox
{
flex
:
1
;
height
:
calc
(
100vh
-
56px
);
}
.title
{
color
:
rgba
(
30
,
38
,
51
,
1
);
font-size
:
16px
;
line-height
:
24px
;
font-weight
:
600
;
margin-bottom
:
16px
;
}
.taskResults
{
padding
:
24px
;
background-color
:
rgba
(
247
,
248
,
250
,
1
);
margin-bottom
:
24px
;
}
.notResults
{
background-color
:
rgba
(
247
,
248
,
250
,
1
);
padding
:
54px
0
;
text-align
:
center
;
color
:
rgba
(
138
,
144
,
153
,
1
);
font-size
:
14px
;
line-height
:
22px
;
margin-bottom
:
24px
;
}
.taskInfoLi
{
margin-bottom
:
20px
;
display
:
flex
;
justify-content
:
space-between
;
align-items
:
flex-start
;
}
.taskInfoParams
{
color
:
rgba
(
138
,
144
,
153
,
1
);
font-size
:
14px
;
line-height
:
22px
;
}
.taskInfoValue
{
color
:
rgba
(
30
,
38
,
51
,
1
);
font-size
:
14px
;
line-height
:
22px
;
max-width
:
210px
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
display
:
flex
;
overflow
:
hidden
;
position
:
relative
;
align-items
:
center
;
}
.taskInfoValueShowAll
{
white-space
:
normal
;
}
.taskInfoValueIcon
{
margin-right
:
9px
;
}
.tabs
{
display
:
flex
;
justify-content
:
flex-start
;
border-bottom
:
1px
solid
rgba
(
240
,
242
,
245
,
1
);
}
.tabLi
{
cursor
:
pointer
;
font-size
:
14px
;
line-height
:
22px
;
padding-bottom
:
8px
;
color
:
rgba
(
138
,
144
,
153
,
1
);
margin-right
:
32px
;
position
:
relative
;
}
.tabLiAcitve
{
color
:
rgba
(
19
,
112
,
255
,
1
);
border-bottom
:
2px
solid
rgba
(
19
,
112
,
255
,
1
);
}
.overview
{
padding-top
:
19px
;
}
.params
{
padding-top
:
19px
;
}
.options
{
position
:
absolute
;
top
:
33px
;
max-height
:
230px
;
overflow-y
:
scroll
;
padding
:
8px
0px
;
background
:
#ffffff
;
box-shadow
:
0px
3px
10px
0px
rgba
(
0
,
24
,
57
,
0.14
);
border-radius
:
4px
;
}
.option
{
padding
:
7px
16px
;
font-size
:
14px
;
color
:
rgba
(
30
,
38
,
51
,
1
);
line-height
:
22px
;
cursor
:
pointer
;
}
.option
:hover
{
color
:
rgba
(
19
,
112
,
255
,
1
);
}
.optionActive
{
color
:
rgba
(
19
,
112
,
255
,
1
);
}
src/views/Project/ProjectJobDetail/index.tsx
View file @
19848612
This diff is collapsed.
Click to expand it.
src/views/Project/ProjectSubmitWork/ConfigForm/index.tsx
View file @
19848612
...
...
@@ -191,7 +191,7 @@ const ConfigForm = (props: ConfigFormProps) => {
>
{
parameter
.
name
}
<
span
className=
{
styles
.
parameterDataType
}
>
{
parameter
.
classType
}
{
parameter
.
classType
Name
}
</
span
>
</
div
>
<
div
className=
{
styles
.
parameterContent
}
>
...
...
src/views/Project/ProjectSubmitWork/index.tsx
View file @
19848612
...
...
@@ -133,7 +133,7 @@ const ProjectSubmitWork = () => {
}
}
promotedParameters
[
parameter
.
name
]
=
{
[
parameter
.
classType
]:
value
,
[
parameter
.
classType
Name
]:
value
,
};
});
});
...
...
src/views/Project/ProjectSubmitWork/interface.ts
View file @
19848612
...
...
@@ -14,6 +14,7 @@ export interface IParameter {
required
:
boolean
;
domType
:
IDomType
;
classType
:
string
;
classTypeName
:
string
;
value
:
any
;
description
:
string
;
language
:
string
;
...
...
@@ -104,3 +105,18 @@ export type IRenderTask = {
flows
:
ITask
[];
isCheck
:
boolean
;
// 里面的子项表单校验是否全部通过
};
export
interface
ITaskInfo
extends
ITemplateConfig
{
name
:
string
;
outputPath
:
string
;
state
:
IState
;
specTitle
:
string
;
specVersion
:
string
;
jobCost
:
string
;
creator
:
string
;
createTime
:
string
;
costTime
:
string
;
logPath
:
string
;
}
type
IState
=
"SUCCEEDED"
|
"RUNNING"
|
"ABORTED"
|
"FAILED"
;
src/views/Project/components/Flow/index.tsx
View file @
19848612
...
...
@@ -261,7 +261,7 @@ const Flow = (props: IProps) => {
onBatchClick
&&
onBatchClick
(
item
.
parentNode
);
}
else
{
setSelectedNodeId
(
node
.
id
);
onBatchClick
&&
onBatchClick
(
item
.
parentNode
||
""
);
onBatchClick
&&
onBatchClick
(
node
.
id
||
""
);
}
}
});
...
...
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