Commit 857556d6 authored by chenshouchao's avatar chenshouchao

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

parent 6f95fc18
...@@ -494,7 +494,11 @@ const ConfigForm = (props: ConfigFormProps) => { ...@@ -494,7 +494,11 @@ const ConfigForm = (props: ConfigFormProps) => {
/> />
</div> </div>
<div className={styles.taskConfigBox}> <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) => { {task.flows.map((flow) => {
if ( if (
flow.parameters.filter( flow.parameters.filter(
......
...@@ -166,6 +166,9 @@ const ProjectSubmitWork = observer(() => { ...@@ -166,6 +166,9 @@ const ProjectSubmitWork = observer(() => {
tack.parameters tack.parameters
.filter((parameter) => parameter.hidden === false) .filter((parameter) => parameter.hidden === false)
.forEach((parameter) => { .forEach((parameter) => {
if (tack.type === "BATCH" && parameter?.thrown) {
return;
}
const checkResult = getCheckResult(parameter, parameter.value); const checkResult = getCheckResult(parameter, parameter.value);
parameter.error = checkResult.error; parameter.error = checkResult.error;
parameter.helperText = checkResult.helperText; parameter.helperText = checkResult.helperText;
...@@ -195,12 +198,16 @@ const ProjectSubmitWork = observer(() => { ...@@ -195,12 +198,16 @@ const ProjectSubmitWork = observer(() => {
value = `/${value}`; value = `/${value}`;
} }
if (tack.type === "BATCH") { if (tack.type === "BATCH") {
if (!parameter?.thrown) {
promotedParameters[`${tack.id}_${parameter.name}`] = { promotedParameters[`${tack.id}_${parameter.name}`] = {
[parameter.classTypeName]: value, [parameter.classTypeName]: value,
}; };
}
} else { } else {
promotedParameters[ promotedParameters[
`${tack.parentNode}_${tack.prefix}_${parameter.name}` `${tack.parentNode}${
parameter.thrown ? "" : "_" + tack.prefix
}_${parameter.name}`
] = { ] = {
[parameter.classTypeName]: value, [parameter.classTypeName]: value,
}; };
......
...@@ -30,6 +30,7 @@ export interface IParameter { ...@@ -30,6 +30,7 @@ export interface IParameter {
error?: boolean; // 表单校验是否通过 error?: boolean; // 表单校验是否通过
helperText?: string; // 表单校验提示文案 helperText?: string; // 表单校验提示文案
parameterGroup?: string; // parameterGroup?: string; //
thrown: boolean; // 保存批算子时 是否是 批算子输入输出相关的parameters
} }
export type IExecutionStatus = "Pending" | "Running" | "Done" | "Failed"; export type IExecutionStatus = "Pending" | "Running" | "Done" | "Failed";
......
...@@ -51,7 +51,7 @@ const FlowNode = (props: any) => { ...@@ -51,7 +51,7 @@ const FlowNode = (props: any) => {
return ( return (
(parameters?.length && (parameters?.length &&
parameters?.filter((item: any) => { parameters?.filter((item: any) => {
return item.parameterGroup === "in"; return item.parameterGroup === "in" && !item?.thrown;
})) || })) ||
[] []
); );
...@@ -62,7 +62,7 @@ const FlowNode = (props: any) => { ...@@ -62,7 +62,7 @@ const FlowNode = (props: any) => {
return ( return (
(parameters?.length && (parameters?.length &&
parameters?.filter((item: any) => { parameters?.filter((item: any) => {
return item.parameterGroup === "out"; return item.parameterGroup === "out" && !item?.thrown;
})) || })) ||
[] []
); );
......
...@@ -350,22 +350,34 @@ const ParameterSetting = (props: IParameterSettingProps) => { ...@@ -350,22 +350,34 @@ const ParameterSetting = (props: IParameterSettingProps) => {
const inParameters: Array<IParameter> = useMemo(() => { const inParameters: Array<IParameter> = useMemo(() => {
if (!taskInfo) { if (!taskInfo) {
return []; return [];
} else {
if (taskInfo.type === "BATCH") {
return taskInfo.parameters.filter(
(parameter) => parameter.parameterGroup === "in" && !parameter.thrown
);
} else { } else {
return taskInfo.parameters.filter( return taskInfo.parameters.filter(
(parameter) => parameter.parameterGroup === "in" (parameter) => parameter.parameterGroup === "in"
); );
} }
}
}, [taskInfo]); }, [taskInfo]);
// 输出参数 // 输出参数
const outParameters: Array<IParameter> = useMemo(() => { const outParameters: Array<IParameter> = useMemo(() => {
if (!taskInfo) { if (!taskInfo) {
return []; return [];
} else {
if (taskInfo.type === "BATCH") {
return taskInfo.parameters.filter(
(parameter) => parameter.parameterGroup === "out" && !parameter.thrown
);
} else { } else {
return taskInfo.parameters.filter( return taskInfo.parameters.filter(
(parameter) => parameter.parameterGroup === "out" (parameter) => parameter.parameterGroup === "out"
); );
} }
}
}, [taskInfo]); }, [taskInfo]);
// 基础参数 // 基础参数
......
...@@ -146,6 +146,9 @@ const WorkFlowEdit = observer((props: IProps) => { ...@@ -146,6 +146,9 @@ const WorkFlowEdit = observer((props: IProps) => {
let check = true; let check = true;
templateConfigInfoClone.forEach((task) => { templateConfigInfoClone.forEach((task) => {
task.parameters.forEach((parameter) => { task.parameters.forEach((parameter) => {
if (task.type === "BATCH" && parameter.thrown) {
return;
}
const checkResult = getCustomTemplateParameterCheckResult(parameter); const checkResult = getCustomTemplateParameterCheckResult(parameter);
parameter.error = checkResult.error; parameter.error = checkResult.error;
parameter.helperText = checkResult.helperText; 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