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
Administrator
bkunyun
Commits
857556d6
Commit
857556d6
authored
Aug 16, 2022
by
chenshouchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 工作流相关兼容thrown 保存批算子时 是否是 批算子输入输出相关的parameters
parent
6f95fc18
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
14 deletions
+41
-14
index.tsx
src/views/Project/ProjectSubmitWork/ConfigForm/index.tsx
+5
-1
index.tsx
src/views/Project/ProjectSubmitWork/index.tsx
+11
-4
interface.ts
src/views/Project/ProjectSubmitWork/interface.ts
+2
-1
index.tsx
...ews/Project/components/Flow/components/FlowNode/index.tsx
+2
-2
index.tsx
src/views/WorkFlowEdit/components/ParameterSetting/index.tsx
+18
-6
index.tsx
src/views/WorkFlowEdit/index.tsx
+3
-0
No files found.
src/views/Project/ProjectSubmitWork/ConfigForm/index.tsx
View file @
857556d6
...
...
@@ -494,7 +494,11 @@ const ConfigForm = (props: ConfigFormProps) => {
/>
</
div
>
<
div
className=
{
styles
.
taskConfigBox
}
>
{
randerParameters
(
task
.
parameters
,
task
.
id
,
task
.
id
)
}
{
randerParameters
(
task
.
parameters
.
filter
((
parameter
)
=>
!
parameter
?.
thrown
),
task
.
id
,
task
.
id
)
}
{
task
.
flows
.
map
((
flow
)
=>
{
if
(
flow
.
parameters
.
filter
(
...
...
src/views/Project/ProjectSubmitWork/index.tsx
View file @
857556d6
...
...
@@ -166,6 +166,9 @@ const ProjectSubmitWork = observer(() => {
tack
.
parameters
.
filter
((
parameter
)
=>
parameter
.
hidden
===
false
)
.
forEach
((
parameter
)
=>
{
if
(
tack
.
type
===
"BATCH"
&&
parameter
?.
thrown
)
{
return
;
}
const
checkResult
=
getCheckResult
(
parameter
,
parameter
.
value
);
parameter
.
error
=
checkResult
.
error
;
parameter
.
helperText
=
checkResult
.
helperText
;
...
...
@@ -195,12 +198,16 @@ const ProjectSubmitWork = observer(() => {
value
=
`/
${
value
}
`
;
}
if
(
tack
.
type
===
"BATCH"
)
{
promotedParameters
[
`
${
tack
.
id
}
_
${
parameter
.
name
}
`
]
=
{
[
parameter
.
classTypeName
]:
value
,
};
if
(
!
parameter
?.
thrown
)
{
promotedParameters
[
`
${
tack
.
id
}
_
${
parameter
.
name
}
`
]
=
{
[
parameter
.
classTypeName
]:
value
,
};
}
}
else
{
promotedParameters
[
`
${
tack
.
parentNode
}
_
${
tack
.
prefix
}
_
${
parameter
.
name
}
`
`
${
tack
.
parentNode
}${
parameter
.
thrown
?
""
:
"_"
+
tack
.
prefix
}
_
${
parameter
.
name
}
`
]
=
{
[
parameter
.
classTypeName
]:
value
,
};
...
...
src/views/Project/ProjectSubmitWork/interface.ts
View file @
857556d6
...
...
@@ -29,7 +29,8 @@ export interface IParameter {
choices
:
Array
<
IChoice
>
;
// 提供给用户选择的选项组
error
?:
boolean
;
// 表单校验是否通过
helperText
?:
string
;
// 表单校验提示文案
parameterGroup
?:
string
;
//
parameterGroup
?:
string
;
//
thrown
:
boolean
;
// 保存批算子时 是否是 批算子输入输出相关的parameters
}
export
type
IExecutionStatus
=
"Pending"
|
"Running"
|
"Done"
|
"Failed"
;
...
...
src/views/Project/components/Flow/components/FlowNode/index.tsx
View file @
857556d6
...
...
@@ -51,7 +51,7 @@ const FlowNode = (props: any) => {
return
(
(
parameters
?.
length
&&
parameters
?.
filter
((
item
:
any
)
=>
{
return
item
.
parameterGroup
===
"in"
;
return
item
.
parameterGroup
===
"in"
&&
!
item
?.
thrown
;
}))
||
[]
);
...
...
@@ -62,7 +62,7 @@ const FlowNode = (props: any) => {
return
(
(
parameters
?.
length
&&
parameters
?.
filter
((
item
:
any
)
=>
{
return
item
.
parameterGroup
===
"out"
;
return
item
.
parameterGroup
===
"out"
&&
!
item
?.
thrown
;
}))
||
[]
);
...
...
src/views/WorkFlowEdit/components/ParameterSetting/index.tsx
View file @
857556d6
...
...
@@ -351,9 +351,15 @@ const ParameterSetting = (props: IParameterSettingProps) => {
if
(
!
taskInfo
)
{
return
[];
}
else
{
return
taskInfo
.
parameters
.
filter
(
(
parameter
)
=>
parameter
.
parameterGroup
===
"in"
);
if
(
taskInfo
.
type
===
"BATCH"
)
{
return
taskInfo
.
parameters
.
filter
(
(
parameter
)
=>
parameter
.
parameterGroup
===
"in"
&&
!
parameter
.
thrown
);
}
else
{
return
taskInfo
.
parameters
.
filter
(
(
parameter
)
=>
parameter
.
parameterGroup
===
"in"
);
}
}
},
[
taskInfo
]);
...
...
@@ -362,9 +368,15 @@ const ParameterSetting = (props: IParameterSettingProps) => {
if
(
!
taskInfo
)
{
return
[];
}
else
{
return
taskInfo
.
parameters
.
filter
(
(
parameter
)
=>
parameter
.
parameterGroup
===
"out"
);
if
(
taskInfo
.
type
===
"BATCH"
)
{
return
taskInfo
.
parameters
.
filter
(
(
parameter
)
=>
parameter
.
parameterGroup
===
"out"
&&
!
parameter
.
thrown
);
}
else
{
return
taskInfo
.
parameters
.
filter
(
(
parameter
)
=>
parameter
.
parameterGroup
===
"out"
);
}
}
},
[
taskInfo
]);
...
...
src/views/WorkFlowEdit/index.tsx
View file @
857556d6
...
...
@@ -146,6 +146,9 @@ const WorkFlowEdit = observer((props: IProps) => {
let
check
=
true
;
templateConfigInfoClone
.
forEach
((
task
)
=>
{
task
.
parameters
.
forEach
((
parameter
)
=>
{
if
(
task
.
type
===
"BATCH"
&&
parameter
.
thrown
)
{
return
;
}
const
checkResult
=
getCustomTemplateParameterCheckResult
(
parameter
);
parameter
.
error
=
checkResult
.
error
;
parameter
.
helperText
=
checkResult
.
helperText
;
...
...
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