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

src/components/BusinessComponents/NoProject/NoProject.tsx

@@ -12,16 +12,20 @@ import AddIcon from "@mui/icons-material/Add";
 import AddProject from "@/views/Project/components/AddProject";
 import React, { useState } from "react";
 import MyButton from "@/components/mui/MyButton";
+import { toJS } from "mobx";
+import { observer } from "mobx-react-lite";
+import { useStores } from "@/store/index";
 
-const NoProject = () => {
+const NoProject = observer((props: any) => {
 	// 新建弹窗显示控制
 	const [addOpen, setAddOpen] = useState(false);
-
+	const { currentProjectStore } = useStores();
+	let projectList = toJS(currentProjectStore.projectList)
 	return (
 		<div className={style.noProject}>
 			<img src={noData} alt="" className={style.noDataImg} />
-			<div className={style.text1}>当前产品暂无项目</div>
-			<div className={style.text2}>请先创建项目</div>
+			<div className={style.text1}>{projectList.length > 0 ? "当前未选中任何项目" : "当前产品暂无项目"}</div>
+			<div className={style.text2}>{projectList.length > 0 ? "或创建新项目" : "请先创建项目"}</div>
 			<MyButton
 				text='创建项目'
 				variant="contained"
@@ -30,11 +34,11 @@ const NoProject = () => {
 				onClick={() => setAddOpen(true)}
 				style={{ backgroundColor: "#1370ff", color: "#fff" }}
 			/>
-				
-			
+
+
 			<AddProject addOpen={addOpen} setAddOpen={setAddOpen} />
 		</div>
 	);
-};
+});
 
 export default NoProject;

src/components/mui/MySwitch.tsx

@@ -11,7 +11,8 @@ import Switch, { SwitchProps } from "@mui/material/Switch";
 import { ThemeProvider, createTheme } from "@mui/material/styles";
 
 interface IMySwitchProps extends SwitchProps {
-	value: boolean;
+	value?: boolean;
+	defaultChecked?: boolean;
 	onChange?: any;
 	disabled?: boolean;
 }
@@ -52,23 +53,24 @@ const theme = createTheme({
 });
 
 const MySwitch = (props: IMySwitchProps) => {
-	const { value, onChange, disabled = false, size, ...other } = props;
+	const { value, defaultChecked, onChange, disabled = false, size, ...other } = props;
 	return (
 		<ThemeProvider theme={theme}>
 			<Switch
 				checked={value}
 				disabled={disabled}
+				defaultChecked={defaultChecked}
 				onChange={onChange}
 				sx={
 					size === "medium"
 						? {
-								width: 44,
-								height: 24,
-						  }
+							width: 44,
+							height: 24,
+						}
 						: {
-								width: 40,
-								height: 22,
-						  }
+							width: 40,
+							height: 22,
+						}
 				}
 				{...other}
 			/>

src/views/MenuLayout/index.tsx

@@ -41,7 +41,9 @@ const MenuLayout = observer(() => {
   return (
     <Box className={style.container}>
       <Box className={style.aside}>
-        <CurrentProject />
+      {
+          pathname.indexOf('userCenter') < 0 && <CurrentProject />
+        }
         <List
           sx={{
             paddingTop: 0,

src/views/Project/ProjectData/AddFolder/index.tsx

@@ -60,7 +60,9 @@ const AddFolder = (props: IAddFolderProps) => {
 
 	const handleFileNameChange = (e: any) => {
 		const fileName = e.target.value;
-		setFileName(fileName);
+		if (fileName.length <= 30) {
+			setFileName(fileName);
+		}
 		if (!fileName) {
 			setFileNameCheck({
 				error: true,
@@ -123,7 +125,7 @@ const AddFolder = (props: IAddFolderProps) => {
 						helperText={fileNameCheck.help}
 						InputProps={{
 							endAdornment: (
-								<InputAdornment position="end">
+								<InputAdornment position="end" style={{ color: fileName.length >= 30 ? "#d32f2f" : "#C2C6CC" }}>
 									{fileName.length}/30
 								</InputAdornment>
 							),

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

@@ -2,7 +2,7 @@
 	position: relative;
 }
 .projectDataStickyTop {
-	padding: 28px 24px;
+	padding: 28px 24px 64px;
 	position: relative;
 }
 .projectDataTitle {
@@ -56,8 +56,9 @@
 
 .projectDataStickyBox {
 	height: 64px;
-	position: sticky;
-	bottom: -1px;
+	width: calc(100vw - 220px);
+	position: fixed;
+	bottom: 0px;
 	border: 1px solid #ebedf0;
 	z-index: 100;
 	background-color: #fff;

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

@@ -36,12 +36,17 @@
 }
 
 .taskName {
+    min-width: 100px;
     font-size: 14px;
     line-height: 22px;
     font-weight: 500;
     cursor: pointer;
 }
 
+.taskName:hover{
+    color: #1370FF;
+}
+
 .taskStatus {
     display: flex;
     align-items: center;

src/views/Project/ProjectOverview/index.tsx

@@ -43,6 +43,7 @@ const ProjectOverview = observer(() => {
             setTaskList(result.data.content);
         },
     });
+
     useEffect(() => {
         if (currentProjectStore.currentProjectInfo.id) {
             getOverview({
@@ -69,6 +70,10 @@ const ProjectOverview = observer(() => {
         }
     }
 
+    const handleKeyWordChangeBlur=(e:any)=>{
+        setJobName(e.target.value);
+    }
+
     const storageUnitFromB = (b: number) => {
         if (b <= 0) {
             return { data: '0.00', unit: 'KB' };
@@ -142,6 +147,7 @@ const ProjectOverview = observer(() => {
                         </div>
                         <SearchInput
                             onKeyUp={handleKeyWordChangeKeyUp}
+                            onBlur={handleKeyWordChangeBlur}
                             sx={{ width: 340 }}
                         />
                     </div>

src/views/Project/ProjectSetting/BaseInfo/index.tsx

@@ -276,20 +276,20 @@ const BaseInfo = observer(() => {
 			const projectList = await getProjectList();
 			currentProjectStore.setProjectList(projectList);
 			// 项目删完了
-			if (projectList.length === 0) {
-				currentProjectStore.changeProject({});
-				localStorage.setItem("fileServerEndPoint", "");
-				setProjectInfo({});
-			} else {
-				projectList[0].filetoken = getFiletokenAccordingToId(projectList[0].id);
-				currentProjectStore.changeProject(projectList[0]);
-				setFileServerEndPointLocalStorage(projectList[0].zoneId);
-				getFiletokenAccordingToId(projectList[0].id).then((res) => {
-					projectList[0].filetoken = res;
-					currentProjectStore.changeProject(projectList[0]);
-				});
-				setProjectInfo(projectList[0]);
-			}
+			// if (projectList.length === 0) {
+			currentProjectStore.changeProject({});
+			localStorage.setItem("fileServerEndPoint", "");
+			setProjectInfo({});
+			// } else {
+			// 	projectList[0].filetoken = getFiletokenAccordingToId(projectList[0].id);
+			// 	currentProjectStore.changeProject(projectList[0]);
+			// 	setFileServerEndPointLocalStorage(projectList[0].zoneId);
+			// 	getFiletokenAccordingToId(projectList[0].id).then((res) => {
+			// 		projectList[0].filetoken = res;
+			// 		currentProjectStore.changeProject(projectList[0]);
+			// 	});
+			// 	setProjectInfo(projectList[0]);
+			// }
 		},
 	});
 
@@ -349,8 +349,8 @@ const BaseInfo = observer(() => {
 							[style.projectInfoTextarea]: true,
 						})}
 						onChange={descChange}
-						placeholder="项目描述限制100字以内"
-						maxLength={100}
+						placeholder="项目描述限制300字以内"
+						maxLength={300}
 					></textarea>
 					{/* <MyInput
 						value={projectInfo.desc}

src/views/Project/ProjectSubmitWork/ConfigForm/index.tsx

@@ -100,7 +100,7 @@ const ConfigForm = (props: ConfigFormProps) => {
 	};
 
 	const checkName = (name: string = "") => {
-		const reg = new RegExp(/^[a-zA-Z0-9\u4e00-\u9fa5-_]{3,30}$/);
+		const reg = new RegExp(/^[a-zA-Z0-9\u4e00-\u9fa5-_]{3,50}$/);
 		if (!name) {
 			setNameHelp({
 				error: true,
@@ -117,7 +117,7 @@ const ConfigForm = (props: ConfigFormProps) => {
 			setNameHelp({
 				error: true,
 				helperText:
-					"请输入正确任务名称（3~30字符，可包含大小写字母、数字、中文、特殊符号“-”、“_”）",
+					"请输入正确任务名称（3~50字符，可包含大小写字母、数字、中文、特殊符号“-”、“_”）",
 			});
 			return true;
 		}

src/views/Project/ProjectWorkbench/workbenchList/index.tsx

@@ -38,6 +38,7 @@ import { observer } from "mobx-react-lite";
 import usePass from "@/hooks/usePass";
 import MyProgress from "@/components/mui/MyProgress";
 import SearchInput from "@/components/BusinessComponents/SearchInput";
+import MyCircularProgress from "@/components/mui/MyCircularProgress";
 import moment from "moment";
 
 import styles from "./index.module.css";
@@ -68,6 +69,7 @@ const currencies = [
 let timer: string | number | NodeJS.Timeout | null | undefined = null;
 const ProjectMembers = observer(() => {
 	const { currentProjectStore } = useStores();
+	
 	const projectId = toJS(currentProjectStore.currentProjectInfo.id);
 	const isPass = usePass();
 	const [jobName, setJobName] = useState("");
@@ -77,6 +79,7 @@ const ProjectMembers = observer(() => {
 	const [size, setSize] = useState(10);
 	const [rowsPerPage, setRowsPerPage] = useState(10);
 	const [count, setCount] = useState(0);
+	const [loading,setLoading]=useState(false)
 	/** 简单弹窗 */
 	const [jobData, setJobData] = useState("");
 	const [openDialog, setOpenDialog] = useState(false);
@@ -86,6 +89,7 @@ const ProjectMembers = observer(() => {
 		onSuccess: (result: any) => {
 			setJobList(result.data.content);
 			setCount(result.data.totalElements);
+			setLoading(false);
 			timer && clearTimeout(timer as number);
 			timer = null;
 			timer = setTimeout(() => {
@@ -122,7 +126,7 @@ const ProjectMembers = observer(() => {
 		},
 	});
 
-	// 删除作业
+	// 中止作业
 	const { run: cancelWorkflowJobInfo } = useMyRequest(cancelWorkflowJob, {
 		onSuccess: (result: any) => {
 			setOpenDialog(false);
@@ -347,13 +351,15 @@ const ProjectMembers = observer(() => {
 							name: jobName,
 							state: currency === "ALL" ? "" : currency,
 						});
+						setLoading(true)
 					}}
 				>
 					<img alt="" src={onload} />
 				</Box>
 			</Box>
 
-			<Box className={styles.body}>
+			<Box className={styles.body} style={{ position: "relative" }}>
+				<MyCircularProgress loading={loading} />
 				{jobList.length === 0 && (
 					<Box
 						sx={{
@@ -423,21 +429,22 @@ const ProjectMembers = observer(() => {
 								{item.state === "RUNNING" &&
 									isPass("PROJECT_WORKBENCH_JOBS_STOP", "USER") && (
 										<Box className={styles.tabBoxJobOperate}>
-											<img
-												alt=""
-												src={jobStop}
-												style={{ cursor: "pointer" }}
-												onClick={(event) => {
-													event.stopPropagation();
-													event.nativeEvent.stopImmediatePropagation();
-													setJobData(item.id);
-													setOpenDialog(true);
-													setDialogType("stop");
-												}}
-											/>
+											{
+												currentProjectStore.currentProjectInfo.projectRole === "USER" && (item.creator !== JSON.parse(localStorage.getItem("userInfo") || "{}")?.name) ? "" : <img
+													alt=""
+													src={jobStop}
+													style={{ cursor: "pointer" }}
+													onClick={(event) => {
+														event.stopPropagation();
+														event.nativeEvent.stopImmediatePropagation();
+														setJobData(item.id);
+														setOpenDialog(true);
+														setDialogType("stop");
+													}}
+												/>
+											}
 										</Box>
 									)}
-
 								{item.state !== "RUNNING" &&
 									isPass("PROJECT_WORKBENCH_JOBS_DELETE", "MANAGER") && (
 										<Box className={styles.tabBoxJobOperate}>

src/views/Project/ProjectWorkbench/workbenchTemplate/components/AddTemplate/index.module.css

@@ -2,21 +2,36 @@
 	flex: 1;
 	background-color: #fff;
 	border-radius: 16px 0 0 0;
-	padding: 24px 32px;
+	padding-top: 24px;
 	box-sizing: border-box;
+}
+
+.headerBox {
+	padding: 0 32px;
+}
+
+.headerBoxShadow {
+	box-shadow: 0 5px 4px -4px rgb(0, 0, 0, .15);
+}
+
+.templateBox {
+	padding: 0 32px;
+	height: calc(100vh - 168px);
 	overflow: auto;
 }
+
 .templateList {
 	/* height: 2000px; */
 	display: flex;
 	justify-content: space-between;
 	flex-wrap: wrap;
 }
+
 .templateLi {
-	height: 146px;
+	height: 170px;
 	box-sizing: border-box;
 	padding: 16px 20px;
-	cursor: pointer;
+	/* cursor: pointer; */
 	border: 1px solid rgba(235, 237, 240, 1);
 	border-radius: 4px;
 	min-width: 20%;
@@ -24,37 +39,45 @@
 	margin-right: 16px;
 	margin-bottom: 16px;
 }
+
 .templateLiCustom {
-	height: 194px;
+	height: 170px;
 }
+
 .templateLiHidden {
 	visibility: hidden;
 }
+
 .addCustomTemplate {
-	height: 194px;
+	height: 170px;
 	box-sizing: border-box;
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	flex-direction: column;
 }
+
 .addCustomTemplateText {
 	margin-top: 12px;
 	line-height: 22px;
 	font-size: 14px;
 	color: rgba(138, 144, 153, 1);
 }
+
 .templateLi:hover {
 	box-shadow: 6px 8px 22px 0px rgba(0, 24, 57, 0.08);
 }
+
 .templateLi:nth-child(4n) {
 	margin-right: 0;
 }
+
 .templateLiTop {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 }
+
 .templateTitle {
 	font-size: 14px;
 	font-weight: 600;
@@ -64,14 +87,17 @@
 	text-overflow: ellipsis;
 	line-height: 22px;
 }
+
 .templateLiInfo {
 	margin-bottom: 8px;
 }
+
 .templateLiInfoText {
 	line-height: 20px;
 	font-size: 12px;
 	color: rgba(19, 112, 255, 1);
 }
+
 .templateLiDesc {
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -82,8 +108,9 @@
 	font-size: 12px;
 	color: rgba(138, 144, 153, 1);
 }
+
 .templateLiEditBox {
 	display: flex;
 	justify-content: flex-end;
-	margin-top: 16px;
+	/* margin-top: 16px; */
 }

src/views/Project/ProjectWorkbench/workbenchTemplate/components/templateBox.tsx

@@ -81,7 +81,7 @@ const TemplateBox = (props: any) => {
 					</Typography>
 				</Box>
 				<Typography className={styles.templateDescText}>
-					{info.description}
+					{info.description ? info.description : "此模板暂无描述。"}
 				</Typography>
 			</Box>
 			<Box

src/views/Project/ProjectWorkbench/workbenchTemplate/index.tsx

@@ -182,7 +182,15 @@ const ProjectMembers = observer(() => {
 
 			{showAddTemplate && (
 				<AddTemplate
-					setShowAddTemplate={() => setShowAddTemplate(false)}
+					setShowAddTemplate={
+						() => {
+							setShowAddTemplate(false)
+							getTemplateInfo({
+								projectId: projectIdData as string,
+								title: templateName,
+							});
+						}
+					}
 					getTemplateInfo={getTemplateInfo}
 					productId={productId as string}
 					projectId={projectIdData as string}

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

 import { MenuItem } from "@mui/material";
 import React, { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
 
 import MyInput from "@/components/mui/MyInput";
 import MyDialog from "@/components/mui/MyDialog";
@@ -29,6 +30,7 @@ type IAddProjectProps = {
 const AddProject = (props: IAddProjectProps) => {
 	const { addOpen, setAddOpen } = props;
 	const { currentProjectStore } = useStores();
+	const navigate = useNavigate();
 	const message = useMessage();
 	const [name, setName] = useState("");
 	const [nameCheck, setNameCheck] = useState({
@@ -74,6 +76,7 @@ const AddProject = (props: IAddProjectProps) => {
 					project.filetoken = res;
 					currentProjectStore.changeProject(project);
 				});
+				navigate(`/product/cadd/projectOverview`)
 			}
 		},
 		onError: () => {
@@ -134,11 +137,11 @@ const AddProject = (props: IAddProjectProps) => {
 
 	const handleDescChange = (e: any) => {
 		const desc = e.target.value;
-		setDesc(desc.slice(0,100));
-		// if (desc.length > 100) {
+		setDesc(desc.slice(0,300));
+		// if (desc.length > 300) {
 		// 	setDescCheck({
 		// 		error: true,
-		// 		help: "格式不正确，必须在100字符以内",
+		// 		help: "格式不正确，必须在300字符以内",
 		// 	});
 		// } else {
 		// 	setDescCheck({
@@ -211,7 +214,7 @@ const AddProject = (props: IAddProjectProps) => {
 						id="desc"
 						label="项目描述"
 						multiline
-						rows={5}
+						rows={4}
 						placeholder="请输入项目描述"
 						onChange={handleDescChange}
 						helperText={descCheck.help}
@@ -221,10 +224,10 @@ const AddProject = (props: IAddProjectProps) => {
 							position: "absolute",
 							bottom: "7px",
 							right: "12px",
-							color: "rgba(194, 198, 204, 1)",
+							color: desc.length >= 300 ? "#d32f2f" : "#C2C6CC"
 						}}
 					>
-						{desc.length}/100
+						{desc.length}/300
 					</span>
 				</div>
 			</div>

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

@@ -478,7 +478,7 @@ const ParameterSetting = (props: IParameterSettingProps) => {
 								onChange={(e: any) =>
 									handleParameterChange(e, parameter.name || "")
 								}
-								placeholder="请输入"
+								placeholder="可输入默认值"
 								error={parameter.error || false}
 								helperText={parameter.helperText}
 								disabled={parameter.parameterGroup === "out"}

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

@@ -240,14 +240,27 @@ const SaveCustomTemplate = (props: IProps) => {
 					helperText={versionHelper.helperText}
 					style={{ marginBottom: "20px" }}
 				></MyInput>
-				<MyInput
-					value={description}
-					label="模板描述"
-					placeholder="模板描述"
-					onChange={handleDescriptionChange}
-					multiline
-					rows={4}
-				></MyInput>
+				<div style={{ position: "relative" }}>
+					<MyInput
+						value={description}
+						id="desc"
+						label="模板描述"
+						placeholder="模板描述"
+						onChange={handleDescriptionChange}
+						multiline
+						rows={4}
+					/>
+						<span
+							style={{
+								position: "absolute",
+								bottom: "7px",
+								right: "12px",
+								color: description.length >= 300 ? "#d32f2f" : "#C2C6CC"
+							}}
+						>
+							{description.length}/300
+						</span>
+				</div>
 			</div>
 		</MyDialog>
 	);