Merge branch 'feat-20220801' into 'staging'

Feat 20220801

See merge request !54

src/views/Project/ProjectSubmitWork/util.ts

@@ -20,14 +20,16 @@ export const getCheckResult = (
       helperText = "该选项是必填项";
     }
   }
-  if (parameter.validators.length > 0) {
-    parameter.validators.forEach((validator) => {
-      const reg = new RegExp(validator.regex);
-      if (!reg.test(value)) {
-        error = true;
-        helperText = validator.message;
-      }
-    });
+  if (parameter?.validators) {
+    if (parameter.validators.length > 0) {
+      parameter.validators.forEach((validator) => {
+        const reg = new RegExp(validator.regex);
+        if (!reg.test(value)) {
+          error = true;
+          helperText = validator.message;
+        }
+      });
+    }
   }
   return {
     error,

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

@@ -152,11 +152,13 @@ const BatchOperatorFlow = (props: IProps) => {
 								backgroundColor: "rgba(19, 112, 255, 1)",
 								border: "none",
 								left: 12,
+								top: "-2px",
 							},
 							outStyle: {
 								backgroundColor: "rgba(19, 112, 255, 1)",
 								border: "none",
 								left: 12,
+								bottom: "-2px",
 							},
 						},
 

src/views/Project/components/Flow/components/FlowNode/index.module.css

@@ -2,6 +2,7 @@
 	background-color: #f5f6f7;
 	border-radius: 2px;
 	padding: 6px 12px;
+	border: 1px solid #f5f6f7;
 }
 
 .flowNode:hover {
@@ -24,22 +25,22 @@
 	margin-left: 8px;
 }
 
-.errorDot{
+.errorDot {
 	display: inline-block;
 	line-height: 22px;
 	vertical-align: middle;
 	width: 8px;
 	height: 8px;
-	background-color: #FF4E4E;
+	background-color: #ff4e4e;
 	border-radius: 8px;
 	margin-left: 8px;
 }
 
-.handleBox::before{
+.handleBox::before {
 	content: "";
 	position: absolute;
 	left: -4px;
 	top: -4px;
 	width: 14px;
 	height: 14px;
-}
\ No newline at end of file
+}

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

@@ -37,7 +37,6 @@ const FlowNode = (props: any) => {
 
 	const { data } = props;
 	const {
-		dotStatus,
 		selectedStatus,
 		flowNodeStyle = { display: "flex", alignItems: "center" }, // 样式
 		inStyle = { background: "#C2C6CC ", left: 12 }, // 样式
@@ -77,14 +76,6 @@ const FlowNode = (props: any) => {
 				[styles.selectedFlowBox]: selectedStatus,
 			})}
 		>
-			{/* {dotStatus?.isInput ? (
-				<Handle
-					className={styles.handleBox}
-					style={inStyle}
-					type="target"
-					position={Position.Top}
-				/>
-			) : null} */}
 			{inParamsArr?.length
 				? inParamsArr.map((item: any, index: number) => {
 						return (
@@ -121,14 +112,6 @@ const FlowNode = (props: any) => {
 					/>
 				)}
 			</div>
-			{/* {dotStatus?.isOutput ? (
-				<Handle
-					className={styles.handleBox}
-					style={outStyle}
-					type="source"
-					position={Position.Bottom}
-				/>
-			) : null} */}
 			{outParamsArr?.length
 				? outParamsArr.map((item: any, index: number) => {
 						return (