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

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

@@ -17,6 +17,13 @@
 	text-overflow: ellipsis;
 	font-size: 14px;
 }
+
+.contentBox {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
 .speedBox {
 	display: flex;
 	justify-content: space-between;

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/ProjectWorkbench/workbenchTemplate/index.tsx

@@ -10,7 +10,8 @@ import { memo, useEffect, useState } from "react";
 import { Box, Typography } from "@mui/material";
 import { toJS } from "mobx";
 import { observer } from "mobx-react-lite";
-import Add from "@mui/icons-material/Add";
+import FormatListBulletedRoundedIcon from '@mui/icons-material/FormatListBulletedRounded';
+
 
 import MyButton from "@/components/mui/MyButton";
 import SearchInput from "@/components/BusinessComponents/SearchInput";
@@ -115,7 +116,7 @@ const ProjectMembers = observer(() => {
 				{isPass("PROJECT_WORKBENCH_FLOES_ADD", "MANAGER") && (
 					<MyButton
 						text={"管理工作流模板"}
-						img={<Add />}
+						startIcon={<FormatListBulletedRoundedIcon fontSize="small"/>}
 						onClick={addTemplateBlock}
 						size={"medium"}
 					/>

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;