Merge branch 'feat-20220801' into 'release'

cn-Feat 20220801

See merge request !91

src/components/mui/MySelect.tsx

@@ -154,6 +154,7 @@ export default function MySelect(props: IProps) {
 			MuiInputLabel: {
 				styleOverrides: {
 					root: {
+						fontSize: "14px",
 						// 下拉框未选择时的label定位
 						top: "-9px",
 					},
@@ -180,6 +181,14 @@ export default function MySelect(props: IProps) {
 					},
 				},
 			},
+
+			// MuiFormControl: {
+			// 	styleOverrides: {
+			// 		root: {
+			// 			width: fullWidth ? "100%" : "auto",
+			// 		},
+			// 	},
+			// },
 		},
 	});
 

src/views/Project/ProjectJobDetail/LogView/index.module.css

@@ -36,21 +36,22 @@
 
 .logTitle {
 	display: flex;
-	width: 0;
-	max-width: 200px;
+	/* width: 0; */
+	/* max-width: 200px; */
 	overflow: hidden;
 	white-space: nowrap;
-	text-overflow:ellipsis;
-	flex: 1;
+	text-overflow: ellipsis;
+	/* flex: 1; */
 	align-items: center;
-	height: 30px;
+	height: 32px;
 	line-height: 20px;
-	padding: 0 24px;
+	padding: 0 32px;
 	cursor: pointer;
 	border-right: 1px solid #10141A;
 }
 
 .logTitleSelected {
+	flex-shrink: 0;
 	background: #282c34;
 	color: #ffffff;
 }
@@ -78,7 +79,7 @@
 	width: calc(100vw - 64px);
 	background-color: #282c34;
 	position: absolute;
-	top: 30px;
+	top: 32px;
 	left: 32px;
 	z-index: 1005;
 }

src/views/Project/ProjectJobDetail/index.module.css

@@ -130,7 +130,6 @@
 	word-break: break-all;
 	flex: 1;
 	justify-content: flex-end;
-
 	overflow: hidden;
 	word-wrap: break-word;
 	text-overflow: ellipsis;
@@ -151,6 +150,8 @@
 }
 .taskInfoValueIcon {
 	margin-right: 9px;
+	position: relative;
+	top: 3px;
 }
 .tabs {
 	display: flex;

src/views/Project/ProjectOverview/TaskCard/index.module.css

@@ -127,7 +127,9 @@
 	align-items: center;
 	color: #1e2633;
 	cursor: pointer;
-	height: 30px;
+	height: 31px;
+	display: flex;
+	align-items: center;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;

src/views/WorkFlowEdit/components/OperatorList/index.module.css

@@ -4,12 +4,18 @@
 	cursor: grab;
 	padding: 16px 16px 0 24px;
 	background-color: #fff;
+	transition: width 0.2s;
+	-webkit-transition: width 0.2s; /* Safari */
 }
 .operatorItemBox:hover {
 	box-shadow: 0px 5px 16px 0px rgba(0, 24, 57, 0.1);
 	position: relative;
 	top: -1px;
 }
+.operatorItemBox .footerBox {
+	transition: width 0.2s;
+	-webkit-transition: width 0.2s; /* Safari */
+}
 .operatorItemBox:hover .footerBox {
 	border-bottom: 1px solid #fff;
 }

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

@@ -300,6 +300,7 @@ const ParameterSetting = (props: IParameterSettingProps) => {
 								helpertext={parameter.helperText}
 								options={parameter?.choices || []}
 								disabled={parameter.parameterGroup === "out"}
+								fullWidth={true}
 							></MySelect>
 						)}
 						{(parameter.domType || "").toLowerCase() === "multipleselect" && (
@@ -320,6 +321,7 @@ const ParameterSetting = (props: IParameterSettingProps) => {
 								helpertext={parameter.helperText}
 								options={parameter?.choices || []}
 								disabled={parameter.parameterGroup === "out"}
+								fullWidth={true}
 							></MySelect>
 						)}
 						{(parameter.domType || "").toLowerCase() === "radio" && (
@@ -510,7 +512,12 @@ const ParameterSetting = (props: IParameterSettingProps) => {
 		} else {
 			setActiveParamsTab(""); // 会报错  不过不会有蓝色长条
 		}
-	}, [basisParameters, seniorParameters, hardwareParameters]);
+	}, [
+		taskId,
+		basisParameters.length,
+		seniorParameters.length,
+		hardwareParameters.length,
+	]);
 
 	return (
 		<div className={styles.parameterSetting}>