fix: dagre error; (#63)

Author: Yanyan-Wang

CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+#### 0.1.26
+
+- fix: dagre error;
+
 #### 0.1.25
 
  - fix: array flat and Infinite param problem;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/layout",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "graph layout algorithm",
   "main": "lib/index.js",
   "module": "es/index.js",

src/layout/dagre/src/order/init-data-order.ts

@@ -19,8 +19,10 @@ const initDataOrder = (g: Graph, nodeOrder: string[]) => {
     const node = g.node(n);
     // 只考虑原有节点，dummy节点需要按照后续算法排出
     if (!node || node.dummy) return;
-    node.fixorder = layers[(node.rank as number)].length; // 设置fixorder为当层的顺序
-    layers[node.rank as number || 0].push(n);
+    if (!isNaN(node.rank as number)) {
+      node.fixorder = layers[node.rank as number].length; // 设置fixorder为当层的顺序
+      layers[node.rank as number].push(n);
+    }
   });
 };
 

src/layout/dagre/src/order/init-order.ts

@@ -29,7 +29,9 @@ const initOrder = (g: Graph) => {
     if (visited.hasOwnProperty(v)) return;
     visited[v] = true;
     const node = g.node(v);
-    layers[node.rank as number || 0].push(v);
+    if (!isNaN(node.rank as number)) {
+      layers[node.rank as number].push(v);
+    }
     g.successors(v)?.forEach((child) => dfs(child as any));
   };
 
@@ -42,7 +44,9 @@ const initOrder = (g: Graph) => {
   });
   const fixOrderNodes = beforeSort.sort((a, b) => (g.node(a).fixorder as number) - (g.node(b).fixorder as number));
   fixOrderNodes.forEach((n) => {
-    layers[g.node(n).rank as number].push(n);
+    if (!isNaN(g.node(n).rank as number)) {
+      layers[g.node(n).rank as number].push(n);
+    }
     visited[n] = true;
   });
 

src/layout/dagre/src/order/sort-subgraph.ts

@@ -35,7 +35,7 @@ const sortSubgraph = (g: Graph, v: string, cg: Graph, biasRight: any, usePrev?:
 
   // 添加fixorder信息到entries里边
   // TODO: 不考虑复合情况，只用第一个点的fixorder信息，后续考虑更完备的实现
-  entries.forEach((e) => {
+  entries.filter(e => !!e.vs || e.vs?.length > 0).forEach((e) => {
     const node = g.node(e.vs[0]);
     e.fixorder = node.fixorder;
     e.order = node.order;