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

fix: create collection report error (#2953)

Browse Source
This commit is contained in:
katherinehhh 2023-11-03 10:57:45 +08:00 committed by GitHub
parent ac8828196a
commit 93bf86d931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ const getGridData = (num, arr) => {
};
//初始布局
async function layout(createPositions) {
async function layout(createPositions, isSaveLayput) {
const { positions } = targetGraph;
let graphPositions = [];
const nodes: any[] = targetGraph.getNodes();
@ -126,7 +126,7 @@ async function layout(createPositions) {
} else {
targetGraph.positionCell(nodes[0], 'top-left', { padding: 100 });
}
if (graphPositions.length > 0) {
if (graphPositions.length > 0 && isSaveLayput) {
await createPositions(graphPositions);
graphPositions = [];
}
@ -725,14 +725,14 @@ export const GraphDrawPage = React.memo(() => {
m2mEdge && lightUp(m2mEdge);
};
// 全量渲染
const renderInitGraphCollection = (rawData) => {
const renderInitGraphCollection = (rawData, isSaveLayput = true) => {
targetGraph.clearCells();
const { nodesData, edgesData, inheritEdges } = formatData(rawData);
targetGraph.data = { nodes: nodesData, edges: edgesData };
targetGraph.fromJSON({ nodes: nodesData });
targetGraph.addEdges(edgesData);
targetGraph.addEdges(inheritEdges);
layout(saveGraphPositionAction);
layout(saveGraphPositionAction, isSaveLayput);
};
// 增量渲染
@ -1073,11 +1073,11 @@ export const GraphDrawPage = React.memo(() => {
if (selectedCollections && collectionList.length) {
const selectKeys = selectedCollections?.split(',');
const data = collectionList.filter((v) => selectKeys.includes(v.name));
renderInitGraphCollection(data);
renderInitGraphCollection(data, false);
handelResetLayout(true);
targetGraph.selectedCollections = selectedCollections;
} else {
!selectedCollections && renderInitGraphCollection(collections);
!selectedCollections && renderInitGraphCollection(collections, false);
}
return () => {
cleanGraphContainer();