diff --git a/CHANGELOG.md b/CHANGELOG.md index 82fd6cae1b2..1d80d786dec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # ChangeLog +### 4.7.15 + +- fix: dagre layout for collapsed combos; +- perf: give layout algorithm vedges; + ### 4.7.14 - fix: error occurs while dragging combo with drag-node behavior; diff --git a/packages/core/package.json b/packages/core/package.json index 9348d539582..9759423ee46 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/g6-core", - "version": "0.7.14", + "version": "0.7.15", "description": "A Graph Visualization Framework in JavaScript", "keywords": [ "antv", diff --git a/packages/core/src/global.ts b/packages/core/src/global.ts index 0f225a19e0b..7839f1dc70a 100644 --- a/packages/core/src/global.ts +++ b/packages/core/src/global.ts @@ -64,7 +64,7 @@ const colorSet = { }; export default { - version: '0.7.14', + version: '0.7.15', rootContainerClassName: 'root-container', nodeContainerClassName: 'node-container', edgeContainerClassName: 'edge-container', diff --git a/packages/core/src/graph/controller/layout.ts b/packages/core/src/graph/controller/layout.ts index 108325951a7..abeb71fb6e9 100644 --- a/packages/core/src/graph/controller/layout.ts +++ b/packages/core/src/graph/controller/layout.ts @@ -183,6 +183,7 @@ export default abstract class LayoutController { combos, hiddenCombos, comboEdges, + vedges: this.graph.get('vedges')?.map(edge => edge.getModel()) } as GraphData; } diff --git a/packages/core/src/graph/graph.ts b/packages/core/src/graph/graph.ts index 3fd2948cc92..9faeaccdfd4 100644 --- a/packages/core/src/graph/graph.ts +++ b/packages/core/src/graph/graph.ts @@ -2376,23 +2376,25 @@ export default abstract class AbstractGraph extends EventEmitter implements IAbs const vedges: IEdge[] = self.get('vedges'); const combos: ICombo[] = self.get('combos'); - let model: NodeConfig; + let model: NodeConfig | ComboConfig; const updatedNodes: { [key: string]: boolean } = {}; const updateItems = (items) => { each(items, (item: INode) => { - model = item.getModel() as NodeConfig; + model = item.getModel() as NodeConfig | ComboConfig; const originAttrs = item.get('originAttrs'); if (originAttrs && model.x === originAttrs.x && model.y === originAttrs.y) { return; } const changed = item.updatePosition({ x: model.x!, y: model.y! }); updatedNodes[model.id] = changed; - if (model.comboId) updatedNodes[model.comboId] = updatedNodes[model.comboId] || changed; + if (model.comboId) updatedNodes[(model as NodeConfig).comboId] = updatedNodes[(model as NodeConfig).comboId] || changed; + if (model.parentId) updatedNodes[(model as ComboConfig).parentId] = updatedNodes[(model as ComboConfig).parentId] || changed; }); } + updateItems(combos); updateItems(nodes); if (combos && combos.length !== 0) { diff --git a/packages/element/package.json b/packages/element/package.json index 51990d3dfd0..8a64808dd7c 100644 --- a/packages/element/package.json +++ b/packages/element/package.json @@ -1,6 +1,6 @@ { "name": "@antv/g6-element", - "version": "0.7.14", + "version": "0.7.15", "description": "A Graph Visualization Framework in JavaScript", "keywords": [ "antv", @@ -61,7 +61,7 @@ }, "dependencies": { "@antv/g-base": "^0.5.1", - "@antv/g6-core": "0.7.14", + "@antv/g6-core": "0.7.15", "@antv/util": "~2.0.5" }, "devDependencies": { diff --git a/packages/g6/package.json b/packages/g6/package.json index 9f11428bb1d..ebed3f121d3 100644 --- a/packages/g6/package.json +++ b/packages/g6/package.json @@ -1,6 +1,6 @@ { "name": "@antv/g6", - "version": "4.7.14", + "version": "4.7.15", "description": "A Graph Visualization Framework in JavaScript", "keywords": [ "antv", @@ -66,7 +66,7 @@ ] }, "dependencies": { - "@antv/g6-pc": "0.7.14" + "@antv/g6-pc": "0.7.15" }, "devDependencies": { "@babel/core": "^7.7.7", diff --git a/packages/g6/src/index.ts b/packages/g6/src/index.ts index c0d9b3d881d..7daf5d8f8aa 100644 --- a/packages/g6/src/index.ts +++ b/packages/g6/src/index.ts @@ -1,7 +1,7 @@ import G6 from '@antv/g6-pc'; -G6.version = '4.7.14'; +G6.version = '4.7.15'; export * from '@antv/g6-pc'; export default G6; -export const version = '4.7.14'; +export const version = '4.7.15'; diff --git a/packages/pc/package.json b/packages/pc/package.json index db49ab8b6d9..a361ca82914 100644 --- a/packages/pc/package.json +++ b/packages/pc/package.json @@ -1,6 +1,6 @@ { "name": "@antv/g6-pc", - "version": "0.7.14", + "version": "0.7.15", "description": "A Graph Visualization Framework in JavaScript", "keywords": [ "antv", @@ -75,9 +75,9 @@ "@antv/g-canvas": "^0.5.2", "@antv/g-math": "^0.1.1", "@antv/g-svg": "^0.5.1", - "@antv/g6-core": "0.7.14", - "@antv/g6-element": "0.7.14", - "@antv/g6-plugin": "0.7.14", + "@antv/g6-core": "0.7.15", + "@antv/g6-element": "0.7.15", + "@antv/g6-plugin": "0.7.15", "@antv/hierarchy": "^0.6.7", "@antv/layout": "^0.3.0", "@antv/matrix-util": "^3.1.0-beta.3", diff --git a/packages/pc/src/global.ts b/packages/pc/src/global.ts index 1b3e9ef47e7..1b65a8c2660 100644 --- a/packages/pc/src/global.ts +++ b/packages/pc/src/global.ts @@ -7,7 +7,7 @@ const textColor = 'rgb(0, 0, 0)'; const colorSet = getColorsWithSubjectColor(subjectColor, backColor); export default { - version: '0.7.14', + version: '0.7.15', rootContainerClassName: 'root-container', nodeContainerClassName: 'node-container', edgeContainerClassName: 'edge-container', diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 8d4a414efd5..1c2361945f6 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@antv/g6-plugin", - "version": "0.7.14", + "version": "0.7.15", "description": "G6 Plugin", "main": "lib/index.js", "module": "es/index.js", @@ -22,8 +22,8 @@ "@antv/g-base": "^0.5.1", "@antv/g-canvas": "^0.5.2", "@antv/g-svg": "^0.5.2", - "@antv/g6-core": "0.7.14", - "@antv/g6-element": "0.7.14", + "@antv/g6-core": "0.7.15", + "@antv/g6-element": "0.7.15", "@antv/matrix-util": "^3.1.0-beta.3", "@antv/scale": "^0.3.4", "@antv/util": "^2.0.9", diff --git a/packages/site/package.json b/packages/site/package.json index 4a431b9d745..90fc7a378a5 100644 --- a/packages/site/package.json +++ b/packages/site/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@antv/g6-site", - "version": "4.7.14", + "version": "4.7.15", "description": "G6 sites deployed on gh-pages", "keywords": [ "antv",