@antv/layout 0.3.14 → 0.3.15

package/src/layout/dagre/src/order/index.ts

@@ -22,7 +22,7 @@ import { buildLayerMatrix, maxRank } from "../util";
  *    1. Graph nodes will have an "order" attribute based on the results of the
  *       algorithm.
  */
-const order = (g: Graph) => {
+const order = (g: Graph, keepNodeOrder?: boolean) => {
   const mxRank = maxRank(g);
   const range1 = [];
   const range2 = [];
@@ -37,7 +37,7 @@ const order = (g: Graph) => {
   let bestCC = Number.POSITIVE_INFINITY;
   let best: string[][];
   for (let i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
-    sweepLayerGraphs(i % 2 ? downLayerGraphs : upLayerGraphs, i % 4 >= 2);
+    sweepLayerGraphs(i % 2 ? downLayerGraphs : upLayerGraphs, i % 4 >= 2, false, keepNodeOrder);
 
     layering = buildLayerMatrix(g);
     const cc = crossCount(g, layering);
@@ -52,7 +52,7 @@ const order = (g: Graph) => {
   layering = initOrder(g);
   assignOrder(g, layering);
   for (let i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
-    sweepLayerGraphs(i % 2 ? downLayerGraphs : upLayerGraphs, i % 4 >= 2, true);
+    sweepLayerGraphs(i % 2 ? downLayerGraphs : upLayerGraphs, i % 4 >= 2, true, keepNodeOrder);
 
     layering = buildLayerMatrix(g);
     const cc = crossCount(g, layering);
@@ -78,12 +78,13 @@ const buildLayerGraphs = (
 const sweepLayerGraphs = (
   layerGraphs: Graph[],
   biasRight: boolean,
-  usePrev?: boolean
+  usePrev?: boolean,
+  keepNodeOrder?: boolean
 ) => {
   const cg = new Graph();
   layerGraphs?.forEach((lg) => {
     const root = lg.graph().root as string;
-    const sorted = sortSubgraph(lg, root, cg, biasRight, usePrev);
+    const sorted = sortSubgraph(lg, root, cg, biasRight, usePrev, keepNodeOrder);
     for (let i = 0; i < sorted.vs?.length || 0; i++) {
       const lnode = lg.node(sorted.vs[i]);
       if (lnode) {

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

@@ -9,7 +9,10 @@ const initDataOrder = (g: Graph, nodeOrder: string[]) => {
   });
   const ranks = simpleNodes.map((v) => g.node(v)!.rank as number);
   const maxRank = Math.max(...ranks);
-  const layers: string[][] = Array(maxRank + 1).fill([]);
+  const layers: string[][] = [];
+  for (let i = 0; i < maxRank + 1; i++) {
+    layers[i] = [];
+  }
 
   nodeOrder?.forEach((n) => {
     const node = g.node(n);

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

@@ -8,7 +8,8 @@ const sortSubgraph = (
   v: string,
   cg: Graph,
   biasRight?: boolean,
-  usePrev?: boolean
+  usePrev?: boolean,
+  keepNodeOrder?: boolean
 ) => {
   let movable = g.children(v);
   // fixorder的点不参与排序（这个方案不合适，只排了新增节点，和原来的分离）
@@ -26,7 +27,7 @@ const sortSubgraph = (
   const barycenters = barycenter(g, movable || []);
   barycenters?.forEach((entry) => {
     if (g.children(entry.v)?.length) {
-      const subgraphResult = sortSubgraph(g, entry.v, cg, biasRight);
+      const subgraphResult = sortSubgraph(g, entry.v, cg, biasRight, keepNodeOrder);
       subgraphs[entry.v] = subgraphResult;
       if (subgraphResult.hasOwnProperty("barycenter")) {
         mergeBarycenters(entry, subgraphResult);
@@ -49,7 +50,7 @@ const sortSubgraph = (
       }
     });
 
-  const result = sort(entries, biasRight, usePrev);
+  const result = sort(entries, biasRight, usePrev, keepNodeOrder);
 
   if (bl) {
     result.vs = [bl, result.vs, br].flat();

package/src/layout/dagre/src/order/sort.ts

@@ -1,8 +1,9 @@
 import { partition } from "../util";
 import { ConflictEntry } from "./resolve-conflicts";
 
-const sort = (entries: ConflictEntry[], biasRight?: boolean, usePrev?: boolean) => {
+const sort = (entries: ConflictEntry[], biasRight?: boolean, usePrev?: boolean, keepNodeOrder?: boolean) => {
   const parts = partition(entries, (entry) => {
+    if (keepNodeOrder) return entry.hasOwnProperty("barycenter");
     // NOTE: 有fixorder的也可以排
     return (entry.hasOwnProperty("fixorder") && !isNaN(entry.fixorder!)) || entry.hasOwnProperty("barycenter");
   });