Merge branch 'feat-20220620-taskSubmission' into 'release'

Feat 20220620 task submission

See merge request sunyihao/bkunyun!74

src/components/mui/MyPopconfirm.tsx

 import * as React from "react";
-import { ReactNode } from "react";
+import { ReactNode, useEffect } from "react";
 import Box from "@mui/material/Box";
 import ButtonComponent from "./Button";
 import tipsIcon from "@/assets/project/information-outline.svg";
@@ -28,7 +28,7 @@ const MyPopconfirm = (props: IMyPopconfirmProps) => {
   const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
 
   const handleClick = (event: React.MouseEvent<HTMLElement>) => {
-    console.log(123);
+    event.nativeEvent.stopImmediatePropagation();
     setAnchorEl(anchorEl ? null : event.currentTarget);
   };
 
@@ -45,6 +45,12 @@ const MyPopconfirm = (props: IMyPopconfirmProps) => {
     onConfirm && onConfirm();
   };
 
+  useEffect(() => {
+    document.addEventListener("click", (e) => {
+      setAnchorEl(null);
+    });
+  }, []);
+
   return (
     <div>
       <div aria-describedby={id} onClick={handleClick}>

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

@@ -97,7 +97,13 @@ const ConfigForm = (props: ConfigFormProps) => {
 
   const checkName = (name: string = "") => {
     const reg = new RegExp(/^[a-zA-Z0-9\u4e00-\u9fa5-_]{3,30}$/);
-    if (reg.test(name)) {
+    if (!name) {
+      setNameHelp({
+        error: true,
+        helperText: "任务名称不能为空",
+      });
+      return true;
+    } else if (reg.test(name)) {
       setNameHelp({
         error: false,
         helperText: "",

src/views/Project/ProjectSubmitWork/index.tsx

@@ -91,14 +91,12 @@ const ProjectSubmitWork = () => {
               const checkResult = getCheckResult(parameter, value);
               parameter.error = checkResult.error;
               parameter.helperText = checkResult.helperText;
-            } else {
-              return;
             }
-            if (getCheckResult(parameter, value).error === true) {
+            if (getCheckResult(parameter, parameter.value).error === true) {
               isCheck = false;
             }
-            tack.isCheck = isCheck;
           });
+        tack.isCheck = isCheck;
       } else {
         return;
       }

src/views/Project/ProjectSubmitWork/util.ts

-import { IParameter } from "./interface"
-export const getCheckResult = (parameter: IParameter, value: string): {
-    error: boolean,
-    helperText: string
+import { IParameter } from "./interface";
+export const getCheckResult = (
+  parameter: IParameter,
+  value: string
+): {
+  error: boolean;
+  helperText: string;
 } => {
-    let error = false
-    let helperText = ''
-    // 表单校验
-    if (parameter.required) {
-        if (Array.isArray(value)) {
-            if (value.length === 0) {
-                error = true
-                helperText = '该选项是必填项'
-            }
-        } else if (value === '' || value === null || value === undefined) {
-            error = true
-            helperText = '该选项是必填项'
-        }
+  let error = false;
+  let helperText = "";
+  // 表单校验
+  if (parameter.required) {
+    if (Array.isArray(value)) {
+      if (value.length === 0) {
+        error = true;
+        helperText = "该选项是必填项";
+      }
+    } else if (value === "" || value === null || value === undefined) {
+      error = true;
+      helperText = "该选项是必填项";
     }
-    if (parameter.validators.length > 0) {
-        parameter.validators.forEach((validator)=>{
-            const reg = new RegExp(validator.regex)
-            if (!reg.test(value)) {
-                error = true
-                helperText = validator.message
-            }
-        })
-    }
-    return {
-        error,
-        helperText
-    }
-}
\ No newline at end of file
+  }
+  if (parameter.validators.length > 0) {
+    parameter.validators.forEach((validator) => {
+      const reg = new RegExp(validator.regex);
+      if (!reg.test(value)) {
+        error = true;
+        helperText = validator.message;
+      }
+    });
+  }
+  return {
+    error,
+    helperText,
+  };
+};