Commit 3f7b2195 authored by chenshouchao's avatar chenshouchao

Merge branch 'feat-20220801' of http://120.77.149.83/root/bkunyun into feat-20220801

parents e6a72207 20be3215
...@@ -110,16 +110,19 @@ const theme = createTheme({ ...@@ -110,16 +110,19 @@ const theme = createTheme({
"& p": { fontSize: "12px" }, "& p": { fontSize: "12px" },
height: "28px", height: "28px",
padding: "0 12px", padding: "0 12px",
minWidth: "60px",
}, },
sizeMedium: { sizeMedium: {
"& p": { fontSize: "14px" }, "& p": { fontSize: "14px" },
height: "32px", height: "32px",
padding: "0 16px", padding: "0 16px",
minWidth: "68px",
}, },
sizeLarge: { sizeLarge: {
"& p": { fontSize: "16px" }, "& p": { fontSize: "16px" },
height: "36px", height: "36px",
padding: "0 16px", padding: "0 16px",
minWidth: "80px",
}, },
}, },
}, },
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
margin-bottom: 16px; margin-bottom: 16px;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
transition: box-shadow .2s cubic-bezier(0, 0, 1, 1);
} }
.templateBlock:hover { .templateBlock:hover {
box-shadow: 6px 8px 22px 0px rgba(0, 24, 57, 0.08); box-shadow: 6px 8px 22px 0px rgba(0, 24, 57, 0.08);
......
...@@ -311,16 +311,18 @@ const Flow = (props: IProps) => { ...@@ -311,16 +311,18 @@ const Flow = (props: IProps) => {
/** tasks 数据 */ /** tasks 数据 */
tasks: tasks, tasks: tasks,
} }
: { selectedStatus: externalSelectedNodeId : {
selectedStatus: externalSelectedNodeId
? externalSelectedNodeId.includes(item.id) ? externalSelectedNodeId.includes(item.id)
: inSideFlowNodeId === item.id,}), : inSideFlowNodeId === item.id,
}),
/** 输入输出圆点状态 */ /** 输入输出圆点状态 */
// dotStatus: nodesInputAndOutputStatus(item.id), // dotStatus: nodesInputAndOutputStatus(item.id),
/** 样式 */ /** 样式 */
style: { style: {
...getBatchStyle(item), ...getBatchStyle(item),
marginTop: '-44px', marginTop: "-44px",
padding: "12px 20px", padding: "12px 20px",
}, },
}, },
...@@ -379,11 +381,11 @@ const Flow = (props: IProps) => { ...@@ -379,11 +381,11 @@ const Flow = (props: IProps) => {
style: { stroke: "#1370FF", strokeWidth: 2 }, style: { stroke: "#1370FF", strokeWidth: 2 },
animated: true, animated: true,
} }
: {}), : { stroke: "#D1D6DE" }),
/** 点击batch节点选中 */ /** 点击batch节点选中 */
...(item?.batchId === newSelectId ...(item?.batchId === newSelectId
? { style: { stroke: "#1370FF" }, animated: true } ? { style: { stroke: "#1370FF" }, animated: true }
: {}), : { stroke: "#D1D6DE" }),
labelStyle: { fill: "#8A9099" }, labelStyle: { fill: "#8A9099" },
labelBgStyle: { fill: "#F7F8FA " }, labelBgStyle: { fill: "#F7F8FA " },
label: item.label ? `(${item.label})` : "", label: item.label ? `(${item.label})` : "",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment