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

src/components/mui/MyButton.tsx

@@ -110,16 +110,19 @@ const theme = createTheme({
 					"& p": { fontSize: "12px" },
 					height: "28px",
 					padding: "0 12px",
+					minWidth: "60px",
 				},
 				sizeMedium: {
 					"& p": { fontSize: "14px" },
 					height: "32px",
 					padding: "0 16px",
+					minWidth: "68px",
 				},
 				sizeLarge: {
 					"& p": { fontSize: "16px" },
 					height: "36px",
 					padding: "0 16px",
+					minWidth: "80px",
 				},
 			},
 		},

src/components/mui/MySelect.tsx

@@ -172,6 +172,14 @@ export default function MySelect(props: IProps) {
 					},
 				},
 			},
+
+			MuiPaper: {
+				styleOverrides: {
+					root: {
+						boxShadow: "0px 3px 10px 0px rgba(0,24,57,0.14)",
+					},
+				},
+			},
 		},
 	});
 

src/views/Project/ProjectWorkbench/index.tsx

@@ -58,6 +58,7 @@ const ProjectWorkbench = observer(() => {
 						lineHeight: "26px",
 						fontWeight: "600",
 						color: "#1E2633",
+						marginBottom: "3px",
 					}}
 				>
 					工作台

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

@@ -11,7 +11,7 @@ import ReactFlow, {
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { uuid } from "@/utils/util";
-import {  IParameter, ITask } from "../../ProjectSubmitWork/interface";
+import { IParameter, ITask } from "../../ProjectSubmitWork/interface";
 import { ILine } from "./interface";
 import BatchNode from "./components/BatchNode";
 import FlowNode from "./components/FlowNode";
@@ -61,7 +61,7 @@ const Flow = (props: IProps) => {
 		showControls = true,
 		...other
 	} = props;
-	
+
 	/** 自定义的节点类型 */
 	const nodeTypes = useMemo(() => {
 		return { batchNode: BatchNode, flowNode: FlowNode };
@@ -311,16 +311,18 @@ const Flow = (props: IProps) => {
 									/** tasks 数据 */
 									tasks: tasks,
 							  }
-							: { 	selectedStatus: externalSelectedNodeId
-								? externalSelectedNodeId.includes(item.id)
-								: inSideFlowNodeId === item.id,}),
+							: {
+									selectedStatus: externalSelectedNodeId
+										? externalSelectedNodeId.includes(item.id)
+										: inSideFlowNodeId === item.id,
+							  }),
 						/** 输入输出圆点状态 */
 						// dotStatus: nodesInputAndOutputStatus(item.id),
 
 						/** 样式 */
 						style: {
 							...getBatchStyle(item),
-							marginTop: '-44px',
+							marginTop: "-44px",
 							padding: "12px 20px",
 						},
 					},
@@ -379,11 +381,11 @@ const Flow = (props: IProps) => {
 							style: { stroke: "#1370FF", strokeWidth: 2 },
 							animated: true,
 					  }
-					: {}),
+					: { stroke: "#D1D6DE" }),
 				/** 点击batch节点选中 */
 				...(item?.batchId === newSelectId
 					? { style: { stroke: "#1370FF" }, animated: true }
-					: {}),
+					: { stroke: "#D1D6DE" }),
 				labelStyle: { fill: "#8A9099" },
 				labelBgStyle: { fill: "#F7F8FA " },
 				label: item.label ? `(${item.label})` : "",
@@ -641,7 +643,7 @@ const Flow = (props: IProps) => {
 
 	// const onNodesChange = (val: any)=>{
 	// 	// 自定义change事件  不允许react flow组件本身删除事件
-	// 	// return 
+	// 	// return
 	// }
 
 	// const onEdgesChange = (val: any) =>{

src/views/WorkFlowEdit/index.module.css

@@ -66,8 +66,8 @@
 	color: RGBA(66, 141, 255, 1);
 	cursor: pointer;
 	background-color: #fff;
-	transition: width 1s;
-	-webkit-transition: width 1s;
+	transition: width 0.4s;
+	-webkit-transition: width 0.4s;
 	overflow: hidden;
 	display: flex;
 	justify-content: start;