|
|
|
@ -44,18 +44,18 @@ const edgeTypes: EdgeTypes = {
|
|
|
|
custom: CustomEdge
|
|
|
|
custom: CustomEdge
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
const FlowEditorWithProvider: React.FC<{ initialData?: any }> = ({ initialData }) => {
|
|
|
|
const FlowEditorWithProvider: React.FC<{ initialData?: any, useDefault?: boolean }> = ({ initialData, useDefault }) => {
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
<div style={{ width: '100%', height: '91vh', display: 'flex' }} onContextMenu={(e) => e.preventDefault()}>
|
|
|
|
<div style={{ width: '100%', height: '91vh', display: 'flex' }} onContextMenu={(e) => e.preventDefault()}>
|
|
|
|
<ReactFlowProvider>
|
|
|
|
<ReactFlowProvider>
|
|
|
|
{/*<SideBar />*/}
|
|
|
|
{/*<SideBar />*/}
|
|
|
|
<FlowEditor initialData={initialData} />
|
|
|
|
<FlowEditor initialData={initialData} useDefault={useDefault} />
|
|
|
|
</ReactFlowProvider>
|
|
|
|
</ReactFlowProvider>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
);
|
|
|
|
);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
const FlowEditor: React.FC<{ initialData?: any }> = ({ initialData }) => {
|
|
|
|
const FlowEditor: React.FC<{ initialData?: any, useDefault?: boolean }> = ({ initialData, useDefault }) => {
|
|
|
|
const [nodes, setNodes] = useState<Node[]>([]);
|
|
|
|
const [nodes, setNodes] = useState<Node[]>([]);
|
|
|
|
const [edges, setEdges] = useState<Edge[]>([]);
|
|
|
|
const [edges, setEdges] = useState<Edge[]>([]);
|
|
|
|
const { canvasDataMap } = useSelector(state => state.ideContainer);
|
|
|
|
const { canvasDataMap } = useSelector(state => state.ideContainer);
|
|
|
|
@ -331,7 +331,7 @@ const FlowEditor: React.FC<{ initialData?: any }> = ({ initialData }) => {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
// 首次进入
|
|
|
|
// 首次进入
|
|
|
|
const { nodes: convertedNodes, edges: convertedEdges } = convertFlowData(initialData);
|
|
|
|
const { nodes: convertedNodes, edges: convertedEdges } = convertFlowData(initialData, useDefault);
|
|
|
|
// 为所有边添加类型-
|
|
|
|
// 为所有边添加类型-
|
|
|
|
const initialEdges: Edge[] = convertedEdges.map(edge => ({
|
|
|
|
const initialEdges: Edge[] = convertedEdges.map(edge => ({
|
|
|
|
...edge,
|
|
|
|
...edge,
|
|
|
|
@ -638,13 +638,9 @@ const FlowEditor: React.FC<{ initialData?: any }> = ({ initialData }) => {
|
|
|
|
// 保存所有节点和边数据到服务器
|
|
|
|
// 保存所有节点和边数据到服务器
|
|
|
|
const saveFlowDataToServer = useCallback(async () => {
|
|
|
|
const saveFlowDataToServer = useCallback(async () => {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
// 准备要发送到服务器的数据
|
|
|
|
|
|
|
|
const flowData = {
|
|
|
|
|
|
|
|
nodes: nodes,
|
|
|
|
|
|
|
|
edges: edges
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
// 转换会原始数据类型
|
|
|
|
// 转换会原始数据类型
|
|
|
|
const revertedData = revertFlowData(nodes, edges);
|
|
|
|
const revertedData = revertFlowData(nodes, edges);
|
|
|
|
|
|
|
|
console.log('initialData:', initialData);
|
|
|
|
|
|
|
|
|
|
|
|
const res: any = await setMainFlow(revertedData, initialData.id);
|
|
|
|
const res: any = await setMainFlow(revertedData, initialData.id);
|
|
|
|
if (res.code === 200) {
|
|
|
|
if (res.code === 200) {
|
|
|
|
|