@antv/layout 1.2.14-beta.0 → 1.2.14-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/62953f7fd7012203b024.worker.js +2 -0
- package/dist/62953f7fd7012203b024.worker.js.map +1 -0
- package/dist/index.min.js +1 -1
- package/dist/index.min.js.map +1 -1
- package/lib/antv-dagre/acyclic.js +3 -7
- package/lib/antv-dagre/acyclic.js.map +1 -1
- package/lib/antv-dagre/add-border-segments.js +3 -7
- package/lib/antv-dagre/add-border-segments.js.map +1 -1
- package/lib/antv-dagre/coordinate-system.js +1 -5
- package/lib/antv-dagre/coordinate-system.js.map +1 -1
- package/lib/antv-dagre/data/list.js +1 -4
- package/lib/antv-dagre/data/list.js.map +1 -1
- package/lib/antv-dagre/greedy-fas.js +5 -10
- package/lib/antv-dagre/greedy-fas.js.map +1 -1
- package/lib/antv-dagre/layout.js +37 -41
- package/lib/antv-dagre/layout.js.map +1 -1
- package/lib/antv-dagre/nesting-graph.js +5 -9
- package/lib/antv-dagre/nesting-graph.js.map +1 -1
- package/lib/antv-dagre/normalize.js +3 -7
- package/lib/antv-dagre/normalize.js.map +1 -1
- package/lib/antv-dagre/order/add-subgraph-constraints.js +1 -5
- package/lib/antv-dagre/order/add-subgraph-constraints.js.map +1 -1
- package/lib/antv-dagre/order/barycenter.js +1 -5
- package/lib/antv-dagre/order/barycenter.js.map +1 -1
- package/lib/antv-dagre/order/build-layer-graph.js +3 -7
- package/lib/antv-dagre/order/build-layer-graph.js.map +1 -1
- package/lib/antv-dagre/order/cross-count.js +3 -7
- package/lib/antv-dagre/order/cross-count.js.map +1 -1
- package/lib/antv-dagre/order/index.js +22 -26
- package/lib/antv-dagre/order/index.js.map +1 -1
- package/lib/antv-dagre/order/init-data-order.js +1 -5
- package/lib/antv-dagre/order/init-data-order.js.map +1 -1
- package/lib/antv-dagre/order/init-order.js +1 -5
- package/lib/antv-dagre/order/init-order.js.map +1 -1
- package/lib/antv-dagre/order/resolve-conflicts.js +1 -3
- package/lib/antv-dagre/order/resolve-conflicts.js.map +1 -1
- package/lib/antv-dagre/order/sort-subgraph.js +8 -13
- package/lib/antv-dagre/order/sort-subgraph.js.map +1 -1
- package/lib/antv-dagre/order/sort.js +3 -7
- package/lib/antv-dagre/order/sort.js.map +1 -1
- package/lib/antv-dagre/parent-dummy-chains.js +1 -5
- package/lib/antv-dagre/parent-dummy-chains.js.map +1 -1
- package/lib/antv-dagre/position/bk.js +31 -48
- package/lib/antv-dagre/position/bk.js.map +1 -1
- package/lib/antv-dagre/position/index.js +12 -16
- package/lib/antv-dagre/position/index.js.map +1 -1
- package/lib/antv-dagre/rank/feasible-tree.js +12 -16
- package/lib/antv-dagre/rank/feasible-tree.js.map +1 -1
- package/lib/antv-dagre/rank/index.js +8 -12
- package/lib/antv-dagre/rank/index.js.map +1 -1
- package/lib/antv-dagre/rank/network-simplex.js +25 -35
- package/lib/antv-dagre/rank/network-simplex.js.map +1 -1
- package/lib/antv-dagre/rank/util.js +1 -6
- package/lib/antv-dagre/rank/util.js.map +1 -1
- package/lib/antv-dagre/types.js +1 -2
- package/lib/antv-dagre/util.js +23 -41
- package/lib/antv-dagre/util.js.map +1 -1
- package/lib/antv-dagre.js +17 -21
- package/lib/antv-dagre.js.map +1 -1
- package/lib/bundle-entry.js +2 -5
- package/lib/bundle-entry.js.map +1 -1
- package/lib/bundle-supervisor.js +7 -11
- package/lib/bundle-supervisor.js.map +1 -1
- package/lib/bundle-worker.js +10 -15
- package/lib/bundle-worker.js.map +1 -1
- package/lib/circular.js +16 -20
- package/lib/circular.js.map +1 -1
- package/lib/comboCombined.js +35 -39
- package/lib/comboCombined.js.map +1 -1
- package/lib/concentric.js +19 -23
- package/lib/concentric.js.map +1 -1
- package/lib/d3-force/index.d.ts +33 -0
- package/lib/d3-force/index.js +162 -0
- package/lib/d3-force/index.js.map +1 -0
- package/lib/d3-force/types.d.ts +108 -0
- package/lib/d3-force/types.js +2 -0
- package/lib/d3-force/types.js.map +1 -0
- package/lib/d3-force-3d/index.d.ts +25 -0
- package/lib/d3-force-3d/index.js +47 -0
- package/lib/d3-force-3d/index.js.map +1 -0
- package/lib/d3-force-3d/types.d.ts +44 -0
- package/lib/d3-force-3d/types.js +2 -0
- package/lib/d3-force-3d/types.js.map +1 -0
- package/lib/dagre.js +13 -17
- package/lib/dagre.js.map +1 -1
- package/lib/exports.d.ts +4 -1
- package/lib/exports.js +17 -19
- package/lib/exports.js.map +1 -1
- package/lib/force/forceNBody.js +5 -9
- package/lib/force/forceNBody.js.map +1 -1
- package/lib/force/index.js +23 -27
- package/lib/force/index.js.map +1 -1
- package/lib/force/types.js +1 -2
- package/lib/forceAtlas2/body.js +1 -4
- package/lib/forceAtlas2/body.js.map +1 -1
- package/lib/forceAtlas2/index.js +26 -30
- package/lib/forceAtlas2/index.js.map +1 -1
- package/lib/forceAtlas2/quad.js +1 -4
- package/lib/forceAtlas2/quad.js.map +1 -1
- package/lib/forceAtlas2/quadTree.js +1 -4
- package/lib/forceAtlas2/quadTree.js.map +1 -1
- package/lib/fruchterman.js +24 -28
- package/lib/fruchterman.js.map +1 -1
- package/lib/grid.js +15 -19
- package/lib/grid.js.map +1 -1
- package/lib/index.js +2 -5
- package/lib/index.js.map +1 -1
- package/lib/mds.js +17 -21
- package/lib/mds.js.map +1 -1
- package/lib/radial/index.js +22 -26
- package/lib/radial/index.js.map +1 -1
- package/lib/radial/mds.js +6 -10
- package/lib/radial/mds.js.map +1 -1
- package/lib/radial/radial-nonoverlap-force.js +1 -5
- package/lib/radial/radial-nonoverlap-force.js.map +1 -1
- package/lib/random.js +5 -9
- package/lib/random.js.map +1 -1
- package/lib/registry.js +29 -30
- package/lib/registry.js.map +1 -1
- package/lib/supervisor.js +8 -12
- package/lib/supervisor.js.map +1 -1
- package/lib/types.js +1 -5
- package/lib/types.js.map +1 -1
- package/lib/util/array.js +1 -4
- package/lib/util/array.js.map +1 -1
- package/lib/util/common.js +1 -5
- package/lib/util/common.js.map +1 -1
- package/lib/util/function.js +14 -20
- package/lib/util/function.js.map +1 -1
- package/lib/util/index.js +4 -7
- package/lib/util/index.js.map +1 -1
- package/lib/util/math.js +11 -20
- package/lib/util/math.js.map +1 -1
- package/lib/util/object.js +8 -13
- package/lib/util/object.js.map +1 -1
- package/lib/util/size.js +3 -7
- package/lib/util/size.js.map +1 -1
- package/lib/worker.js +9 -11
- package/lib/worker.js.map +1 -1
- package/package.json +3 -2
- package/dist/85db61ddc757dae66e04.worker.js +0 -2
- package/dist/85db61ddc757dae66e04.worker.js.map +0 -1
- package/lib/d3Force/forceInBox.d.ts +0 -28
- package/lib/d3Force/forceInBox.js +0 -333
- package/lib/d3Force/forceInBox.js.map +0 -1
- package/lib/d3Force/index.d.ts +0 -57
- package/lib/d3Force/index.js +0 -317
- package/lib/d3Force/index.js.map +0 -1
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.barycenter = void 0;
|
|
4
1
|
/**
|
|
5
2
|
* TODO: The median method consistently performs better than the barycenter method and has a slight theoretical advantage
|
|
6
3
|
*/
|
|
7
|
-
const barycenter = (g, movable) => {
|
|
4
|
+
export const barycenter = (g, movable) => {
|
|
8
5
|
return movable.map((v) => {
|
|
9
6
|
const inV = g.getRelatedEdges(v, 'in');
|
|
10
7
|
if (!(inV === null || inV === void 0 ? void 0 : inV.length)) {
|
|
@@ -23,5 +20,4 @@ const barycenter = (g, movable) => {
|
|
|
23
20
|
};
|
|
24
21
|
});
|
|
25
22
|
};
|
|
26
|
-
exports.barycenter = barycenter;
|
|
27
23
|
//# sourceMappingURL=barycenter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"barycenter.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/barycenter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"barycenter.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/barycenter.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAQ,EAAE,OAAa,EAAE,EAAE;IACpD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACvB,MAAM,GAAG,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,CAAA,EAAE;YAChB,OAAO,EAAE,CAAC,EAAE,CAAC;SACd;QAED,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACrC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAE,CAAC;YACnC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAM,CAAC;YACjD,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,MAAO,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO;YACL,CAAC;YACD,UAAU,EAAE,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,MAAM;YACtC,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.buildLayerGraph = void 0;
|
|
4
|
-
const graphlib_1 = require("@antv/graphlib");
|
|
1
|
+
import { Graph } from '@antv/graphlib';
|
|
5
2
|
/*
|
|
6
3
|
* Constructs a graph that can be used to sort a layer of nodes. The graph will
|
|
7
4
|
* contain all base and subgraph nodes from the request layer in their original
|
|
@@ -32,9 +29,9 @@ const graphlib_1 = require("@antv/graphlib");
|
|
|
32
29
|
* 5. The weights for copied edges are aggregated as need, since the output
|
|
33
30
|
* graph is not a multi-graph.
|
|
34
31
|
*/
|
|
35
|
-
const buildLayerGraph = (g, rank, direction) => {
|
|
32
|
+
export const buildLayerGraph = (g, rank, direction) => {
|
|
36
33
|
const root = createRootNode(g);
|
|
37
|
-
const result = new
|
|
34
|
+
const result = new Graph({
|
|
38
35
|
tree: [
|
|
39
36
|
{
|
|
40
37
|
id: root,
|
|
@@ -86,7 +83,6 @@ const buildLayerGraph = (g, rank, direction) => {
|
|
|
86
83
|
});
|
|
87
84
|
return result;
|
|
88
85
|
};
|
|
89
|
-
exports.buildLayerGraph = buildLayerGraph;
|
|
90
86
|
const createRootNode = (g) => {
|
|
91
87
|
let v;
|
|
92
88
|
while (g.hasNode((v = `_root${Math.random()}`)))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-layer-graph.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/build-layer-graph.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build-layer-graph.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/build-layer-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* A function that takes a layering (an array of layers, each with an array of
|
|
4
3
|
* ordererd nodes) and a graph and returns a weighted crossing count.
|
|
@@ -15,14 +14,12 @@
|
|
|
15
14
|
*
|
|
16
15
|
* This algorithm is derived from Barth, et al., "Bilayer Cross Counting."
|
|
17
16
|
*/
|
|
18
|
-
|
|
19
|
-
exports.crossCount = void 0;
|
|
20
|
-
const util_1 = require("../util");
|
|
17
|
+
import { zipObject } from '../util';
|
|
21
18
|
const twoLayerCrossCount = (g, northLayer, southLayer) => {
|
|
22
19
|
// Sort all of the edges between the north and south layers by their position
|
|
23
20
|
// in the north layer and then the south. Map these edges to the position of
|
|
24
21
|
// their head in the south layer.
|
|
25
|
-
const southPos =
|
|
22
|
+
const southPos = zipObject(southLayer, southLayer.map((v, i) => i));
|
|
26
23
|
const unflat = northLayer.map((v) => {
|
|
27
24
|
const unsort = g.getRelatedEdges(v, 'out').map((e) => {
|
|
28
25
|
return { pos: southPos[e.target] || 0, weight: e.data.weight };
|
|
@@ -56,12 +53,11 @@ const twoLayerCrossCount = (g, northLayer, southLayer) => {
|
|
|
56
53
|
});
|
|
57
54
|
return cc;
|
|
58
55
|
};
|
|
59
|
-
const crossCount = (g, layering) => {
|
|
56
|
+
export const crossCount = (g, layering) => {
|
|
60
57
|
let cc = 0;
|
|
61
58
|
for (let i = 1; i < (layering === null || layering === void 0 ? void 0 : layering.length); i += 1) {
|
|
62
59
|
cc += twoLayerCrossCount(g, layering[i - 1], layering[i]);
|
|
63
60
|
}
|
|
64
61
|
return cc;
|
|
65
62
|
};
|
|
66
|
-
exports.crossCount = crossCount;
|
|
67
63
|
//# sourceMappingURL=cross-count.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross-count.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/cross-count.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cross-count.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/cross-count.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const cross_count_1 = require("./cross-count");
|
|
10
|
-
const init_order_1 = require("./init-order");
|
|
11
|
-
const sort_subgraph_1 = require("./sort-subgraph");
|
|
1
|
+
import { Graph } from '@antv/graphlib';
|
|
2
|
+
import { clone } from '@antv/util';
|
|
3
|
+
import { buildLayerMatrix, maxRank } from '../util';
|
|
4
|
+
import { addSubgraphConstraints } from './add-subgraph-constraints';
|
|
5
|
+
import { buildLayerGraph } from './build-layer-graph';
|
|
6
|
+
import { crossCount } from './cross-count';
|
|
7
|
+
import { initOrder } from './init-order';
|
|
8
|
+
import { sortSubgraph } from './sort-subgraph';
|
|
12
9
|
/*
|
|
13
10
|
* Applies heuristics to minimize edge crossings in the graph and sets the best
|
|
14
11
|
* order solution as an order attribute on each node.
|
|
@@ -24,8 +21,8 @@ const sort_subgraph_1 = require("./sort-subgraph");
|
|
|
24
21
|
* 1. Graph nodes will have an "order" attribute based on the results of the
|
|
25
22
|
* algorithm.
|
|
26
23
|
*/
|
|
27
|
-
const order = (g, keepNodeOrder) => {
|
|
28
|
-
const mxRank =
|
|
24
|
+
export const order = (g, keepNodeOrder) => {
|
|
25
|
+
const mxRank = maxRank(g);
|
|
29
26
|
const range1 = [];
|
|
30
27
|
const range2 = [];
|
|
31
28
|
for (let i = 1; i < mxRank + 1; i++)
|
|
@@ -34,55 +31,54 @@ const order = (g, keepNodeOrder) => {
|
|
|
34
31
|
range2.push(i);
|
|
35
32
|
const downLayerGraphs = buildLayerGraphs(g, range1, 'in');
|
|
36
33
|
const upLayerGraphs = buildLayerGraphs(g, range2, 'out');
|
|
37
|
-
let layering =
|
|
34
|
+
let layering = initOrder(g);
|
|
38
35
|
assignOrder(g, layering);
|
|
39
36
|
let bestCC = Number.POSITIVE_INFINITY;
|
|
40
37
|
let best;
|
|
41
38
|
for (let i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
|
|
42
39
|
sweepLayerGraphs(i % 2 ? downLayerGraphs : upLayerGraphs, i % 4 >= 2, false, keepNodeOrder);
|
|
43
|
-
layering =
|
|
44
|
-
const cc =
|
|
40
|
+
layering = buildLayerMatrix(g);
|
|
41
|
+
const cc = crossCount(g, layering);
|
|
45
42
|
if (cc < bestCC) {
|
|
46
43
|
lastBest = 0;
|
|
47
|
-
best =
|
|
44
|
+
best = clone(layering);
|
|
48
45
|
bestCC = cc;
|
|
49
46
|
}
|
|
50
47
|
}
|
|
51
48
|
// consider use previous result, maybe somewhat reduendant
|
|
52
|
-
layering =
|
|
49
|
+
layering = initOrder(g);
|
|
53
50
|
assignOrder(g, layering);
|
|
54
51
|
for (let i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
|
|
55
52
|
sweepLayerGraphs(i % 2 ? downLayerGraphs : upLayerGraphs, i % 4 >= 2, true, keepNodeOrder);
|
|
56
|
-
layering =
|
|
57
|
-
const cc =
|
|
53
|
+
layering = buildLayerMatrix(g);
|
|
54
|
+
const cc = crossCount(g, layering);
|
|
58
55
|
if (cc < bestCC) {
|
|
59
56
|
lastBest = 0;
|
|
60
|
-
best =
|
|
57
|
+
best = clone(layering);
|
|
61
58
|
bestCC = cc;
|
|
62
59
|
}
|
|
63
60
|
}
|
|
64
61
|
assignOrder(g, best);
|
|
65
62
|
};
|
|
66
|
-
exports.order = order;
|
|
67
63
|
const buildLayerGraphs = (g, ranks, direction) => {
|
|
68
64
|
return ranks.map((rank) => {
|
|
69
|
-
return
|
|
65
|
+
return buildLayerGraph(g, rank, direction);
|
|
70
66
|
});
|
|
71
67
|
};
|
|
72
68
|
const sweepLayerGraphs = (layerGraphs, biasRight, usePrev, keepNodeOrder) => {
|
|
73
|
-
const cg = new
|
|
69
|
+
const cg = new Graph();
|
|
74
70
|
layerGraphs === null || layerGraphs === void 0 ? void 0 : layerGraphs.forEach((lg) => {
|
|
75
71
|
var _a;
|
|
76
72
|
// const root = lg.graph().root as string;
|
|
77
73
|
const root = lg.getRoots()[0].id;
|
|
78
|
-
const sorted =
|
|
74
|
+
const sorted = sortSubgraph(lg, root, cg, biasRight, usePrev, keepNodeOrder);
|
|
79
75
|
for (let i = 0; i < ((_a = sorted.vs) === null || _a === void 0 ? void 0 : _a.length) || 0; i++) {
|
|
80
76
|
const lnode = lg.getNode(sorted.vs[i]);
|
|
81
77
|
if (lnode) {
|
|
82
78
|
lnode.data.order = i;
|
|
83
79
|
}
|
|
84
80
|
}
|
|
85
|
-
|
|
81
|
+
addSubgraphConstraints(lg, cg, sorted.vs);
|
|
86
82
|
});
|
|
87
83
|
};
|
|
88
84
|
const assignOrder = (g, layering) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.initDataOrder = void 0;
|
|
4
1
|
/**
|
|
5
2
|
* 按照数据中的结果设置fixorder
|
|
6
3
|
*/
|
|
7
|
-
const initDataOrder = (g, nodeOrder) => {
|
|
4
|
+
export const initDataOrder = (g, nodeOrder) => {
|
|
8
5
|
const simpleNodes = g.getAllNodes().filter((v) => {
|
|
9
6
|
var _a;
|
|
10
7
|
return !((_a = g.getChildren(v.id)) === null || _a === void 0 ? void 0 : _a.length);
|
|
@@ -27,5 +24,4 @@ const initDataOrder = (g, nodeOrder) => {
|
|
|
27
24
|
}
|
|
28
25
|
});
|
|
29
26
|
};
|
|
30
|
-
exports.initDataOrder = initDataOrder;
|
|
31
27
|
//# sourceMappingURL=init-data-order.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-data-order.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/init-data-order.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init-data-order.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/init-data-order.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAQ,EAAE,SAAgB,EAAE,EAAE;IAC1D,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;;QAC/C,OAAO,CAAC,CAAA,MAAA,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,0CAAE,MAAM,CAAA,CAAC;IACtC,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IACnC,MAAM,MAAM,GAAW,EAAE,CAAC;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KAChB;IAED,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,4BAA4B;QAC5B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YAC5B,OAAO;SACR;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC,MAAM,CAAC,CAAC,mBAAmB;YACxE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.initOrder = void 0;
|
|
4
1
|
/*
|
|
5
2
|
* Assigns an initial order value for each node by performing a DFS search
|
|
6
3
|
* starting from nodes in the first rank. Nodes are assigned an order in their
|
|
@@ -12,7 +9,7 @@ exports.initOrder = void 0;
|
|
|
12
9
|
* Returns a layering matrix with an array per layer and each layer sorted by
|
|
13
10
|
* the order of its nodes.
|
|
14
11
|
*/
|
|
15
|
-
const initOrder = (g) => {
|
|
12
|
+
export const initOrder = (g) => {
|
|
16
13
|
const visited = {};
|
|
17
14
|
// const simpleNodes = g.getAllNodes().filter((v) => {
|
|
18
15
|
// return !g.getChildren(v.id)?.length;
|
|
@@ -47,5 +44,4 @@ const initOrder = (g) => {
|
|
|
47
44
|
}));
|
|
48
45
|
return layers;
|
|
49
46
|
};
|
|
50
|
-
exports.initOrder = initOrder;
|
|
51
47
|
//# sourceMappingURL=init-order.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-order.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/init-order.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init-order.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/init-order.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAQ,EAAE,EAAE;IACpC,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,sDAAsD;IACtD,yCAAyC;IACzC,MAAM;IACN,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IACpC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,IAAI,CAAC,IAAK,mCAAI,CAAC,QAAQ,CAAA,EAAA,CAAC,CAAC;IAEpE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;IACvC,MAAM,MAAM,GAAW,EAAE,CAAC;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACjB;IAED,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAChC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAK,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAK,CAClE,CAAC;IACF,oFAAoF;IAEpF,sBAAsB;IACtB,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACxC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC;IACrD,CAAC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAS,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAS,CAC1E,CAAC;IACF,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAK,CAAC,EAAE;YACtC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC/C;QACD,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACvB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QACvB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,OAAO,IAAI,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,EAAE;YAC3B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACvC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Given a list of entries of the form {v, barycenter, weight} and a
|
|
4
3
|
* constraint graph this function will resolve any conflicts between the
|
|
@@ -24,7 +23,6 @@
|
|
|
24
23
|
* graph. The property `i` is the lowest original index of any of the
|
|
25
24
|
* elements in `vs`.
|
|
26
25
|
*/
|
|
27
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
26
|
const resolveConflicts = (entries, cg) => {
|
|
29
27
|
var _a, _b, _c;
|
|
30
28
|
const mappedEntries = {};
|
|
@@ -116,5 +114,5 @@ const mergeEntries = (target, source) => {
|
|
|
116
114
|
target.i = Math.min(source.i, target.i);
|
|
117
115
|
source.merged = true;
|
|
118
116
|
};
|
|
119
|
-
|
|
117
|
+
export default resolveConflicts;
|
|
120
118
|
//# sourceMappingURL=resolve-conflicts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-conflicts.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/resolve-conflicts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve-conflicts.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/resolve-conflicts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const barycenter_1 = require("./barycenter");
|
|
6
|
-
const resolve_conflicts_1 = tslib_1.__importDefault(require("./resolve-conflicts"));
|
|
7
|
-
const sort_1 = require("./sort");
|
|
8
|
-
const sortSubgraph = (g, v, cg, biasRight, usePrev, keepNodeOrder) => {
|
|
1
|
+
import { barycenter } from './barycenter';
|
|
2
|
+
import resolveConflicts from './resolve-conflicts';
|
|
3
|
+
import { sort } from './sort';
|
|
4
|
+
export const sortSubgraph = (g, v, cg, biasRight, usePrev, keepNodeOrder) => {
|
|
9
5
|
var _a, _b, _c, _d;
|
|
10
6
|
let movable = g.getChildren(v).map((n) => n.id);
|
|
11
7
|
// fixorder的点不参与排序（这个方案不合适，只排了新增节点，和原来的分离）
|
|
@@ -18,18 +14,18 @@ const sortSubgraph = (g, v, cg, biasRight, usePrev, keepNodeOrder) => {
|
|
|
18
14
|
return w !== bl && w !== br;
|
|
19
15
|
});
|
|
20
16
|
}
|
|
21
|
-
const barycenters =
|
|
17
|
+
const barycenters = barycenter(g, movable || []);
|
|
22
18
|
barycenters === null || barycenters === void 0 ? void 0 : barycenters.forEach((entry) => {
|
|
23
19
|
var _a;
|
|
24
20
|
if ((_a = g.getChildren(entry.v)) === null || _a === void 0 ? void 0 : _a.length) {
|
|
25
|
-
const subgraphResult =
|
|
21
|
+
const subgraphResult = sortSubgraph(g, entry.v, cg, biasRight, keepNodeOrder);
|
|
26
22
|
subgraphs[entry.v] = subgraphResult;
|
|
27
23
|
if (subgraphResult.hasOwnProperty('barycenter')) {
|
|
28
24
|
mergeBarycenters(entry, subgraphResult);
|
|
29
25
|
}
|
|
30
26
|
}
|
|
31
27
|
});
|
|
32
|
-
const entries = (
|
|
28
|
+
const entries = resolveConflicts(barycenters, cg);
|
|
33
29
|
expandSubgraphs(entries, subgraphs);
|
|
34
30
|
// 添加fixorder信息到entries里边
|
|
35
31
|
// TODO: 不考虑复合情况，只用第一个点的fixorder信息，后续考虑更完备的实现
|
|
@@ -41,7 +37,7 @@ const sortSubgraph = (g, v, cg, biasRight, usePrev, keepNodeOrder) => {
|
|
|
41
37
|
e.order = node.data.order;
|
|
42
38
|
}
|
|
43
39
|
});
|
|
44
|
-
const result =
|
|
40
|
+
const result = sort(entries, biasRight, usePrev, keepNodeOrder);
|
|
45
41
|
if (bl) {
|
|
46
42
|
result.vs = [bl, result.vs, br].flat();
|
|
47
43
|
if ((_b = g.getPredecessors(bl)) === null || _b === void 0 ? void 0 : _b.length) {
|
|
@@ -61,7 +57,6 @@ const sortSubgraph = (g, v, cg, biasRight, usePrev, keepNodeOrder) => {
|
|
|
61
57
|
}
|
|
62
58
|
return result;
|
|
63
59
|
};
|
|
64
|
-
exports.sortSubgraph = sortSubgraph;
|
|
65
60
|
const expandSubgraphs = (entries, subgraphs) => {
|
|
66
61
|
entries === null || entries === void 0 ? void 0 : entries.forEach((entry) => {
|
|
67
62
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort-subgraph.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/sort-subgraph.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sort-subgraph.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/sort-subgraph.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const util_1 = require("../util");
|
|
5
|
-
const sort = (entries, biasRight, usePrev, keepNodeOrder) => {
|
|
6
|
-
const parts = (0, util_1.partition)(entries, (entry) => {
|
|
1
|
+
import { partition } from '../util';
|
|
2
|
+
export const sort = (entries, biasRight, usePrev, keepNodeOrder) => {
|
|
3
|
+
const parts = partition(entries, (entry) => {
|
|
7
4
|
const hasFixOrder = entry.hasOwnProperty('fixorder') && !isNaN(entry.fixorder);
|
|
8
5
|
if (keepNodeOrder) {
|
|
9
6
|
return !hasFixOrder && entry.hasOwnProperty('barycenter');
|
|
@@ -36,7 +33,6 @@ const sort = (entries, biasRight, usePrev, keepNodeOrder) => {
|
|
|
36
33
|
}
|
|
37
34
|
return result;
|
|
38
35
|
};
|
|
39
|
-
exports.sort = sort;
|
|
40
36
|
const consumeUnsortable = (vs, unsortable, index) => {
|
|
41
37
|
let iindex = index;
|
|
42
38
|
let last;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/sort.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sort.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/sort.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parentDummyChains = void 0;
|
|
4
1
|
// deep first search with both order low for pre, lim for post
|
|
5
2
|
const dfsBothOrder = (g) => {
|
|
6
3
|
const result = {};
|
|
@@ -39,7 +36,7 @@ const findPath = (g, postorderNums, v, w) => {
|
|
|
39
36
|
}
|
|
40
37
|
return { lca, path: vPath.concat(wPath.reverse()) };
|
|
41
38
|
};
|
|
42
|
-
const parentDummyChains = (g, dummyChains) => {
|
|
39
|
+
export const parentDummyChains = (g, dummyChains) => {
|
|
43
40
|
const postorderNums = dfsBothOrder(g);
|
|
44
41
|
dummyChains.forEach((startV) => {
|
|
45
42
|
var _a, _b;
|
|
@@ -80,5 +77,4 @@ const parentDummyChains = (g, dummyChains) => {
|
|
|
80
77
|
}
|
|
81
78
|
});
|
|
82
79
|
};
|
|
83
|
-
exports.parentDummyChains = parentDummyChains;
|
|
84
80
|
//# sourceMappingURL=parent-dummy-chains.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parent-dummy-chains.js","sourceRoot":"","sources":["../../src/antv-dagre/parent-dummy-chains.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parent-dummy-chains.js","sourceRoot":"","sources":["../../src/antv-dagre/parent-dummy-chains.ts"],"names":[],"mappings":"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"}
|