Commit 857556d6 authored by chenshouchao's avatar chenshouchao

feat: 工作流相关兼容thrown 保存批算子时 是否是 批算子输入输出相关的parameters

parent 6f95fc18
......@@ -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(
......
......@@ -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,
};
......
......@@ -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";
......
......@@ -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;
})) ||
[]
);
......
......@@ -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]);
......
......@@ -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;
......
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