chenxiaopei/StructV2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/cjc' into 'main'

Browse Source 
修复二叉树指针回指上层结点问题

See merge request phenomLi/StructV2!7
This commit is contained in:
chen jiancheng 2022-02-23 12:02:55 +00:00
commit fd4b0f6054
2 changed files with 301 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
demoV2/Layouter/BinaryTree.js
View File

@ -1,5 +1,3 @@
SV.registerLayout('BinaryTree', { SV.registerLayout('BinaryTree', {
defineOptions() { defineOptions() {
return { return {
@ -71,6 +69,11 @@ SV.registerLayout('BinaryTree', {
height = bound.height, height = bound.height,
group = new Group(node); group = new Group(node);
if (node.visited) {
return;
}
if (parent) { if (parent) {
node.set('y', parent.get('y') + layoutOptions.yInterval + height); node.set('y', parent.get('y') + layoutOptions.yInterval + height);
@ -85,6 +88,8 @@ SV.registerLayout('BinaryTree', {
} }
} }
node.visited = true;
if (node.child && (node.child[0] || node.child[1])) { if (node.child && (node.child[0] || node.child[1])) {
let leftChild = node.child[0], let leftChild = node.child[0],
rightChild = node.child[1], rightChild = node.child[1],
@ -124,6 +129,7 @@ SV.registerLayout('BinaryTree', {
*/ */
layout(elements, layoutOptions) { layout(elements, layoutOptions) {
let root = elements[0]; let root = elements[0];
let visited = new Group();
this.layoutItem(root, null, -1, layoutOptions); this.layoutItem(root, null, -1, layoutOptions);
} }
}); });
@ -132,8 +138,7 @@ SV.registerLayout('BinaryTree', {
[ [{
{
"id": 6385328, "id": 6385328,
"data": "", "data": "",
"external": [ "external": [
@ -142,6 +147,4 @@ SV.registerLayout('BinaryTree', {
"root": true, "root": true,
"after": null, "after": null,
"next": null "next": null
} }]
]

174
demoV2/demo2.html
View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -93,47 +94,145 @@
}, },
}); });
let data = [ let data = [{
{ "BinaryTree0": {
LinkStack0: { "data": [{
data: [ "external": [
{ "T1"
id: '0x616eb0',
data: '',
next: '0x616ed0',
headExternal: ['ls'],
type: 'default',
},
{
id: '0x616ed0',
data: 'f',
external: ['p'],
next: '0x616ef0',
type: 'default',
},
{
id: '0x616ef0',
data: 'g',
external: ['p1'],
next: null,
type: 'default',
},
], ],
layouter: 'LinkStack', "child": [
}, "0x617ee0",
LinkStack1: { "0x617f10"
data: [
{
id: '0x616f10',
data: '',
next: 'LinkStack0#0x616ef0',
headExternal: ['ls1'],
type: 'default',
},
], ],
layouter: 'LinkStack', "id": "0x617eb0",
"name": "T1",
"data": "Z",
"root": true,
"type": "default"
}, {
"child": [
"0x0",
"0x0"
],
"id": "0x617ee0",
"name": "T1->lchild",
"data": "A",
"type": "default"
}, {
"child": [
"0x0",
"0x0"
],
"id": "0x617f10",
"name": "T1->rchild",
"data": "B",
"type": "default",
"external": [
"r",
"t"
]
}],
"layouter": "BinaryTree"
}, },
"BinaryTree3": {
"data": [{
"external": [
"T2",
"r2"
],
"child": [
"0x617f70",
"0x0"
],
"id": "0x617f40",
"name": "T2",
"data": "Z",
"root": true,
"type": "default"
}, {
"child": [
"0x0",
"0x0"
],
"id": "0x617f70",
"name": "T2->lchild",
"data": "D",
"type": "default",
"external": [
"t2"
]
}],
"layouter": "BinaryTree"
}
}, {
"BinaryTree0": {
"data": [{
"external": [
"T1"
],
"child": [
"0x617ee0",
"0x617f10"
],
"id": "0x617eb0",
"name": "T1",
"data": "Z",
"root": true,
"type": "default"
}, {
"child": [
"0x0",
"0x0"
],
"id": "0x617ee0",
"name": "T1->lchild",
"data": "A",
"type": "default"
}, {
"child": [
"0x0",
"0x617eb0"
],
"id": "0x617f10",
"name": "T1->rchild",
"data": "B",
"type": "default"
}],
"layouter": "BinaryTree"
}, },
"BinaryTree3": {
"data": [{
"external": [
"T2",
"r2"
],
"child": [
"0x617f70",
"0x0"
],
"id": "0x617f40",
"name": "T2",
"data": "Z",
"root": true,
"type": "default"
}, {
"child": [
"0x0",
"0x0"
],
"id": "0x617f70",
"name": "T2->lchild",
"data": "D",
"type": "default",
"external": [
"t2"
]
}],
"layouter": "BinaryTree"
}
}
]; ];
let dataIndex = 0, let dataIndex = 0,
@ -190,4 +289,5 @@
}); });
</script> </script>
</body> </body>
</html> </html>