Merge branch 'feat-20220608-projectdata' into 'release'

feat: 新增项目bug修改

See merge request sunyihao/bkunyun!36

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

@@ -184,9 +184,16 @@ const BaseInfo = observer(() => {
         DialogRef.current.handleClose();
         const projectList = await getProjectList();
         currentProjectStore.setProjectList(projectList);
-        currentProjectStore.changeProject(projectList[0]);
-        setFileServerEndPointLocalStorage(projectList[0].zoneId);
-        setProjectInfo(projectList[0]);
+        // 项目删完了
+        if (projectList.length === 0) {
+          currentProjectStore.changeProject({});
+          localStorage.setItem("fileServerEndPoint", "");
+          setProjectInfo({});
+        } else {
+          currentProjectStore.changeProject(projectList[0]);
+          setFileServerEndPointLocalStorage(projectList[0].zoneId);
+          setProjectInfo(projectList[0]);
+        }
       },
     }
   );

src/views/Project/ProjectSetting/index.tsx

@@ -40,7 +40,7 @@ const ProjectSetting = observer(() => {
     setValue(val);
   };
 
-  if (currentProjectStore.currentProjectInfo.name || true) {
+  if (currentProjectStore.currentProjectInfo.name) {
     return (
       <div style={{ padding: 24 }}>
         <div style={{ display: "flex", alignItems: "center" }}>

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

@@ -11,9 +11,9 @@ import { setFileServerEndPointLocalStorage } from "@/views/Project/project";
 
 const CurrentProject = observer(() => {
   const { currentProjectStore } = useStores();
-  // let addProjectRef: any = React.createRef();
+  let addProjectRef: any = React.createRef();
   const [projectListOpen, setProjectListOpen] = useState(false);
-  const [addProjectOpen, setAddProjectOpen] = useState(false);
+  // const [addProjectOpen, setAddProjectOpen] = useState(false);
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
 
   // 结合handleShowProjectList中的event.nativeEvent.stopImmediatePropagation();实现点击空白区域隐藏项目列表
@@ -37,8 +37,8 @@ const CurrentProject = observer(() => {
   };
 
   const openAddProject = () => {
-    // addProjectRef.current.handleClickOpen();
-    setAddProjectOpen(true);
+    addProjectRef.current.handleClickOpen();
+    // setAddProjectOpen(true);
     setProjectListOpen(false);
   };
 
@@ -63,7 +63,7 @@ const CurrentProject = observer(() => {
           style={{ fontSize: 12 }}
         />
       </div>
-      <AddProject open={addProjectOpen} />
+      <AddProject onRef={addProjectRef} />
       <Popper
         id={id}
         open={projectListOpen}