mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 13:16:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: graph collection auto layout reporting error (#3370)

Browse Source
This commit is contained in:
katherinehhh 2024-01-11 16:51:32 +08:00 committed by GitHub
parent 80b71c4a7b
commit c9901d1681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphDrawPage.tsx
View File

@ -271,7 +271,7 @@ const handelResetLayout = (isTemporaryLayout?) => {
const positionId = positions.find((v) => v.collectionName === node.id)?.id; const positionId = positions.find((v) => v.collectionName === node.id)?.id;
if (node) { if (node) {
const pos = g.node(id); const pos = g.node(id);
updatePositionData.push({ id: positionId, x: pos.x, y: pos.y }); updatePositionData.push({ id: positionId, collectionName: node.id, x: pos.x, y: pos.y });
node.position(pos?.x, pos?.y); node.position(pos?.x, pos?.y);
} }
}); });
@ -315,7 +315,12 @@ const handelResetLayout = (isTemporaryLayout?) => {
const calculatedPosition = { x: referenceNode.x + 320 * index + 280, y: referenceNode.y }; const calculatedPosition = { x: referenceNode.x + 320 * index + 280, y: referenceNode.y };
node.position(calculatedPosition.x, calculatedPosition.y); node.position(calculatedPosition.x, calculatedPosition.y);
const positionId = positions.find((v) => v.collectionName === node.id)?.id; const positionId = positions.find((v) => v.collectionName === node.id)?.id;
updatePositionData.push({ id: positionId, x: calculatedPosition.x, y: calculatedPosition.y }); updatePositionData.push({
id: positionId,
collectionName: node.id,
x: calculatedPosition.x,
y: calculatedPosition.y,
});
} }
}); });
} }
@ -334,7 +339,12 @@ const handelResetLayout = (isTemporaryLayout?) => {
const calculatedPosition = { x: col * 325 + minX, y: row * 300 + maxY + 300 }; const calculatedPosition = { x: col * 325 + minX, y: row * 300 + maxY + 300 };
node.position(calculatedPosition.x, calculatedPosition.y); node.position(calculatedPosition.x, calculatedPosition.y);
const positionId = positions.find((v) => v.collectionName === node.id)?.id; const positionId = positions.find((v) => v.collectionName === node.id)?.id;
updatePositionData.push({ id: positionId, x: calculatedPosition.x, y: calculatedPosition.y }); updatePositionData.push({
id: positionId,
collectionName: node.id,
x: calculatedPosition.x,
y: calculatedPosition.y,
});
} }
}); });
}); });
@ -343,10 +353,10 @@ const handelResetLayout = (isTemporaryLayout?) => {
}); });
targetGraph.positionCell(nodes[0], 'top-left', { padding: 100 }); targetGraph.positionCell(nodes[0], 'top-left', { padding: 100 });
if (!isTemporaryLayout) { if (!isTemporaryLayout) {
targetGraph.updatePositionAction( const updateData = updatePositionData.filter((v) => v.id);
updatePositionData.filter((v) => v.id), const createData = updatePositionData.filter((v) => !v.id);
true, updateData.length > 0 && targetGraph.updatePositionAction(updateData, true);
); createData.length > 0 && targetGraph.saveGraphPositionAction(createData);
} }
}; };
@ -407,6 +417,7 @@ export const GraphDrawPage = React.memo(() => {
const data = collections?.length > 0 ? collections : await refreshCM(); const data = collections?.length > 0 ? collections : await refreshCM();
targetGraph.collections = data; targetGraph.collections = data;
targetGraph.updatePositionAction = updatePositionAction; targetGraph.updatePositionAction = updatePositionAction;
targetGraph.saveGraphPositionAction = saveGraphPositionAction;
const currentNodes = targetGraph.getNodes(); const currentNodes = targetGraph.getNodes();
setCollectionData(data); setCollectionData(data);
setCollectionList(data); setCollectionList(data);
@ -770,11 +781,11 @@ export const GraphDrawPage = React.memo(() => {
const updateNode = targetGraph.getCellById(node.id); const updateNode = targetGraph.getCellById(node.id);
switch (status) { switch (status) {
case 'add': case 'add':
if (referenceNode.x > 4500) { if (referenceNode?.x > 4500) {
referenceNode = minBy(yNodes, 'x'); referenceNode = minBy(yNodes, 'x');
position = { x: minX, y: referenceNode.y + 400 }; position = { x: minX, y: referenceNode.y + 400 };
} else { } else {
position = { x: referenceNode.x + 350, y: referenceNode.y }; position = { x: referenceNode?.x + 350, y: referenceNode?.y };
} }
targetNode = targetGraph.addNode({ targetNode = targetGraph.addNode({
...node, ...node,