Merge branch 'feat-20220705-customTemplate' of http://120.77.149.83/root/bkunyun…

Merge branch 'feat-20220705-customTemplate' of http://120.77.149.83/root/bkunyun into feat-20220705-customTemplate

src/components/mui/MyInput.tsx

@@ -8,59 +8,61 @@
  */
 import TextField, { TextFieldProps } from "@mui/material/TextField";
 
-interface MyInputProps extends Omit<TextFieldProps, "value">  {
-  value: any;
-  inputSx?: any;
-  onChange?: any;
-  onFocus?: any;
-  label?: string;
-  variant?: "standard" | "filled" | "outlined";
-  id?: string;
-  size?: "small" | "medium";
-  placeholder?: string;
-  fullWidth?: boolean; // 宽度是否和容器一致
-  InputProps?: any; // input加前后icon可以用这个
-  error?: boolean;
-  helperText?: string;
-};
+interface MyInputProps extends Omit<TextFieldProps, "value"> {
+	value: any;
+	inputSx?: any;
+	onChange?: any;
+	onFocus?: any;
+	label?: string;
+	variant?: "standard" | "filled" | "outlined";
+	id?: string;
+	size?: "small" | "medium";
+	placeholder?: string;
+	fullWidth?: boolean; // 宽度是否和容器一致
+	InputProps?: any; // input加前后icon可以用这个
+	error?: boolean;
+	helperText?: string;
+}
 
 const MyInput = (props: MyInputProps) => {
-  const {
-    inputSx = {},
-    value,
-    onChange,
-    onFocus,
-    label,
-    id,
-    variant,
-    size = "small",
-    placeholder = "请输入",
-    fullWidth = true,
-    InputProps,
-    error = false,
-    helperText,
-  } = props;
+	const {
+		inputSx = {},
+		value,
+		onChange,
+		onFocus,
+		label,
+		id,
+		variant,
+		size = "small",
+		placeholder = "请输入",
+		fullWidth = true,
+		InputProps,
+		error = false,
+		helperText,
+		disabled,
+	} = props;
 
-  return (
-    <TextField
-      {...props}
-      error={error}
-      helperText={helperText}
-      sx={{ ...inputSx }}
-      id={id}
-      label={label}
-      variant={variant}
-      onChange={onChange}
-      onFocus={onFocus}
-      size={size}
-      placeholder={placeholder}
-      fullWidth={fullWidth}
-      InputProps={{
-        ...InputProps,
-      }}
-      value={value}
-    />
-  );
+	return (
+		<TextField
+			{...props}
+			error={error}
+			helperText={helperText}
+			sx={{ ...inputSx }}
+			id={id}
+			label={label}
+			variant={variant}
+			onChange={onChange}
+			onFocus={onFocus}
+			size={size}
+			placeholder={placeholder}
+			fullWidth={fullWidth}
+			InputProps={{
+				...InputProps,
+			}}
+			disabled={disabled}
+			value={value}
+		/>
+	);
 };
 
 export default MyInput;

src/views/Project/ProjectJobDetail/index.tsx

@@ -377,48 +377,52 @@ const ProjectSubmitWork = observer(() => {
 						{!activePatchId && (
 							<div className={styles.taskInfo}>
 								<div className={styles.title}>任务结果</div>
-								{workFlowJobInfo?.outputs && (
-									<div className={styles.taskResults}>
-										{randerOutputs1.map((item, index) => {
-											return (
-												<div key={index} className={styles.outputLi}>
-													{/* <MyPopconfirm
+								{workFlowJobInfo?.outputs &&
+									Object.keys(workFlowJobInfo?.outputs).length > 0 && (
+										<div className={styles.taskResults}>
+											{randerOutputs1.map((item, index) => {
+												return (
+													<div key={index} className={styles.outputLi}>
+														{/* <MyPopconfirm
 														title="即将跳转至项目数据内该任务的结果目录，确认继续吗？"
 														onConfirm={() =>
 															goToProjectData(getFolderPath(item.path))
 														}
 													> */}
-													<div
-														className={styles.outputLiLeft}
-														onClick={(e: any) => {
-															handleShowPopper(
-																e,
-																"即将跳转至项目数据内该任务的结果目录，确认继续吗？"
-															);
-															setGoToProjectDataPath(getFolderPath(item.path));
-														}}
-													>
-														<img
-															className={styles.outputLiLeftImg}
-															src={
-																item.type === "file" ? fileIcon : dataSetIcon
-															}
-															alt=""
-														/>
-														{item.name}
+														<div
+															className={styles.outputLiLeft}
+															onClick={(e: any) => {
+																handleShowPopper(
+																	e,
+																	"即将跳转至项目数据内该任务的结果目录，确认继续吗？"
+																);
+																setGoToProjectDataPath(
+																	getFolderPath(item.path)
+																);
+															}}
+														>
+															<img
+																className={styles.outputLiLeftImg}
+																src={
+																	item.type === "file" ? fileIcon : dataSetIcon
+																}
+																alt=""
+															/>
+															{item.name}
+														</div>
+														{/* </MyPopconfirm> */}
+														<span className={styles.outputLiRight}>
+															{item.size}
+														</span>
 													</div>
-													{/* </MyPopconfirm> */}
-													<span className={styles.outputLiRight}>
-														{item.size}
-													</span>
-												</div>
-											);
-										})}
-									</div>
-								)}
-								{!workFlowJobInfo?.outputs && (
-									<div className={styles.notResults}>暂无结果文件</div>
-								)}
+												);
+											})}
+										</div>
+									)}
+								{workFlowJobInfo?.outputs &&
+									Object.keys(workFlowJobInfo?.outputs).length === 0 && (
+										<div className={styles.notResults}>暂无结果文件</div>
+									)}
 								<div className={styles.title}>任务信息</div>
 								<div className={styles.taskInfoLi}>
 									<div className={styles.taskInfoParams}>任务名称</div>

src/views/Project/ProjectWorkbench/workbenchTemplate/components/AddTemplate/index.tsx

@@ -110,11 +110,12 @@ const AddTemplate = observer((props: IAddTemplateProps) => {
 	};
 
 	useEffect(() => {
+		setSelectTemplateData([]);
 		getAddTemplateList({
 			projectId: projectId as string,
 			productId: productId as string,
 		});
-	}, [getAddTemplateList, projectId, productId]);
+	}, [templateType, getAddTemplateList, projectId, productId]);
 
 	const hiddenBoxArr = useMemo(() => {
 		const length =

src/views/WorkFlowEdit/util.ts

@@ -23,6 +23,12 @@ export const getCustomTemplateParameterCheckResult = (
       }
     }
   }
+  if (error) {
+    return {
+      error,
+      helperText,
+    };
+  }
   if (parameter.validators.length > 0) {
     parameter.validators.forEach((validator) => {
       const reg = new RegExp(validator.regex);