Commit 379ab1b7 authored by chenshouchao's avatar chenshouchao

Merge branch 'feat-20220801' into 'release'

cn-Feat 20220801

See merge request !88
parents 21df7ddd d10e919b
...@@ -27,23 +27,8 @@ const MySwitch = (props: IMySwitchProps) => { ...@@ -27,23 +27,8 @@ const MySwitch = (props: IMySwitchProps) => {
...other ...other
} = props; } = props;
const bgColor = useMemo(() => { const theme = useMemo(() => {
if (disabled) { return createTheme({
if (value) {
return "rgba(166, 211, 255, 1)";
} else {
return "rgba(221, 225, 230, 1)";
}
} else {
if (value) {
return "rgba(19, 112, 255, 1)";
} else {
return "rgba(221, 225, 230, 1)";
}
}
}, [disabled, value]);
const theme = createTheme({
components: { components: {
MuiSwitch: { MuiSwitch: {
styleOverrides: { styleOverrides: {
...@@ -58,7 +43,9 @@ const MySwitch = (props: IMySwitchProps) => { ...@@ -58,7 +43,9 @@ const MySwitch = (props: IMySwitchProps) => {
"&.Mui-checked": { "&.Mui-checked": {
left: "2px", left: "2px",
"& + .MuiSwitch-track": { "& + .MuiSwitch-track": {
backgroundColor: bgColor, backgroundColor: disabled
? "rgba(166, 211, 255, 1)"
: "rgba(19, 112, 255, 1)",
opacity: 1, opacity: 1,
}, },
}, },
...@@ -70,13 +57,16 @@ const MySwitch = (props: IMySwitchProps) => { ...@@ -70,13 +57,16 @@ const MySwitch = (props: IMySwitchProps) => {
}, },
track: { track: {
borderRadius: "11px", borderRadius: "11px",
backgroundColor: "rgba(221, 225, 230, 1)", backgroundColor: disabled
? "RGBA(240, 242, 245, 1)"
: "RGBA(221, 225, 230, 1)",
opacity: 1, opacity: 1,
}, },
}, },
}, },
}, },
}); });
}, [disabled]);
return ( return (
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
......
.reactFlowBox > div:last-child { .reactFlowBox > div:last-child {
display: none; display: none;
} }
.reactFlowBox > div:first-child { /* .reactFlowBox > div:first-child {
margin-top: 32px; margin-top: 32px;
} } */
...@@ -668,7 +668,6 @@ const Flow = (props: IProps) => { ...@@ -668,7 +668,6 @@ const Flow = (props: IProps) => {
className={styles.reactFlowBox} className={styles.reactFlowBox}
nodes={nodes} nodes={nodes}
edges={edges} edges={edges}
fitView={flowType === "default" ? true : false}
{...reactFlowParams} {...reactFlowParams}
// proOptions={{ hideAttribution: true, account: "" }} // proOptions={{ hideAttribution: true, account: "" }}
nodeTypes={nodeTypes} nodeTypes={nodeTypes}
......
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