4.7.10 (#4017)

* perf: force layout with animation using graph refreshPositions instead positionsAnimate; * perf: force layout with animation calls graph refreshPositions instead positionsAnimate while refreshing;
antvis · Oct 27, 2022 · d6d9a1f · d6d9a1f
1 parent 55fee1e
commit d6d9a1f
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+### 4.7.10
+
+- perf: force layout with animation calls graph refreshPositions instead positionsAnimate while refreshing;
+
 ### 4.7.9
 
 - perf: init node positions when the node has no x and y in the origin data;

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6-core",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "description": "A Graph Visualization Framework in JavaScript",
   "keywords": [
     "antv",

diff --git a/packages/core/src/global.ts b/packages/core/src/global.ts
@@ -64,7 +64,7 @@ const colorSet = {
 };
 
 export default {
-  version: '0.7.9',
+  version: '0.7.10',
   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
@@ -2,6 +2,7 @@ import { isFunction, groupBy } from '@antv/util';
 import { isNaN, calculationItemsBBox } from '../../util/base';
 import { GraphData } from '../../types';
 import { IAbstractGraph } from '../../interface/graph';
+import { isForce } from '../../util/layout';
 
 export default abstract class LayoutController {
   public graph: IAbstractGraph;
@@ -72,9 +73,12 @@ export default abstract class LayoutController {
 
   // 绘制
   public refreshLayout() {
-    const { graph, layoutType } = this;
+    const { graph, layoutType, layoutCfg = {} } = this;
     if (!graph) return;
-    if (graph.get('animate')) {
+    const { animate } = layoutCfg;
+    const isDefaultAnimateLayout = animate === undefined && (layoutType === 'force' || layoutType === 'force2');
+    const forceAnimate = isForce(layoutType) && (animate || isDefaultAnimateLayout);
+    if (graph.get('animate') && !forceAnimate) {
       graph.positionsAnimate(layoutType === 'comboCombined');
     } else {
       graph.refreshPositions(layoutType === 'comboCombined');

diff --git a/packages/core/src/util/index.ts b/packages/core/src/util/index.ts
@@ -3,9 +3,10 @@ import * as GraphicUtil from './graphic';
 import * as PathUtil from './path';
 import * as BaseUtil from './base';
 import * as ColorUtil from './color';
+import * as LayoutUtil from './layout';
 import { ext, mat3 } from '@antv/matrix-util';
 
 const transform = ext.transform;
 
-const Util = { ...BaseUtil, ...GraphicUtil, ...PathUtil, ...MathUtil, ...ColorUtil, transform, mat3 };
+const Util = { ...BaseUtil, ...GraphicUtil, ...PathUtil, ...MathUtil, ...ColorUtil, ...LayoutUtil, transform, mat3 };
 export default Util;
diff --git a/packages/core/src/util/layout.ts b/packages/core/src/util/layout.ts
@@ -0,0 +1 @@
+export const isForce = (layoutType) => layoutType === 'force' || layoutType === 'g6force' || layoutType === 'gForce' || layoutType === 'force2';
diff --git a/packages/element/package.json b/packages/element/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6-element",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "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.9",
+    "@antv/g6-core": "0.7.10",
     "@antv/util": "~2.0.5"
   },
   "devDependencies": {

diff --git a/packages/g6/package.json b/packages/g6/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6",
-  "version": "4.7.9",
+  "version": "4.7.10",
   "description": "A Graph Visualization Framework in JavaScript",
   "keywords": [
     "antv",
@@ -66,7 +66,7 @@
     ]
   },
   "dependencies": {
-    "@antv/g6-pc": "0.7.9"
+    "@antv/g6-pc": "0.7.10"
   },
   "devDependencies": {
     "@babel/core": "^7.7.7",

diff --git 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.9';
+G6.version = '4.7.10';
 
 export * from '@antv/g6-pc';
 export default G6;
-export const version = '4.7.9';
+export const version = '4.7.10';
diff --git a/packages/pc/package.json b/packages/pc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6-pc",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "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.9",
-    "@antv/g6-element": "0.7.9",
-    "@antv/g6-plugin": "0.7.9",
+    "@antv/g6-core": "0.7.10",
+    "@antv/g6-element": "0.7.10",
+    "@antv/g6-plugin": "0.7.10",
     "@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
@@ -7,7 +7,7 @@ const textColor = 'rgb(0, 0, 0)';
 const colorSet = getColorsWithSubjectColor(subjectColor, backColor);
 
 export default {
-  version: '0.7.9',
+  version: '0.7.10',
   rootContainerClassName: 'root-container',
   nodeContainerClassName: 'node-container',
   edgeContainerClassName: 'edge-container',

diff --git a/packages/pc/src/graph/controller/layout.ts b/packages/pc/src/graph/controller/layout.ts
@@ -1,4 +1,4 @@
-import { AbstractLayout } from '@antv/g6-core';
+import { AbstractLayout, Util } from '@antv/g6-core';
 import { Layout } from '../../layout';
 import { LayoutWorker } from '../../layout/worker/layout';
 import { LAYOUT_MESSAGE } from '../../layout/worker/layoutConst';
@@ -129,8 +129,7 @@ export default class LayoutController extends AbstractLayout {
         }
       }
 
-      const isForce = layoutType === 'force' || layoutType === 'g6force' || layoutType === 'gForce' || layoutType === 'force2';
-      if (isForce) {
+      if (Util.isForce(layoutType)) {
         const { onTick, animate } = layoutCfg;
         const isDefaultAnimateLayout = animate === undefined && (layoutType === 'force' || layoutType === 'force2');
         const tick = () => {

diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g6-plugin",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "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.9",
-    "@antv/g6-element": "0.7.9",
+    "@antv/g6-core": "0.7.10",
+    "@antv/g6-element": "0.7.10",
     "@antv/matrix-util": "^3.1.0-beta.3",
     "@antv/scale": "^0.3.4",
     "@antv/util": "^2.0.9",