Merge branch 'feat-20220801' into 'staging'

Feat 20220801

See merge request !50

src/api/fileserver/CloudEController.ts

@@ -229,6 +229,21 @@ class CloudEController {
     }
   }
 
+  // 获取文件文本内容（字符串）
+  static JobFileDownloadText(url: any, filetoken: string, projectId: string) {
+    if (ApiUtils.getAuthorizationHeaders(headers)) {
+      url = url + urlToken(filetoken, projectId);
+      headers["Cache-Control"] = "no-cache";
+      headers["Content-Type"] = "multipart/form-data";
+      return axios.get(
+        APIOPTION() + "/download" + url + "&showhidden=false",
+        {
+          headers: headers,
+        }
+      );
+    }
+  }
+
 
   // 获取分子列表
   static GetDatasetItemsList(params: IGetDatasetItemsListParams) {

src/views/CustomOperator/components/OperatorList/index.tsx

@@ -54,54 +54,6 @@ const OperatorList = (props: IProps) => {
 				};
 			});
 			setIsLastPage(res?.data?.last);
-			// todo  去掉parameters添加
-			// arr.forEach((item: any, index: number) => {
-			// 	item.edges = [];
-			// 	item.parameters.push({
-			// 		choices: [],
-			// 		classType: "STRING",
-			// 		classTypeName: "String",
-			// 		defaultValue: null,
-			// 		description: "",
-			// 		domType: "dataset",
-			// 		hidden: false,
-			// 		isnull: false,
-			// 		level: null,
-			// 		linked: false,
-			// 		many: false,
-			// 		name: `in${index + 1}`,
-			// 		order: 0,
-			// 		parameterGroup: "in",
-			// 		promoted: false,
-			// 		promotedName: null,
-			// 		required: false,
-			// 		title: null,
-			// 		validators: [],
-			// 	});
-			// });
-			// arr.forEach((item: any, index: number) => {
-			// 	item.parameters.push({
-			// 		choices: [],
-			// 		classType: "STRING",
-			// 		classTypeName: "String",
-			// 		defaultValue: null,
-			// 		description: "",
-			// 		domType: "dataset",
-			// 		hidden: false,
-			// 		isnull: false,
-			// 		level: null,
-			// 		linked: false,
-			// 		many: false,
-			// 		name: `out${index + 1}`,
-			// 		order: 0,
-			// 		parameterGroup: "out",
-			// 		promoted: false,
-			// 		promotedName: null,
-			// 		required: false,
-			// 		title: null,
-			// 		validators: [],
-			// 	});
-			// });
 			setList([...list, ...arr]);
 		},
 	});
@@ -113,9 +65,8 @@ const OperatorList = (props: IProps) => {
 				productId: productId as string,
 				keyword,
 				page,
-				size: 5,
+				size: 20,
 			});
-			// size: 20   todo
 		},
 		[productId, getOperatorListRun]
 	);

src/views/CustomOperator/index.tsx

@@ -168,6 +168,7 @@ const CustomOperator = observer((props: IProps) => {
 						saveFormDialog={saveFormDialog}
 						setSaveFormDialog={setSaveFormDialog}
 						operatorList={operatorList}
+						setShowCustomOperator={setShowCustomOperator}
 					></SaveOperator>
 				</div>
 				<div className={styles.coContent} id="customOperatorFlow">

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

@@ -90,7 +90,6 @@ const BatchOperatorFlow = (props: IProps) => {
 	/** 删除流节点或者线 */
 	const deleteSelectFlowNode = useCallback(
 		(e: any) => {
-			console.log(tasks);
 			if (e.keyCode === 8 && ListenState) {
 				/** 删除流节点逻辑 */
 				if (inSideFlowNodeId) {
@@ -100,6 +99,12 @@ const BatchOperatorFlow = (props: IProps) => {
 								return item.id !== inSideFlowNodeId;
 							})) ||
 						[];
+					// 删除节点时同时删除相关的线
+					newVal?.forEach((task) => {
+						task.edges = task.edges.filter(
+							(edge) => edge.target !== inSideFlowNodeId
+						);
+					});
 					setTasks && setTasks(newVal);
 				}
 				if (selectedEdge) {
@@ -174,7 +179,7 @@ const BatchOperatorFlow = (props: IProps) => {
 				});
 			});
 		return val;
-	}, [tasks, inSideFlowNodeId, flowNodeDraggable]);
+	}, [tasks, inSideFlowNodeId, flowNodeDraggable, showVersion]);
 
 	/** 生成初始化的连线节点 */
 	const initialEdges = useMemo(() => {
@@ -210,7 +215,6 @@ const BatchOperatorFlow = (props: IProps) => {
 	const onNodeClick = (e: any, node: Node) => {
 		tasks?.forEach((item) => {
 			if (item.id === node.id) {
-				console.log("setInSideFlowNodeId", node.id);
 				setInSideFlowNodeId(node.id);
 			}
 		});
@@ -356,8 +360,6 @@ const BatchOperatorFlow = (props: IProps) => {
 
 	/** 点击连线 */
 	const onEdgeClick = useCallback((e: any, val: Edge) => {
-		console.log(e);
-		console.log(val);
 		setSelectedEdge(val);
 		/** 点击连线清除选中的node ID */
 		setInSideFlowNodeId("");

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

@@ -68,6 +68,7 @@ const FlowNode = (props: any) => {
 			[]
 		);
 	}, [parameters]);
+
 	return (
 		<div
 			style={flowNodeStyle}
@@ -76,14 +77,14 @@ const FlowNode = (props: any) => {
 				[styles.selectedFlowBox]: selectedStatus,
 			})}
 		>
-			{dotStatus?.isInput ? (
+			{/* {dotStatus?.isInput ? (
 				<Handle
 					className={styles.handleBox}
 					style={inStyle}
 					type="target"
 					position={Position.Top}
 				/>
-			) : null}
+			) : null} */}
 			{inParamsArr?.length
 				? inParamsArr.map((item: any, index: number) => {
 						return (
@@ -94,8 +95,8 @@ const FlowNode = (props: any) => {
 									style={{
 										background: "#fff ",
 										border: "1px solid #D1D6DE",
-										left: index * 24 + 20,
 										...inStyle,
+										left: index * 24 + 16,
 									}}
 									type="target"
 									position={Position.Top}
@@ -120,14 +121,14 @@ const FlowNode = (props: any) => {
 					/>
 				)}
 			</div>
-			{dotStatus?.isOutput ? (
+			{/* {dotStatus?.isOutput ? (
 				<Handle
 					className={styles.handleBox}
 					style={outStyle}
 					type="source"
 					position={Position.Bottom}
 				/>
-			) : null}
+			) : null} */}
 			{outParamsArr?.length
 				? outParamsArr.map((item: any, index: number) => {
 						return (
@@ -138,8 +139,8 @@ const FlowNode = (props: any) => {
 									style={{
 										background: "#fff ",
 										border: "1px solid #D1D6DE",
-										left: index * 24 + 20,
 										...outStyle,
+										left: index * 24 + 16,
 									}}
 									type="source"
 									position={Position.Bottom}

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

@@ -143,6 +143,15 @@ const Flow = (props: IProps) => {
 								);
 							})) ||
 						[];
+					// 删除节点时同时删除相关的线
+					newVal?.forEach((task) => {
+						task.edges =
+							(task?.edges?.length &&
+								task.edges.filter(
+									(edge) => edge.target !== inSideBatchNodeId
+								)) ||
+							[];
+					});
 					setTasks && setTasks(newVal);
 				}
 				if (selectedEdge) {
@@ -151,7 +160,14 @@ const Flow = (props: IProps) => {
 				}
 			}
 		},
-		[inSideBatchNodeId, selectedEdge, setTasks, tasks, tasksDeleteLine]
+		[
+			inSideBatchNodeId,
+			selectedEdge,
+			setTasks,
+			tasks,
+			tasksDeleteLine,
+			ListenState,
+		]
 	);
 
 	/** 监听鼠标按下事件 */
@@ -163,25 +179,25 @@ const Flow = (props: IProps) => {
 	}, [deleteSelectBatchNode]);
 
 	/** 获取是否有输入节点或者是否有输出节点 */
-	const nodesInputAndOutputStatus = useCallback(
-		(id: string) => {
-			/** 所有的连线 */
-			const lineArr: IEdge[] = [];
-			tasks?.length &&
-				tasks.forEach((item) => {
-					item.edges?.length && lineArr.push(...item.edges);
-				});
-			/** 所有的输入节点ID */
-			const isInput = lineArr?.some((item) => item.target === id);
-			/** 所有的输出节点ID */
-			const isOutput = lineArr?.some((item) => item.source === id);
-			return {
-				isInput,
-				isOutput,
-			};
-		},
-		[tasks]
-	);
+	// const nodesInputAndOutputStatus = useCallback(
+	// 	(id: string) => {
+	// 		/** 所有的连线 */
+	// 		const lineArr: IEdge[] = [];
+	// 		tasks?.length &&
+	// 			tasks.forEach((item) => {
+	// 				item.edges?.length && lineArr.push(...item.edges);
+	// 			});
+	// 		/** 所有的输入节点ID */
+	// 		const isInput = lineArr?.some((item) => item.target === id);
+	// 		/** 所有的输出节点ID */
+	// 		const isOutput = lineArr?.some((item) => item.source === id);
+	// 		return {
+	// 			isInput,
+	// 			isOutput,
+	// 		};
+	// 	},
+	// 	[tasks]
+	// );
 
 	/** 获取是否有流节点 */
 	const isFlowNode = useCallback(
@@ -258,7 +274,7 @@ const Flow = (props: IProps) => {
 							  }
 							: { selectedStatus: inSideFlowNodeId === item.id }),
 						/** 输入输出圆点状态 */
-						dotStatus: nodesInputAndOutputStatus(item.id),
+						// dotStatus: nodesInputAndOutputStatus(item.id),
 
 						/** 样式 */
 						style: {
@@ -290,7 +306,7 @@ const Flow = (props: IProps) => {
 		selectedBatchNodeId,
 		inSideBatchNodeId,
 		inSideFlowNodeId,
-		nodesInputAndOutputStatus,
+		// nodesInputAndOutputStatus,
 		getBatchStyle,
 	]);
 

src/views/WorkFlowEdit/components/OperatorList/index.tsx

@@ -156,7 +156,8 @@ const OperatorItem = (props: IOperatorItemProps) => {
 const OperatorList = observer((props: IOperatorListProps) => {
 	const { currentProjectStore } = useStores();
 	const productId = toJS(currentProjectStore.currentProductInfo.id);
-	const { templateConfigInfo, setTemplateConfigInfo } = props;
+	const { templateConfigInfo, setTemplateConfigInfo, showCustomOperator } =
+		props;
 	const [operatorListData, setOperatorListData] = useState<ITask[]>([]);
 	const [keyword, setKeyword] = useState<string>("");
 
@@ -168,22 +169,29 @@ const OperatorList = observer((props: IOperatorListProps) => {
 	});
 
 	useEffect(() => {
+		if (!showCustomOperator) {
 			run({
 				owner: "root",
-			productId: "cadd" || "",
+				productId: productId as string,
 			});
-	}, [productId, run]);
+		}
+	}, [productId, run, showCustomOperator]);
 
 	/** 处理回车键 */
 	const handleEnterCode = (e: React.KeyboardEvent<HTMLInputElement>) => {
 		if (e.keyCode === 13) {
+			getOperatorList();
+		}
+	};
+
+	const getOperatorList = useCallback(() => {
 		run({
 			owner: "root",
-				productId: "cadd" || "",
+			productId: productId as string,
 			keyword,
 		});
-		}
-	};
+	}, [run, keyword, productId]);
+
 	return (
 		<div className={styles.operatorListBox}>
 			<div className={styles.searchBox}>

src/views/WorkFlowEdit/components/OperatorList/interface.ts

@@ -19,4 +19,5 @@ export interface IOperatorItemProps {
 export interface IOperatorListProps {
     templateConfigInfo: ITask[]
     setTemplateConfigInfo: (val: ITask[]) => void
+    showCustomOperator: boolean
 }
\ No newline at end of file

src/views/WorkFlowEdit/index.tsx

@@ -218,6 +218,7 @@ const WorkFlowEdit = observer((props: IProps) => {
 					</div>
 					{leftContentType === "list" && (
 						<OperatorList
+							showCustomOperator={showCustomOperator}
 							templateConfigInfo={templateConfigInfo}
 							setTemplateConfigInfo={setTemplateConfigInfo}
 						/>
@@ -242,7 +243,7 @@ const WorkFlowEdit = observer((props: IProps) => {
 						setTasks={setTemplateConfigInfo}
 						type="edit"
 						onFlowNodeClick={handleNodeClick}
-						ListenState={!saveFormDialog}
+						ListenState={!saveFormDialog && !showCustomOperator}
 					/>
 				</div>
 			</div>