Merge branch 'release' into 'master'

Release

See merge request !102

src/components/mui/Tabs.tsx

@@ -28,6 +28,7 @@ interface ITabList {
 interface IProps {
 	tabList: ITabList[];
 	defaultValue?: string;
+	tabPanelSx?: any;
 	allowNullValue?: boolean; // 是否允许空值
 }
 
@@ -36,37 +37,46 @@ const theme = createTheme({
 		MuiTab: {
 			styleOverrides: {
 				root: {
-                    paddingLeft: 0,
-                    paddingRight: 0,
-                    paddingTop: '8px',
-                    paddingBottom: '8px',
-					minWidth: '20px',
-					marginRight: '32px',
-					color: '#8A9099',
+					paddingLeft: 0,
+					paddingRight: 0,
+					paddingTop: "8px",
+					paddingBottom: "8px",
+					minWidth: "20px",
+					marginRight: "32px",
+					color: "#8A9099",
 					selected: {
-						color: '#1976d2'
+						color: "#1976d2",
 					},
 					"&.Mui-disabled": {
-						color: '#C2C6CC',
+						color: "#C2C6CC",
 					},
 				},
 			},
 		},
 		// #C2C6CC
-		MuiTabs:{
+		MuiTabs: {
 			styleOverrides: {
 				indicator: {
-					backgroundColor: '#1370FF',
-				}
-			}
+					backgroundColor: "#1370FF",
+				},
+			},
 		},
 	},
 });
 
 const Tabs = (props: IProps) => {
-	const { tabList, defaultValue, allowNullValue = false } = props;
+	const {
+		tabList,
+		defaultValue,
+		allowNullValue = false,
+		tabPanelSx = { padding: "20px 0 0 0" },
+	} = props;
 	const [value, setValue] = useState(
-		defaultValue ? defaultValue : allowNullValue ? '' : tabList.filter((e) => !e.hide)[0].value
+		defaultValue
+			? defaultValue
+			: allowNullValue
+			? ""
+			: tabList.filter((e) => !e.hide)[0].value
 	);
 
 	const onChange = (val: string) => {
@@ -94,42 +104,38 @@ const Tabs = (props: IProps) => {
 
 	return (
 		<ThemeProvider theme={theme}>
-		<TabContext value={value}>
-			<Box sx={{ borderBottom: 1, borderColor: "#F0F2F5" }}>
-				<TabList
-					onChange={(e: any, val: string) => {
-						onChange(val);
-					}}
-				>
-					{tabList
-						?.filter((item) => !item.hide)
-						.map((item, key) => {
-							return (
-								<Tab
-									key={key}
-									label={labelRender(item, key)}
-									value={item.value}
-									id={item.value}
-									disabled={item.disabled}
-								/>
-							);
-						})}
-				</TabList>
-			</Box>
-			{tabList
-				?.filter((item) => !item.hide)
-				.map((item) => {
-					return (
-						<TabPanel
-							sx={{ padding: "20px 0 0 0" }}
-							value={item.value}
-							key={item.value}
-						>
-							{item.component}
-						</TabPanel>
-					);
-				})}
-		</TabContext>
+			<TabContext value={value}>
+				<Box sx={{ borderBottom: 1, borderColor: "#F0F2F5" }}>
+					<TabList
+						onChange={(e: any, val: string) => {
+							onChange(val);
+						}}
+					>
+						{tabList
+							?.filter((item) => !item.hide)
+							.map((item, key) => {
+								return (
+									<Tab
+										key={key}
+										label={labelRender(item, key)}
+										value={item.value}
+										id={item.value}
+										disabled={item.disabled}
+									/>
+								);
+							})}
+					</TabList>
+				</Box>
+				{tabList
+					?.filter((item) => !item.hide)
+					.map((item) => {
+						return (
+							<TabPanel sx={tabPanelSx} value={item.value} key={item.value}>
+								{item.component}
+							</TabPanel>
+						);
+					})}
+			</TabContext>
 		</ThemeProvider>
 	);
 };

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

@@ -154,6 +154,7 @@ const Flow = (props: IProps) => {
 	/** 内部维护的选择的节点Id */
 	const [inSideNodeId, setInSideNodeId] = useState<string>("");
 
+	/** 删除批节点 */
 	const deleteSelectBatchNode = useCallback(
 		(e: any) => {
 			if (e.keyCode === 8) {
@@ -168,6 +169,7 @@ const Flow = (props: IProps) => {
 		[inSideNodeId, setTasks, tasks]
 	);
 
+	/** 监听鼠标按下事件 */
 	useEffect(() => {
 		window.addEventListener("keyup", deleteSelectBatchNode);
 		return () => {

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

@@ -55,6 +55,7 @@ const OperatorItem = (props: IOperatorItemProps) => {
 					if (bol && index === undefined) {
 						index = i;
 					}
+
 					return !bol;
 				});
 				if (index !== undefined) {

src/views/WorkFlowEdit/index.tsx

@@ -2,11 +2,11 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-21 20:03:56
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-07-09 15:11:17
+ * @LastEditTime: 2022-07-11 11:31:14
  * @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import React, { useState } from "react";
+import React, { useCallback, useState } from "react";
 import ArrowBackIosNewIcon from "@mui/icons-material/ArrowBackIosNew";
 import IconButton from "@mui/material/IconButton";
 
@@ -40,7 +40,6 @@ const WorkFlowEdit = (props: IProps) => {
 	const [templateConfigInfo, setTemplateConfigInfo] = useState<ITask[]>([]);
 
 	const [leftContentType, setLeftContentType] = useState("list");
-
 	const [popperTitle, setPopperTitle] = useState(
 		"返回后，当前页面已填写内容将不保存，确认返回吗？"
 	);
@@ -63,6 +62,13 @@ const WorkFlowEdit = (props: IProps) => {
 		}
 	};
 
+	/** 选中的task 唯一标识符 */
+	const [selectTaskId, setSelectTaskId] = useState<string>();
+
+	/** 设置选中唯一标识符 */
+	const handleNodeClick = useCallback((val: string) => {
+		setSelectTaskId(val);
+	}, []);
 	return (
 		<div className={styles.swBox}>
 			<div className={styles.swHeader}>

src/views/WorkFlowEdit/util.ts

+import { IParameter } from "../Project/ProjectSubmitWork/interface";
+export const getCustomTemplateParameterCheckResult = (
+  parameter: IParameter,
+  value: string
+): {
+  error: boolean;
+  helperText: string;
+} => {
+  let error = false;
+  let helperText = "";
+  // 表单校验
+  if (parameter.required) {
+    // 提交任务时不展示
+    if (parameter.hidden) {
+      if (Array.isArray(value)) {
+        if (value.length === 0) {
+          error = true;
+          helperText = "该参数为必填，您必须为该参数赋予默认值";
+        }
+      } else if (value === "" || value === null || value === undefined) {
+        error = true;
+        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;
+      }
+    });
+  }
+  return {
+    error,
+    helperText,
+  };
+};