Merge branch 'feat-20220801' into 'release'

Feat 20220801

See merge request !59

src/views/Project/ProjectSubmitWork/ConfigForm/index.tsx

@@ -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

@@ -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") {
+							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

@@ -30,6 +30,7 @@ export interface IParameter {
   error?: boolean; // 表单校验是否通过
   helperText?: string; // 表单校验提示文案
   parameterGroup?: string; //
+  thrown: boolean; // 保存批算子时 是否是 批算子输入输出相关的parameters
 }
 
 export type IExecutionStatus = "Pending" | "Running" | "Done" | "Failed";

src/views/Project/ProjectWorkbench/workbenchList/index.tsx

@@ -368,7 +368,7 @@ const ProjectMembers = observer(() => {
 
 			<Box className={styles.body} style={{ position: "relative" }}>
 				<MyCircularProgress loading={loading} />
-				{jobList.length === 0 && (
+				{jobList.length === 0 && !loading && (
 					<Box
 						sx={{
 							display: "flex",
@@ -439,7 +439,7 @@ const ProjectMembers = observer(() => {
 									</div>
 								</Box>
 
-								{item.state === "RUNNING" &&
+								{(item.state === "RUNNING" || item.state === "SUBMITTED") &&
 									isPass("PROJECT_WORKBENCH_JOBS_STOP", "USER") && (
 										<Box className={styles.tabBoxJobOperate}>
 											{currentProjectStore.currentProjectInfo.projectRole ===
@@ -465,6 +465,7 @@ const ProjectMembers = observer(() => {
 										</Box>
 									)}
 								{item.state !== "RUNNING" &&
+									item.state !== "SUBMITTED" &&
 									isPass("PROJECT_WORKBENCH_JOBS_DELETE", "MANAGER") && (
 										<Box className={styles.tabBoxJobOperate}>
 											<img

src/views/Project/components/Flow/components/FlowNode/index.tsx

@@ -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

@@ -350,22 +350,34 @@ const ParameterSetting = (props: IParameterSettingProps) => {
 	const inParameters: Array<IParameter> = useMemo(() => {
 		if (!taskInfo) {
 			return [];
+		} else {
+			if (taskInfo.type === "BATCH") {
+				return taskInfo.parameters.filter(
+					(parameter) => parameter.parameterGroup === "in" && !parameter.thrown
+				);
 			} else {
 				return taskInfo.parameters.filter(
 					(parameter) => parameter.parameterGroup === "in"
 				);
 			}
+		}
 	}, [taskInfo]);
 
 	// 输出参数
 	const outParameters: Array<IParameter> = useMemo(() => {
 		if (!taskInfo) {
 			return [];
+		} else {
+			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

@@ -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;