Merge branch 'feat-20220801' into 'release'

Feat 20220801

See merge request !93

src/components/mui/MyTable/components/EnhancedTableHead.tsx

 /*
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-01 16:53:15
- * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-07-25 12:04:49
+ * @LastEditors: 吴永生 15770852798@163.com
+ * @LastEditTime: 2022-09-06 16:30:56
  * @FilePath: /bkunyun/src/components/Material.Ui/Table/EnhancedTableHead.jsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -54,7 +54,7 @@ const EnhancedTableHead = (props: any) => {
                         classes={{ head: (k && headTableCell) || classes.headTableCell }}
                     >
                         {
-                            headCell.sort && <TableSortLabel active={orderBy === headCell.id} direction={order} onClick={createSortHandler(headCell.id)} >
+                            headCell.sort && <TableSortLabel style={{fontSize: "16px", fontWeight: '400', color: 'rgba(0, 0, 0, 0.87)', fontFamily: 'Roboto,Helvetica,Tahoma,Arial,"PingFang SC","Hiragino Sans GB","Heiti SC","WenQuanYi Micro Hei",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"'}} active={orderBy === headCell.id} direction={order} onClick={createSortHandler(headCell.id)} >
                                 {headCell.label}
                             </TableSortLabel>
                         }

src/views/ConsoleLayout/index.tsx

@@ -31,7 +31,6 @@ const ConsoleLayout = observer(() => {
 	const { currentProjectStore, fileListStore } = useStores();
 	const { openFileList, setOpenFileList } = fileListStore;
 	const productInfo = toJS(currentProjectStore.currentProductInfo);
-	console.log(productInfo);
 	const { run: runGetProjectList } = useMyRequest(getProjectList, {
 		onSuccess: (res) => {
 			let list = res.data;
@@ -68,9 +67,8 @@ const ConsoleLayout = observer(() => {
 	const location = useLocation();
 	const { permissionStore, menuStore } = useStores();
 
-	// 不在产品页面下的时候清空
+	// 不在产品页面下的时候清空当前产品
 	useEffect(() => {
-		console.log(location.pathname.slice(0, 8));
 		if (location.pathname.slice(0, 8) !== "/product") {
 			currentProjectStore.setProjectList([]);
 			currentProjectStore.changeProject({});
@@ -87,12 +85,6 @@ const ConsoleLayout = observer(() => {
 			<Box className={style.topApp}>
 				<Box className={style.topLeftBox}>
 					<img src={logo} alt="" className={style.logo} />
-					{/* <MyButton
-						text={globalText.console}
-						variant={"text"}
-						style={{ color: "#565C66" }}
-						onClick={() => navigate("/home")}
-					/> */}
 					<div className={style.menuBox} onClick={() => navigate("/home")}>
 						<div className={style.menuTitle}>{globalText.console}</div>
 					</div>

src/views/MenuLayout/index.tsx

@@ -9,7 +9,7 @@
 import { Box, List } from "@mui/material";
 import CurrentProject from "../Project/components/CurrentProject";
 import React from "react";
-import { Outlet, useNavigate } from "react-router-dom";
+import { Outlet, useNavigate, useLocation } from "react-router-dom";
 import style from "./index.module.css";
 import { observer } from "mobx-react-lite";
 import { useStores } from "@/store/index";
@@ -23,9 +23,10 @@ const MenuLayout = observer(() => {
 	const navigate = useNavigate();
 
 	const productInfo = toJS(currentProjectStore.currentProductInfo);
+	const location = useLocation();
 
-	// 未选择产品时 直接跳转home页面
-	if (!productInfo.name) {
+	// 在产品页面下且未选择产品时 直接跳转home页面
+	if (!productInfo.name && location.pathname.slice(0, 8) === "/product") {
 		navigate("/home");
 	}
 

src/views/Project/ProjectJobDetail/index.module.css

@@ -112,12 +112,7 @@
 	line-height: 22px;
 	width: 80px;
 	margin-right: 44px;
-	overflow: hidden;
 	word-wrap: break-word;
-	text-overflow: ellipsis;
-	display: -webkit-box;
-	-webkit-box-orient: vertical;
-	-webkit-line-clamp: 2;
 }
 .taskInfoValue {
 	color: rgba(30, 38, 51, 1);
@@ -130,12 +125,7 @@
 	word-break: break-all;
 	flex: 1;
 	justify-content: flex-end;
-	overflow: hidden;
 	word-wrap: break-word;
-	text-overflow: ellipsis;
-	display: -webkit-box;
-	-webkit-box-orient: vertical;
-	-webkit-line-clamp: 2;
 }
 .taskInfoValueClick {
 	cursor: pointer;

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

@@ -105,7 +105,7 @@ const OperatorItem = (props: IOperatorItemProps) => {
 				const newBatchFlowArr = getCopyBatchFlowArr(
 					batchFlowArr,
 					clientX - upperLeftPointX,
-					clientY - upperLeftPointY
+					clientY - upperLeftPointY + 44
 				);
 				const newVal = cloneDeep(templateConfigInfo);
 				newVal.push(...newBatchFlowArr);