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

src/assets/project/goback.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组</title>
+    <g id="上线UI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="点击算子" transform="translate(-24.000000, -133.000000)">
+            <g id="编组-12" transform="translate(24.000000, 133.000000)">
+                <g id="编组-16" transform="translate(11.000000, 11.000000) scale(-1, 1) rotate(-90.000000) translate(-11.000000, -11.000000) ">
+                    <rect id="矩形" x="0" y="0" width="22" height="22"></rect>
+                    <g id="编组-14" transform="translate(5.500000, 8.250000)" stroke="#8A9099" stroke-linejoin="round" stroke-width="2">
+                        <polyline id="路径-7备份" transform="translate(5.500000, 2.750000) scale(1, -1) translate(-5.500000, -2.750000) " points="0 5.5 5.5 2.98949133e-16 11 5.5"></polyline>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/components/mui/MyButton.tsx

@@ -46,7 +46,7 @@ const theme = createTheme({
 		MuiButton: {
 			styleOverrides: {
 				root: {
-					minWidth: "48px",
+					minWidth: "68px",
 					boxShadow: "none !important",
 					"&.MuiButton-textError": {
 						color: "rgba(255, 78, 78, 1)",
@@ -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: "transparent" },
 					},
 					"& .MuiLoadingButton-loadingIndicator": {
 						color: "#fff",

src/views/ConsoleLayout/components/FileItem/index.module.css

 .itemBox {
-  height: 50px;
-  padding: 16px 0;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-bottom: 1px solid #f0f2f5;
+	height: 50px;
+	padding: 16px 0;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	border-bottom: 1px solid #f0f2f5;
 }
 
 .fileNameBox {
-  white-space: nowrap;
-  display: inline-block;
-  vertical-align: middle;
-  color: #1e2633;
-  max-width: 260px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  font-size: 14px;
+	white-space: nowrap;
+	display: inline-block;
+	vertical-align: middle;
+	color: #1e2633;
+	max-width: 260px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	font-size: 14px;
 }
+
+.contentBox {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
 .speedBox {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
 }
 
 .rightBox {
-  cursor: pointer;
-  font-size: 12px;
-  color: #1370ff;
+	cursor: pointer;
+	font-size: 12px;
+	color: #1370ff;
 }
 .leftBox {
-  display: flex;
+	display: flex;
 }
 
 .span {
-  color: #8a9099;
-  font-size: 12px;
+	color: #8a9099;
+	font-size: 12px;
 }

src/views/ConsoleLayout/components/FileItem/index.tsx

@@ -98,7 +98,7 @@ const FileItem = observer((props: IProps) => {
 		<div className={styles.itemBox}>
 			<div className={styles.leftBox}>
 				<img src={bkunyunFile} alt="" style={{ marginRight: 16 }} />
-				<div>
+				<div className={styles.contentBox}>
 					<div>
 						<b className={styles.fileNameBox} title={itemInfo?.name || ""}>
 							{itemInfo?.name || ""}

src/views/ConsoleLayout/components/TransferList/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-10 18:05:21
  * @LastEditors: 吴永生 15770852798@163.com
- * @LastEditTime: 2022-09-01 15:54:33
+ * @LastEditTime: 2022-09-02 10:47:33
  * @FilePath: /bkunyun/src/views/ConsoleLayout/components/TransferList/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -20,16 +20,19 @@ const TranSferList = observer(() => {
 	const uploadInfoStore = toJS(useGlobalStore("fileListStore"));
 
 	return (
-		<Box style={{ width: 520, padding: 20 }}>
-			<MyTitle title="传输列表" />
+		<Box style={{ width: 520 }}>
+			<MyTitle style={{ padding: "12px 16px" }} title="传输列表" />
 			<Box
 				style={{
 					display: "flex",
 					justifyContent: "space-between",
 					alignItems: "center",
+					padding: "0 16px",
 				}}
 			>
-				<Box style={{ color: "#8A9099" }}>请勿在上传过程中刷新页面！</Box>
+				<Box style={{ color: "#8A9099", fontSize: 14 }}>
+					请勿在上传过程中刷新页面！
+				</Box>
 				<MySelect
 					variant="standard"
 					value={"default"}
@@ -43,7 +46,7 @@ const TranSferList = observer(() => {
 					size="small"
 				/>
 			</Box>
-			<div style={{ height: 400, overflow: "overlay" }}>
+			<div style={{ height: 400, overflow: "overlay", padding: "0 16px" }}>
 				{uploadInfoStore?.fileList.map((item) => {
 					return <FileItem fileItemInfo={item} key={item.id} />;
 				})}

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

@@ -14,7 +14,7 @@
 	top: 0;
 	height: 56px;
 	background-color: #fff;
-	box-shadow: 0px 3px 10px 0px rgba(0, 24, 57, 0.04);
+	box-shadow: 0px 3px 10px 0px rgba(0, 24, 57, 0.06);
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
@@ -39,7 +39,7 @@
 }
 .swFormBox {
 	background-color: #fff;
-	border-right: 1xp solid rgba(235, 237, 240, 1);
+	border-right: 1px solid #ebedf0;
 	width: 360px;
 	overflow-y: overlay;
 	box-sizing: border-box;

src/views/Project/ProjectJobDetail/index.tsx

@@ -431,7 +431,7 @@ const ProjectSubmitWork = observer(() => {
 						>
 							<ArrowBackIosNewIcon
 								sx={{
-									color: "rgba(194, 198, 204, 1)",
+									color: "#C2C6CC",
 									width: "12px",
 									height: "12px",
 								}}
@@ -442,16 +442,6 @@ const ProjectSubmitWork = observer(() => {
 					</div>
 					{returnPermission && (
 						<div className={styles.swHeaderRight}>
-							{/* <MyPopconfirm
-								title={
-									state === "RUNNING"
-										? "正在运行的任务终止后将无法重新运行，确认继续吗？"
-										: "任务被删除后将无法恢复，确认继续吗？"
-								}
-								onConfirm={() => {
-									state === "RUNNING" ? onStopJob() : onDeleteJob();
-								}}
-							> */}
 							<MyButton
 								text={
 									["SUBMITTED", "RUNNING"].includes(state || "")
@@ -459,7 +449,7 @@ const ProjectSubmitWork = observer(() => {
 										: "删除"
 								}
 								variant="outlined"
-								color="secondary"
+								color="error"
 								onClick={(e: any) =>
 									handleShowPopper(
 										e,
@@ -468,9 +458,7 @@ const ProjectSubmitWork = observer(() => {
 											: "任务被删除后将无法恢复，确认继续吗？"
 									)
 								}
-								// click={onStopJob}
 							></MyButton>
-							{/* </MyPopconfirm> */}
 						</div>
 					)}
 				</div>

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

@@ -56,7 +56,8 @@
 	border-top: 1px solid #f0f2f5;
 }
 .noProjectBox {
-	color: #edeff2;
+	color: #8a9099;
+	font-size: 14px;
 	height: 48px;
 	line-height: 48px;
 	text-align: center;

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

@@ -34,15 +34,17 @@
 
 .versionBox {
 	display: inline-block;
+	background: #f0f2f5;
 	color: #1e2633;
+	cursor: pointer;
+	padding: 1px 9px;
 	border-radius: 2px;
 	font-size: 12px;
-	padding: 2px 8px;
-	background-color: #f0f2f5;
+	line-height: 20px;
 }
 
 .searchBox {
-	padding: 0 24px 16px 24px;
+	padding: 0 24px 8px 24px;
 }
 
 .footerBox {
@@ -61,15 +63,6 @@
 	height: calc(100% - 48px);
 	position: relative;
 }
-
-.versionBox {
-	background: #e6e8eb;
-	color: #1e2633;
-	cursor: pointer;
-	padding: 0 8px;
-	border-radius: 2px;
-}
-
 .noData {
 	display: flex;
 	justify-content: center;

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

@@ -13,6 +13,7 @@ import { IResponse } from "@/api/http";
 import { fetchOperatorList } from "@/api/workbench_api";
 import { useStores } from "@/store";
 import noTemplate from "@/assets/project/noTemplate.svg";
+import SearchInput from "@/components/BusinessComponents/SearchInput";
 
 import styles from "./index.module.css";
 
@@ -198,7 +199,18 @@ const OperatorList = observer((props: IOperatorListProps) => {
 	return (
 		<div className={styles.operatorListBox}>
 			<div className={styles.searchBox}>
-				<OutlinedInput
+				<SearchInput
+					onChange={(e) => {
+						if (e.target.value?.length > 30) return;
+						setKeyword(e.target.value);
+					}}
+					value={keyword}
+					placeholder="输入关键词搜索"
+					onKeyUp={handleEnterCode}
+					size="medium"
+					sx={{ height: 32, width: "100%" }}
+				/>
+				{/* <OutlinedInput
 					onChange={(e) => {
 						if (e.target.value?.length > 30) return;
 						setKeyword(e.target.value);
@@ -209,7 +221,7 @@ const OperatorList = observer((props: IOperatorListProps) => {
 					size="small"
 					sx={{ height: 32, width: "100%" }}
 					endAdornment={<SearchIcon style={{ color: "#8A9099" }} />}
-				/>
+				/> */}
 			</div>
 			<div className={styles.listBox}>
 				{operatorListData.filter((item) => item.type === "BATCH")?.length ? (

src/views/WorkFlowEdit/index.module.css

@@ -25,6 +25,19 @@
 	justify-content: flex-start;
 	align-items: center;
 }
+.goBackIcon {
+	margin-right: 8px;
+	cursor: pointer;
+}
+/* .goBackIcon:hover:{
+	color: ;
+} */
+.goBack {
+	cursor: pointer;
+	color: #1e2633;
+	font-size: 14px;
+	font-weight: 600;
+}
 .swContent {
 	display: flex;
 	height: calc(100vh - 56px);
@@ -74,5 +87,5 @@
 }
 .radiosBox {
 	background-color: #fff;
-	padding: 24px;
+	padding: 24px 24px 20px;
 }

src/views/WorkFlowEdit/index.tsx

@@ -7,8 +7,6 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import React, { useCallback, useEffect, useState, useMemo } from "react";
-import ArrowBackIosNewIcon from "@mui/icons-material/ArrowBackIosNew";
-import IconButton from "@mui/material/IconButton";
 import _ from "lodash";
 import { observer } from "mobx-react-lite";
 
@@ -26,6 +24,7 @@ import useMyRequest from "@/hooks/useMyRequest";
 import CustomOperator from "../CustomOperator";
 import SaveCustomTemplate from "./components/SaveCustomTemplate";
 import AddIcon from "@mui/icons-material/Add";
+import goback from "@/assets/project/goback.svg";
 
 import styles from "./index.module.css";
 
@@ -189,8 +188,18 @@ const WorkFlowEdit = observer((props: IProps) => {
 	return (
 		<div className={styles.swBox}>
 			<div className={styles.swHeader}>
-				<div className={styles.swHeaderLeft}>
-					<IconButton
+				<div
+					className={styles.swHeaderLeft}
+					onClick={(e: any) =>
+						handleShowPopper(
+							e,
+							"返回后，当前页面已填写内容将不保存，确认返回吗？"
+						)
+					}
+				>
+					<img className={styles.goBackIcon} src={goback} alt="" />
+					<span className={styles.goBack}>返回</span>
+					{/* <IconButton
 						color="primary"
 						aria-label="upload picture"
 						component="span"
@@ -209,7 +218,8 @@ const WorkFlowEdit = observer((props: IProps) => {
 								height: "12px",
 							}}
 						/>
-					</IconButton>
+						返回
+					</IconButton> */}
 				</div>
 				<div className={styles.swHeaderRight}>
 					<MyButton text="保存" onClick={() => handlePreserve()}></MyButton>