feat: 产品id动态获取

src/views/ConsoleLayout/components/FileItem/index.tsx

@@ -77,11 +77,19 @@ const FileItem = observer((props: IProps) => {
 		if (text === "查看文件") {
 			if (
 				location?.state?.pathName !== fileItemInfo?.path ||
-				location?.pathname !== "/product/cadd/projectData"
+				location?.pathname !==
+					`/product/${
+						currentProjectStore.currentProductInfo.id || "cadd"
+					}/projectData`
 			) {
-				navigate(`/product/cadd/projectData`, {
-					state: { pathName: fileItemInfo?.path },
-				});
+				navigate(
+					`/product/${
+						currentProjectStore.currentProductInfo.id || "cadd"
+					}/projectData`,
+					{
+						state: { pathName: fileItemInfo?.path },
+					}
+				);
 			}
 		}
 	};

src/views/CustomOperator/components/OperatorList/index.tsx

@@ -10,6 +10,7 @@ import useMyRequest from "@/hooks/useMyRequest";
 import { useStores } from "@/store";
 import { toJS } from "mobx";
 import { ITask } from "@/views/Project/ProjectSubmitWork/interface";
+import { observer } from "mobx-react-lite";
 
 type IProps = {
 	operatorList: ITask[];
@@ -17,7 +18,7 @@ type IProps = {
 	setInputActive: any;
 };
 
-const OperatorList = (props: IProps) => {
+const OperatorList = observer((props: IProps) => {
 	const { operatorList, setOperatorList, setInputActive } = props; // 流程图中流算子列表
 	const { currentProjectStore } = useStores();
 	const [list, setList] = useState<ITask[]>([]); // 算子列表
@@ -249,6 +250,6 @@ const OperatorList = (props: IProps) => {
 			</div>
 		</div>
 	);
-};
+});
 
 export default OperatorList;

src/views/Project/ProjectJobDetail/index.tsx

@@ -187,11 +187,11 @@ const ProjectSubmitWork = observer(() => {
 	const goToProjectData = (path: string) => {
 		path = path.slice(12);
 		if (path) {
-			navigate(`/product/cadd/projectData`, {
+			navigate(`/product/${productId || "cadd"}/projectData`, {
 				state: { pathName: path },
 			});
 		} else {
-			navigate(`/product/cadd/projectData`, {
+			navigate(`/product/${productId || "cadd"}/projectData`, {
 				state: { pathName: "/" },
 			});
 		}
@@ -217,13 +217,13 @@ const ProjectSubmitWork = observer(() => {
 	/** 返回事件 */
 	const onBack = useCallback(() => {
 		if (locationInfo.from === "projectOverview") {
-			navigate("/product/cadd/projectOverview");
+			navigate(`/product/${productId || "cadd"}/projectOverview`);
 		} else {
-			navigate("/product/cadd/projectWorkbench", {
+			navigate(`/product/${productId || "cadd"}/projectWorkbench`, {
 				state: { type: "workbenchList" },
 			});
 		}
-	}, [navigate, locationInfo.from]);
+	}, [navigate, locationInfo.from, productId]);
 
 	const getOutouts = (outputs: any) => {
 		if (outputs) {

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

@@ -2,6 +2,9 @@ import { useMemo, useCallback, useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import MyProgress from "@/components/mui/MyProgress";
 import style from "./index.module.css";
+import { useStores } from "@/store";
+import { toJS } from "mobx";
+import { observer } from "mobx-react-lite";
 
 import runTime from "../../../../assets/project/runTime.svg";
 import jobCostImg from "../../../../assets/project/jobCost.svg";
@@ -38,6 +41,8 @@ const TaskCard = (props: TaskCardProps) => {
 	} = props;
 	const navigate = useNavigate();
 	const [displayTitleBlue, setDisplayTitleBlue] = useState<boolean>(false);
+	const { currentProjectStore } = useStores();
+	const productId = toJS(currentProjectStore.currentProductInfo.id); // 产品ID
 
 	const randerOutputs = useMemo(() => {
 		if (outputs) {
@@ -68,13 +73,13 @@ const TaskCard = (props: TaskCardProps) => {
 			path = path.slice(0, lastIndex);
 		}
 		path = path.slice(12);
-		navigate(`/product/cadd/projectData`, {
+		navigate(`/product/${productId || "cadd"}/projectData`, {
 			state: { pathName: path || "/", dataType: type },
 		});
 	};
 	// 跳转详情页
 	const gotoDetail = (id: string) => {
-		navigate(`/product/cadd/projectJobDetail`, {
+		navigate(`/product/${productId || "cadd"}/projectJobDetail`, {
 			state: { taskId: id, from: "projectOverview" },
 		});
 	};

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

@@ -40,6 +40,7 @@ const BaseInfo = observer(() => {
 	const message = useMessage();
 	const { currentProjectStore } = useStores();
 	const fileToken = toJS(currentProjectStore.currentProjectInfo.filetoken);
+	const productId = toJS(currentProjectStore.currentProductInfo.id); // 产品ID
 	const [projectInfo, setProjectInfo] = useState<any>({});
 	const [deleteProjectName, setDeleteProjectName] = useState("");
 	const [nameCheck, setNameCheck] = useState({
@@ -258,7 +259,7 @@ const BaseInfo = observer(() => {
 		{
 			onSuccess: async (result: any) => {
 				message.success("修改成功");
-				const projectList = await getProjectList();
+				const projectList = await getProjectList(productId);
 				currentProjectStore.setProjectList(projectList);
 				projectInfo.filetoken = fileToken;
 				currentProjectStore.changeProject(projectInfo);
@@ -272,7 +273,7 @@ const BaseInfo = observer(() => {
 			checkName(projectInfo.name, true) &&
 			checkBudget(projectInfo.projectBudget, true)
 		) {
-			updateProjectRun({ ...projectInfo, product: "cadd" });
+			updateProjectRun({ ...projectInfo, product: `${productId || "cadd"}` });
 		} else {
 			return;
 		}
@@ -282,7 +283,7 @@ const BaseInfo = observer(() => {
 		onSuccess: async (result: any) => {
 			message.success("删除成功");
 			setDialogOpen(false);
-			const projectList = await getProjectList();
+			const projectList = await getProjectList(productId);
 			currentProjectStore.setProjectList(projectList);
 			// 项目删完了
 			currentProjectStore.changeProject({});

src/views/Project/ProjectSubmitWork/index.tsx

@@ -34,6 +34,7 @@ const ProjectSubmitWork = observer(() => {
 	const Message = useMessage();
 	const { currentProjectStore } = useStores();
 	const projectId = toJS(currentProjectStore.currentProjectInfo.id);
+	const productId = toJS(currentProjectStore.currentProductInfo.id); // 产品ID
 	const [templateConfigInfo, setTemplateConfigInfo] =
 		useState<ITemplateConfig>();
 	const location: any = useLocation();
@@ -46,7 +47,7 @@ const ProjectSubmitWork = observer(() => {
 
 	// 前往工作台
 	const goToWorkbench = (toWorkbenchList = false) => {
-		navigate("/product/cadd/projectWorkbench", {
+		navigate(`/product/${productId || "cadd"}/projectWorkbench`, {
 			state: { type: toWorkbenchList ? "workbenchList" : "" },
 		});
 	};

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

@@ -7,18 +7,15 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import { memo, useCallback, useEffect, useState } from "react";
-import _ from "lodash";
 import { useNavigate } from "react-router-dom";
 import { Box, Typography } from "@mui/material";
 import OutlinedInput from "@mui/material/OutlinedInput";
-import { TablePagination } from "@mui/material";
 import MyPagination from "@/components/mui/MyPagination";
 
 import MySelect from "@/components/mui/MySelect";
 import SimpleDialog from "./components/simpleDialog";
 import { useStores } from "@/store";
 import useMyRequest from "@/hooks/useMyRequest";
-import ActionsComponent from "../../../../components/Material.Ui/Table/ActionsComponent";
 import runTime from "../../../../assets/project/runTime.svg";
 import jobCost from "../../../../assets/project/jobCost.svg";
 import jobSue from "../../../../assets/project/jobSue.svg";
@@ -77,6 +74,7 @@ const ProjectMembers = observer(() => {
 	const { currentProjectStore } = useStores();
 
 	const projectId = toJS(currentProjectStore.currentProjectInfo.id);
+	const productId = toJS(currentProjectStore.currentProductInfo.id); // 产品ID
 	const isPass = usePass();
 	const [jobName, setJobName] = useState("");
 	const [jobList, setJobList] = useState([]);
@@ -287,11 +285,11 @@ const ProjectMembers = observer(() => {
 	/** 点击每一行 */
 	const rowClick = useCallback(
 		(id: string) => {
-			navigate(`/product/cadd/projectJobDetail`, {
+			navigate(`/product/${productId || "cadd"}/projectJobDetail`, {
 				state: { taskId: id, from: "workbenchList" },
 			});
 		},
-		[navigate]
+		[navigate, productId]
 	);
 
 	// 回车搜索
@@ -312,7 +310,8 @@ const ProjectMembers = observer(() => {
 					<SearchInput
 						onKeyUp={handleKeyWordChangeKeyUp}
 						onBlur={handleKeyWordChangeBlur}
-						sx={{ width: 340 }} />
+						sx={{ width: 340 }}
+					/>
 					{/* <Box className={styles.tabHeaderSelect}>
                         <TextField
                             select
@@ -463,7 +462,7 @@ const ProjectMembers = observer(() => {
 											<Box className={styles.tabBoxJobOperate}>
 												{currentProjectStore.currentProjectInfo.projectRole ===
 													"USER" &&
-													item.creator !==
+												item.creator !==
 													JSON.parse(localStorage.getItem("userInfo") || "{}")
 														?.name ? (
 													""

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

@@ -2,14 +2,19 @@ import MyDialog from "@/components/mui/MyDialog";
 import MyButton from "@/components/mui/MyButton";
 import { DialogActions } from "@mui/material";
 import style from "./index.module.css";
+import { useStores } from "@/store";
+import { observer } from "mobx-react-lite";
+import { toJS } from "mobx";
 import { useNavigate } from "react-router-dom";
 
-const RemindBudgetDialog = (props: any) => {
+const RemindBudgetDialog = observer((props: any) => {
 	const navigate = useNavigate();
 	const { rbOpen, rbClose, goToProjectSubmitWork, id, isParentUser, isOwner } =
 		props;
+	const { currentProjectStore } = useStores();
+	const productId = toJS(currentProjectStore.currentProductInfo.id); // 产品ID
 	const goToprojectSetting = () => {
-		navigate(`/product/cadd/projectSetting`, {
+		navigate(`/product/${productId || "cadd"}/projectSetting`, {
 			state: { type: "baseInfo" },
 		});
 	};
@@ -49,6 +54,6 @@ const RemindBudgetDialog = (props: any) => {
 			</MyDialog>
 		</>
 	);
-};
+});
 
 export default RemindBudgetDialog;

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

@@ -13,10 +13,15 @@ import MyButton from "@/components/mui/MyButton";
 import usePass from "@/hooks/usePass";
 import RemindBudgetDialog from "./RemindBudgetDialog.tsx";
 import { useNavigate } from "react-router-dom";
+import { toJS } from "mobx";
+import { useStores } from "@/store";
+import { observer } from "mobx-react-lite";
 
-const TemplateBox = (props: any) => {
+const TemplateBox = observer((props: any) => {
 	const info = props.data;
 	const { isParentUser, isOwner, greaterThan100 } = props;
+	const { currentProjectStore } = useStores();
+	const productId = toJS(currentProjectStore.currentProductInfo.id); // 产品ID
 	const isPass = usePass();
 	const navigate = useNavigate();
 	const [rbOpen, setRbOpen] = useState(false);
@@ -24,11 +29,11 @@ const TemplateBox = (props: any) => {
 
 	const goToProjectSubmitWork = useCallback(
 		(id: string) => {
-			navigate(`/product/cadd/projectSubmitWork`, {
+			navigate(`/product/${productId || "cadd"}/projectSubmitWork`, {
 				state: { id },
 			});
 		},
-		[navigate]
+		[navigate, productId]
 	);
 
 	const handleJudgeBudget = useCallback(
@@ -141,6 +146,6 @@ const TemplateBox = (props: any) => {
 			)}
 		</>
 	);
-};
+});
 
 export default memo(TemplateBox);

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

@@ -10,6 +10,8 @@ import { useMessage } from "@/components/MySnackbar";
 import { getProjectList } from "../../project";
 import { useStores } from "@/store";
 import { checkIsNumberLetterChinese } from "@/utils/util";
+import { observer } from "mobx-react-lite";
+import { toJS } from "mobx";
 import {
 	setFileServerEndPointLocalStorage,
 	getFiletokenAccordingToId,
@@ -27,12 +29,13 @@ type IAddProjectProps = {
 	setAddOpen: any;
 };
 
-const AddProject = (props: IAddProjectProps) => {
+const AddProject = observer((props: IAddProjectProps) => {
 	const { addOpen, setAddOpen } = props;
 	const { currentProjectStore } = useStores();
 	const navigate = useNavigate();
 	const message = useMessage();
 	const [name, setName] = useState("");
+	const productId = toJS(currentProjectStore.currentProductInfo.id); // 产品ID
 	const [nameCheck, setNameCheck] = useState({
 		error: false,
 		help: "",
@@ -62,7 +65,7 @@ const AddProject = (props: IAddProjectProps) => {
 				setAddOpen(false);
 				setLoading(false);
 				message.success("新建项目成功");
-				const projectList = await getProjectList();
+				const projectList = await getProjectList(productId);
 				currentProjectStore.setProjectList(projectList);
 				let project: any = {};
 				projectList.forEach((item: any) => {
@@ -75,7 +78,7 @@ const AddProject = (props: IAddProjectProps) => {
 					project.filetoken = res;
 					currentProjectStore.changeProject(project);
 				});
-				navigate(`/product/cadd/projectOverview`);
+				navigate(`/product/${productId || "cadd"}/projectOverview`);
 			}
 		},
 		onError: () => {
@@ -157,7 +160,7 @@ const AddProject = (props: IAddProjectProps) => {
 				name,
 				desc,
 				zoneId,
-				product: "cadd",
+				product: productId || "cadd",
 			});
 		} else {
 			return;
@@ -232,6 +235,6 @@ const AddProject = (props: IAddProjectProps) => {
 			</div>
 		</MyDialog>
 	);
-};
+});
 
 export default AddProject;

src/views/Project/project.ts

@@ -12,8 +12,8 @@ import {
   getDataFileToken,
 } from "@/api/project_api";
 
-export const getProjectList = async () => {
-  const res = await getProjectListApi({ product: "cadd" });
+export const getProjectList = async (id = 'cadd') => {
+  const res = await getProjectListApi({ product: id });
   return res.data;
 };