feat: 新增项目后 当前项目变为新增的项目， 切换项目后同时获取filetoken

src/components/MyRouter/useMyRouter.ts

@@ -8,7 +8,10 @@ import NotFound from "@/views/404";
 import useMyRequest from "@/hooks/useMyRequest";
 import { useEffect } from "react";
 import { menu } from "@/api/routes_api";
-import { setFileServerEndPointLocalStorage } from "@/views/Project/project";
+import {
+  setFileServerEndPointLocalStorage,
+  getFiletokenAccordingToId,
+} from "@/views/Project/project";
 
 const useMyRouter = () => {
   const { permissionStore, menuStore, currentProjectStore } = useStores();
@@ -53,6 +56,10 @@ const useMyRouter = () => {
         currentProjectStore.setProjectList(list);
         currentProjectStore.changeProject(list[0]);
         setFileServerEndPointLocalStorage(list[0].zoneId);
+        getFiletokenAccordingToId(list[0].id).then((res) => {
+          list[0].filetoken = res;
+          currentProjectStore.changeProject(list[0]);
+        });
       }
     }
 

src/store/modules/currentProject.ts

@@ -4,6 +4,7 @@ type projectInfo = {
   name?: string;
   desc?: string;
   projectRole?: string;
+  filetoken?: string;
 };
 
 type productInfo = {

src/views/Project/ProjectData/index.tsx

@@ -28,6 +28,7 @@ import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
 import DialogContentText from "@mui/material/DialogContentText";
 import DialogTitle from "@mui/material/DialogTitle";
+import NoProject from "@/components/NoProject";
 import usePass from "@/hooks/usePass";
 import {
   getDataFind,
@@ -63,9 +64,18 @@ const ProjectData = observer(() => {
   const isPass = usePass();
   const Message = useMessage();
   const { currentProjectStore } = useStores();
-  const projectId = useMemo(() => {
-    return toJS(currentProjectStore.currentProjectInfo.id);
-  }, [currentProjectStore]);
+  // const [fileToken, setFileToken] = useState("");
+  const fileToken = toJS(currentProjectStore.currentProjectInfo.filetoken);
+  console.log(fileToken);
+  const projectId = toJS(currentProjectStore.currentProjectInfo.id);
+  console.log(projectId);
+  // const projectId = useMemo(() => {
+  //   console.log(
+  //     toJS(currentProjectStore.currentProjectInfo.id),
+  //     "toJS(currentProjectStore.currentProjectInfo.id)"
+  //   );
+  //   return toJS(currentProjectStore.currentProjectInfo.id);
+  // }, [currentProjectStore]);
   // 当前文件路径
   const [path, setPath] = useState("/");
   const [tableLoadding, setTableLoadding] = useState(false);
@@ -80,7 +90,6 @@ const ProjectData = observer(() => {
   // 复选框选中的文件名称数组
   const [selectIds, setSelectIds] = useState<Array<string>>([]);
   const [keyWord, setKeyWord] = useState("");
-  const [fileToken, setFileToken] = useState("");
   // 文件夹、文件列表
   const [list, setList] = useState<any>([]);
   // 数据集列表  不带文件
@@ -109,11 +118,11 @@ const ProjectData = observer(() => {
   }, [list, dataSetList, activeTab]);
 
   // 获取文件token
-  const { run: getDataFileTokenRun } = useMyRequest(getDataFileToken, {
-    onSuccess: (res: any) => {
-      setFileToken(res.data);
-    },
-  });
+  // const { run: getDataFileTokenRun } = useMyRequest(getDataFileToken, {
+  //   onSuccess: (res: any) => {
+  //     setFileToken(res.data);
+  //   },
+  // });
 
   // 全局搜索数据集
   const { run: getDataFileSearchRun } = useMyRequest(getDataFileSearch, {
@@ -149,7 +158,7 @@ const ProjectData = observer(() => {
 
   // 获取某路径下的数据集
   const getDataSetList = useCallback(() => {
-    if (keyWord) {
+    if (keyWord && projectId) {
       return;
     } else {
       return getDataFindRun({
@@ -161,7 +170,7 @@ const ProjectData = observer(() => {
 
   //  全局搜索数据集
   const getDataSetListSearch = useCallback(() => {
-    if (keyWord) {
+    if (keyWord && projectId) {
       return getDataFileSearchRun({
         projectId: projectId as string,
         name: keyWord,
@@ -246,11 +255,11 @@ const ProjectData = observer(() => {
   };
 
   // 项目切换时重新获取文件token
-  useEffect(() => {
-    getDataFileTokenRun({
-      id: currentProjectStore.currentProjectInfo.id as string,
-    });
-  }, [getDataFileTokenRun, currentProjectStore]);
+  // useEffect(() => {
+  //   getDataFileTokenRun({
+  //     id: currentProjectStore.currentProjectInfo.id as string,
+  //   });
+  // }, [getDataFileTokenRun, currentProjectStore]);
 
   // 搜索值改变
   const handleKeyWordChange = (e: any) => {
@@ -468,7 +477,7 @@ const ProjectData = observer(() => {
               : `${path}/${currentOperateFile.name}`;
           CloudEController.JobOutFileDel(
             deletePath,
-            fileToken,
+            fileToken as string,
             projectId as string
           )?.then((res) => {
             Message.success("删除成功");
@@ -499,7 +508,7 @@ const ProjectData = observer(() => {
             .join(" ");
           CloudEController.JobOutFileDel(
             deletePath,
-            fileToken,
+            fileToken as string,
             projectId as string
           )?.then((res) => {
             Message.success("删除成功");
@@ -512,7 +521,7 @@ const ProjectData = observer(() => {
     } else {
       CloudEController.JobOutFileDel(
         deletePath,
-        fileToken,
+        fileToken as string,
         projectId as string
       )?.then((res) => {
         Message.success("删除成功");
@@ -601,6 +610,7 @@ const ProjectData = observer(() => {
     }
   }, [path]);
 
+  if (currentProjectStore.currentProjectInfo.name) {
     return (
       <ThemeProvider theme={theme}>
         <div className={style.projectData}>
@@ -812,6 +822,9 @@ const ProjectData = observer(() => {
         </div>
       </ThemeProvider>
     );
+  } else {
+    return <NoProject />;
+  }
 });
 
 export default ProjectData;

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

@@ -28,7 +28,10 @@ import Loading from "@/views/Loading";
 import MyDialog from "@/components/mui/MyDialog";
 import { getProjectList } from "../../project";
 import { checkIsNumberLetterChinese } from "@/utils/util";
-import { setFileServerEndPointLocalStorage } from "@/views/Project/project";
+import {
+  setFileServerEndPointLocalStorage,
+  getFiletokenAccordingToId,
+} from "@/views/Project/project";
 
 type zoneIdOption = {
   id: string;
@@ -190,8 +193,15 @@ const BaseInfo = observer(() => {
           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]);
         }
       },

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

@@ -8,6 +8,10 @@ import { useMessage } from "@/components/MySnackbar";
 import { getProjectList } from "../../project";
 import { useStores } from "@/store";
 import { checkIsNumberLetterChinese } from "@/utils/util";
+import {
+  setFileServerEndPointLocalStorage,
+  getFiletokenAccordingToId,
+} from "@/views/Project/project";
 
 type zoneIdOption = {
   id: string;
@@ -45,6 +49,18 @@ const AddProject = (props: any) => {
         message.success("新建项目成功");
         const projectList = await getProjectList();
         currentProjectStore.setProjectList(projectList);
+        let project: any = {};
+        projectList.forEach((item: any) => {
+          if (item.name === name) {
+            project = { ...item };
+          }
+        });
+        currentProjectStore.changeProject(project);
+        setFileServerEndPointLocalStorage(project.zoneId);
+        getFiletokenAccordingToId(project.id).then((res) => {
+          project.filetoken = res;
+          currentProjectStore.changeProject(project);
+        });
       }
     },
     onError: () => {

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

@@ -7,7 +7,10 @@ import ProjectListPopper from "../ProjectListPopper";
 import React, { useEffect, useState } from "react";
 import { observer } from "mobx-react-lite";
 import AddProject from "../AddProject";
-import { setFileServerEndPointLocalStorage } from "@/views/Project/project";
+import {
+  setFileServerEndPointLocalStorage,
+  getFiletokenAccordingToId,
+} from "@/views/Project/project";
 
 const CurrentProject = observer(() => {
   const { currentProjectStore } = useStores();
@@ -33,6 +36,10 @@ const CurrentProject = observer(() => {
   const handleChangeCurrentProject = (project: any) => {
     currentProjectStore.changeProject(project);
     setFileServerEndPointLocalStorage(project.zoneId);
+    getFiletokenAccordingToId(project.id).then((res) => {
+      project.filetoken = res;
+      currentProjectStore.changeProject(project);
+    });
     setProjectListOpen(!projectListOpen);
   };
 

src/views/Project/project.ts

-import { product, hpczone } from "@/api/project_api";
+import { product, hpczone, getDataFileToken } from "@/api/project_api";
 
 export const getProjectList = async () => {
   const res = await product({ product: "CADD" });
@@ -18,3 +18,14 @@ export const setFileServerEndPointLocalStorage = async (zoneId: string) => {
     localStorage.setItem("fileServerEndPoint", fileServerEndPoint);
   }
 };
+
+// 根据项目id获取文件token
+export const getFiletokenAccordingToId = async (projectId: string) => {
+  const res = await getDataFileToken({ id: projectId });
+  console.log(res, "getFiletokenAccordingToId");
+  return res.data;
+  // if (res) {
+  // } else {
+  //   return false;
+  // }
+};