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

src/components/mui/MyButton.tsx

@@ -54,7 +54,7 @@ const theme = createTheme({
 					"&.MuiButton-outlinedError": {
 						color: "rgba(255, 78, 78, 1)",
 						border: "1px solid rgba(255, 78, 78, 1)",
-						"&:hover": { backgroundColor: "transparent" },
+						"&:hover": { backgroundColor: "#FFEDED" },
 					},
 					"& .MuiLoadingButton-loadingIndicator": {
 						color: "#fff",
@@ -107,6 +107,9 @@ const theme = createTheme({
 						border: "1px solid rgba(221, 225, 230, 1)",
 					},
 				},
+				// outlinedError: {
+				// 	"&:hover": { backgroundColor: "#FFEDED " },
+				// },
 				textSecondary: {
 					backgroundColor: "transparent",
 					color: "#FF4E4E",

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

@@ -29,6 +29,7 @@
 	flex: 1;
 	cursor: pointer;
 	padding: 16px 24px;
+	
 }
 
 .topLine {
@@ -99,6 +100,7 @@
 	display: flex;
 	position: relative;
 	overflow: overlay;
+	padding: 16px 24px 16px 42px;
 }
 
 .noResult {
@@ -111,11 +113,12 @@
 }
 
 .resultBox {
-	padding: 16px 24px 16px 42px;
+	/* padding: 16px 24px 16px 42px; */
 	width: 100%;
 	display: flex;
 	flex-wrap: wrap;
 	align-content: flex-start;
+	box-sizing: border-box;
 }
 
 .result {
@@ -162,4 +165,8 @@
 	display: inline-block;
 	height: 22px;
 	line-height: 22px;
+	width: calc(100% - 30px);
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
 }

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

-.reactFlowBox>div:last-child {
-  display: none;
-}
\ No newline at end of file
+.reactFlowBox > div:last-child {
+	display: none;
+}
+.reactFlowBox > div:first-child {
+	margin-top: 32px;
+}