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

src/views/Project/ProjectOverview/TaskCard/index.tsx

@@ -69,6 +69,8 @@ const TaskCard = (props: TaskCardProps) => {
     // 渲染状态图标
     const renderStatusIcon = (data: string) => {
         switch (data) {
+            case "SUBMITTED":
+                return jobRun
             case "RUNNING":
                 return jobRun
             case "ABORTED":
@@ -101,6 +103,8 @@ const TaskCard = (props: TaskCardProps) => {
     // 渲染字体颜色
     const renderTextColor = (data: string) => {
         switch (data) {
+            case "SUBMITTED":
+                return "#1370FF";
             case "RUNNING":
                 return "#1370FF";
             case "ABORTED":
@@ -116,6 +120,8 @@ const TaskCard = (props: TaskCardProps) => {
     // 渲染状态框背景颜色
     const renderBackgroundColor = (data: string) => {
         switch (data) {
+            case "SUBMITTED":
+                return "#EBF3FF";
             case "RUNNING":
                 return "#EBF3FF";
             case "ABORTED":
@@ -131,6 +137,8 @@ const TaskCard = (props: TaskCardProps) => {
     //渲染进度条颜色
     const renderProgressColor = useCallback((data: any) => {
         switch (data) {
+            case "SUBMITTED":
+                return "info";
             case "RUNNING":
                 return "info";
             case "ABORTED":

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

@@ -87,11 +87,13 @@ const ProjectMembers = observer(() => {
 	const [jobData, setJobData] = useState("");
 	const [openDialog, setOpenDialog] = useState(false);
 	const [dialogType, setDialogType] = useState("del");
+	const [loading, setLoading] = useState(false)
 	// 获取作业列表
-	const { run: getWorkflowJobInfo, loading } = useMyRequest(
+	const { run: getWorkflowJobInfo } = useMyRequest(
 		getWorkflowJobList,
 		{
 			onSuccess: (result: any) => {
+				setLoading(false)
 				setJobList(result.data.content);
 				setCount(result.data.totalElements);
 				timer && clearTimeout(timer as number);
@@ -296,6 +298,7 @@ const ProjectMembers = observer(() => {
 	const handleKeyWordChangeKeyUp = (e: any) => {
 		if (e.keyCode === 13) {
 			setJobName(e.target.value);
+			setLoading(true)
 		}
 	};
 
@@ -364,6 +367,7 @@ const ProjectMembers = observer(() => {
 							name: jobName,
 							state: currency === "ALL" ? "" : currency,
 						});
+						setLoading(true)
 					}}
 				>
 					<img alt="" src={onload} />
@@ -448,7 +452,7 @@ const ProjectMembers = observer(() => {
 										<Box className={styles.tabBoxJobOperate}>
 											{currentProjectStore.currentProjectInfo.projectRole ===
 												"USER" &&
-											item.creator !==
+												item.creator !==
 												JSON.parse(localStorage.getItem("userInfo") || "{}")
 													?.name ? (
 												""