fix: 解决冲突

src/views/Project/ProjectWorkbench/workbenchTemplate/interface.tsx

+/*
+ * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
+ * @Date: 2022-07-06 14:44:13
+ * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
+ * @LastEditTime: 2022-07-06 14:47:28
+ * @FilePath: /bkunyun/src/views/Project/ProjectWorkbench/workbenchTemplate/interface.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+export interface ICustomTemplate{
+    show?: boolean;
+    id?: string;
+} 
\ No newline at end of file

src/views/WorkFlowEdit/components/OperatorList/index.module.css

+.operatorItemBox {
+	background-color: #fff;
+	border-radius: 4px;
+	cursor: grab;
+	padding: 16px 0;
+	border-bottom: 1px solid #f0f2f5;
+}
+.operatorItemTitle {
+	user-select: none;
+	font-size: 14px;
+	color: #1e2633;
+}
+.operatorItemText {
+	color: #8a9099;
+	margin: 8px 0;
+	font-size: 12px;
+	user-select: none;
+	display: -webkit-box;
+	-webkit-line-clamp: 3;
+	-webkit-box-orient: vertical;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.labelBox {
+	user-select: none;
+	display: inline-block;
+	border-radius: 2px;
+	font-size: 12px;
+	padding: 2px 8px;
+}
+
+.footerBx {
+	display: flex;
+	align-items: center;
+}

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

+import { IOperatorItemProps } from "./interface";
+import { OutlinedInput } from "@mui/material";
+import SearchIcon from "@mui/icons-material/Search";
+
+import styles from "./index.module.css";
+
+/*
+ * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
+ * @Date: 2022-07-06 15:16:01
+ * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
+ * @LastEditTime: 2022-07-06 16:27:16
+ * @FilePath: /bkunyun/src/views/WorkFlowEdit/components/OperatorList/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+const OperatorItem = (props: IOperatorItemProps) => {
+	const { info } = props;
+	return (
+		<div className={styles.operatorItemBox}>
+			<h2 className={styles.operatorItemTitle}>说什么呢啊</h2>
+			<div className={styles.operatorItemText}>
+				STU utility
+				是一个R-packa标处理目标处理，目标处理目标处理标处理目标处理后期委屈好委屈农，博啊发布丢我被欺安度切换阿斯顿几切换，i的亲戚我好奇你eqeqeweqeqeeqeqeqeqeq。
+			</div>
+			<div className={styles.footerBx}>
+				<span
+					className={styles.labelBox}
+					style={{
+						background: true ? "#EBF3FF" : "#E3FAEC",
+						color: true ? "#1370FF" : "#02AB83",
+					}}
+				>
+					公共平台
+				</span>
+				<OutlinedInput
+					onChange={(e: any) => {
+						console.log(e.target.value);
+					}}
+					// value={templateName}
+					placeholder="输入关键词搜索"
+					size="small"
+					sx={{ flex: 1, height: 32 }}
+					endAdornment={<SearchIcon style={{ color: "#8A9099" }} />}
+				/>
+			</div>
+		</div>
+	);
+};
+
+const OperatorList = () => {
+	const arr = [222, 3333, 339];
+	return (
+		<>
+			{arr.map((item) => {
+				return <OperatorItem key={item} info={item} />;
+			})}
+		</>
+	);
+};
+
+export default OperatorList;

src/views/WorkFlowEdit/components/OperatorList/interface.ts

+/*
+ * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
+ * @Date: 2022-07-06 15:32:11
+ * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
+ * @LastEditTime: 2022-07-06 15:32:42
+ * @FilePath: /bkunyun/src/views/WorkFlowEdit/components/OperatorList/interface.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+export interface IOperatorItemProps {
+    info: any
+}
\ No newline at end of file

src/views/WorkFlowEdit/index.module.css

@@ -32,10 +32,10 @@
   .swFormBox {
     background-color: #fff;
     border-right: 1xp solid rgba(235, 237, 240, 1);
-    width: 608px;
+    width: 360px;
     overflow-y: scroll;
     box-sizing: border-box;
-    padding: 36px;
+    padding: 24px;
   }
   .swFlowBox {
     flex: 1;

src/views/WorkFlowEdit/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-21 20:03:56
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-07-05 16:31:28
+ * @LastEditTime: 2022-07-06 15:21:55
  * @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -14,6 +14,7 @@ import { useLocation, useNavigate } from "react-router-dom";
 import MyPopconfirm from "@/components/mui/MyPopconfirm";
 import ButtonComponent from "@/components/mui/Button";
 import { ITemplateConfig } from "../Project/ProjectSubmitWork/interface";
+import OperatorList from "./components/OperatorList";
 
 import styles from './index.module.css'
 
@@ -64,7 +65,7 @@ const WorkFlowEdit = () => {
       </div>
       <div className={styles.swContent}>
         <div className={styles.swFormBox}>
-          左侧
+          <OperatorList/>
         </div>
         <div className={styles.swFlowBox}>
           右侧