Skip to content

Vertical nodes add child nodes #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Vertical nodes add child nodes #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7be677f
feat(orgchart垂直展示时，添加子节点):
Oct 23, 2018
04f18ee
feat(修改垂直节点添加子节点):
Oct 24, 2018
31c6f52
feat(修改垂直节点添加子节点):
Oct 24, 2018
28bfe84
feat(垂直节点上添加子节点):
Oct 26, 2018
23b6287
feat(垂直节点上添加子节点):
Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .idea/OrgChart.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,19 @@ Adds child nodes for designed node.
</tbody>
</table>

#### addNodeChildren($node, data, level)
Adds child nodes for vertical node.
<table>
<thead>
<tr><th>Name</th><th>Type</th><th>Required</th><th>Default</th><th>Description</th></tr>
</thead>
<tbody>
<tr><td>$node</td><td>jquery object</td><td>yes</td><td></td><td>we'll add child nodes based on this node</td></tr>
<tr><td>data</td><td>array</td><td>yes</td><td></td><td>datasource for building child nodes</td></tr>
<tr><td>level</td><td>number</td><td>yes</td><td></td><td>The level of the current node,available from data</td></tr>
</tbody>
</table>

#### removeNodes($node）
Removes the designated node and its descedant nodes.
<table>
Expand Down
Binary file modified demo/fonts/fontawesome-webfont.woff2
View file
Open in desktop
Binary file not shown.
60 changes: 57 additions & 3 deletions demo/js/jquery.orgchart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,59 @@
this.switchVerticalArrow($node.children('.bottomEdge'));
}
},
// exposed method:Vertical nodes add child nodes
addNodeChildren: function ($node, data, level) {
this.buildNodeChildNode($node, data, level);
if (!$node.children('.bottomEdge').length) {
if(level <= 2){
$node.append('<i class="edge verticalEdge bottomEdge fa"></i>');
} else {
$node.append('<i class="toggleBtn fa fa-minus-square"></i>');
}
}
if (!$node.find('.symbol').length) {
$node.children('.title').prepend('<i class="fa '+ this.options.parentNodeSymbol + ' symbol"></i>');
}
},
buildNodeChildNode: function ($appendTo, data ,level) {
this.buildNodeHierarchy($appendTo, { 'children': data ,'level': level});
},
buildNodeHierarchy: function ($appendTo, data) {
var that = this;
var opts = this.options;
var level = 0;
if (data.level) {
level = data.level;
} else {
level = data.level = $appendTo.parentsUntil('.orgchart', '.nodes').length + 1;
}
// Construct the node
var childrenData = data.children;
var hasChildren = childrenData ? childrenData.length : false;
var $nodeDiv = this.createNode(data);
if (hasChildren) {
var isHidden = (level + 1 > opts.visibleLevel || data.collapsed) ? ' hidden' : '';
var isVerticalLayer = (opts.verticalLevel && (level + 1) >= opts.verticalLevel) ? true : false;
var $nodesLayer= $('<ul>');
if (isVerticalLayer) {
if (level + 1 <= opts.verticalLevel) {
$appendTo.closest('table').append('<tr class="verticalNodes' + isHidden + '"><td></td></tr>')
.find('.verticalNodes').children().append($nodesLayer);
} else {
$appendTo.after($nodesLayer);
}
}
// recurse through children nodes
$.each(childrenData, function () {
var $nodeCell = isVerticalLayer ? $('<li>') : $('<td colspan="2">');
$nodesLayer.append($nodeCell);
this.level = level + 1;
that.buildNodeHierarchy($nodeCell, this);
});
} else {
$appendTo.append($nodeDiv);
}
},
// build the parent node of specific node
buildParentNode: function ($currentRoot, data) {
data.relationship = data.relationship || '001';
Expand Down Expand Up @@ -1336,9 +1389,10 @@
},
//
removeNodes: function ($node) {
var $parent = $node.closest('table').parent();
var $sibs = $parent.parent().siblings();
if ($parent.is('td')) {
var isVerticalNode = $node.parents('.verticalNodes').length > 0 ? true : false
var $parent = isVerticalNode ? $node.parent() : $node.closest('table').parent();
var $sibs = isVerticalNode ? $parent.siblings() : $parent.parent().siblings();
if ($parent.is('td') || $parent.is('li')) {
if (this.getNodeState($node, 'siblings').exist) {
$sibs.eq(2).children('.topLine:lt(2)').remove();
$sibs.slice(0, 2).children().attr('colspan', $sibs.eq(2).children().length);
Expand Down
53 changes: 53 additions & 0 deletions dist/js/jquery.orgchart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,59 @@
this.switchVerticalArrow($node.children('.bottomEdge'));
}
},
// exposed method:Vertical nodes add child nodes
addNodeChildren: function ($node, data, level) {
this.buildNodeChildNode($node, data, level);
if (!$node.children('.bottomEdge').length) {
if(level <= 2){
$node.append('<i class="edge verticalEdge bottomEdge fa"></i>');
} else {
$node.append('<i class="toggleBtn fa fa-minus-square"></i>');
}
}
if (!$node.find('.symbol').length) {
$node.children('.title').prepend('<i class="fa '+ this.options.parentNodeSymbol + ' symbol"></i>');
}
},
buildNodeChildNode: function ($appendTo, data ,level) {
this.buildNodeHierarchy($appendTo, { 'children': data ,'level': level});
},
buildNodeHierarchy: function ($appendTo, data) {
var that = this;
var opts = this.options;
var level = 0;
if (data.level) {
level = data.level;
} else {
level = data.level = $appendTo.parentsUntil('.orgchart', '.nodes').length + 1;
}
// Construct the node
var childrenData = data.children;
var hasChildren = childrenData ? childrenData.length : false;
var $nodeDiv = this.createNode(data);
if (hasChildren) {
var isHidden = (level + 1 > opts.visibleLevel || data.collapsed) ? ' hidden' : '';
var isVerticalLayer = (opts.verticalLevel && (level + 1) >= opts.verticalLevel) ? true : false;
var $nodesLayer= $('<ul>');
if (isVerticalLayer) {
if (level + 1 <= opts.verticalLevel) {
$appendTo.closest('table').append('<tr class="verticalNodes' + isHidden + '"><td></td></tr>')
.find('.verticalNodes').children().append($nodesLayer);
} else {
$appendTo.after($nodesLayer);
}
}
// recurse through children nodes
$.each(childrenData, function () {
var $nodeCell = isVerticalLayer ? $('<li>') : $('<td colspan="2">');
$nodesLayer.append($nodeCell);
this.level = level + 1;
that.buildNodeHierarchy($nodeCell, this);
});
} else {
$appendTo.append($nodeDiv);
}
},
// build the parent node of specific node
buildParentNode: function ($currentRoot, data) {
data.relationship = data.relationship || '001';
Expand Down
2 changes: 0 additions & 2 deletions dist/js/jquery.orgchart.min.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dist/js/jquery.orgchart.min.js.map
View file
Open in desktop

This file was deleted.

60 changes: 57 additions & 3 deletions src/js/jquery.orgchart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,6 +1269,59 @@
this.switchVerticalArrow($node.children('.bottomEdge'));
}
},
// exposed method:Vertical nodes add child nodes
addNodeChildren: function ($node, data, level) {
this.buildNodeChildNode($node, data, level);
if (!$node.children('.bottomEdge').length) {
if(level <= 2){
$node.append('<i class="edge verticalEdge bottomEdge fa"></i>');
} else {
$node.append('<i class="toggleBtn fa fa-minus-square"></i>');
}
}
if (!$node.find('.symbol').length) {
$node.children('.title').prepend('<i class="fa '+ this.options.parentNodeSymbol + ' symbol"></i>');
}
},
buildNodeChildNode: function ($appendTo, data ,level) {
this.buildNodeHierarchy($appendTo, { 'children': data ,'level': level});
},
buildNodeHierarchy: function ($appendTo, data) {
var that = this;
var opts = this.options;
var level = 0;
if (data.level) {
level = data.level;
} else {
level = data.level = $appendTo.parentsUntil('.orgchart', '.nodes').length + 1;
}
// Construct the node
var childrenData = data.children;
var hasChildren = childrenData ? childrenData.length : false;
var $nodeDiv = this.createNode(data);
if (hasChildren) {
var isHidden = (level + 1 > opts.visibleLevel || data.collapsed) ? ' hidden' : '';
var isVerticalLayer = (opts.verticalLevel && (level + 1) >= opts.verticalLevel) ? true : false;
var $nodesLayer= $('<ul>');
if (isVerticalLayer) {
if (level + 1 <= opts.verticalLevel) {
$appendTo.closest('table').append('<tr class="verticalNodes' + isHidden + '"><td></td></tr>')
.find('.verticalNodes').children().append($nodesLayer);
} else {
$appendTo.after($nodesLayer);
}
}
// recurse through children nodes
$.each(childrenData, function () {
var $nodeCell = isVerticalLayer ? $('<li>') : $('<td colspan="2">');
$nodesLayer.append($nodeCell);
this.level = level + 1;
that.buildNodeHierarchy($nodeCell, this);
});
} else {
$appendTo.append($nodeDiv);
}
},
// build the parent node of specific node
buildParentNode: function ($currentRoot, data) {
data.relationship = data.relationship || '001';
Expand Down Expand Up @@ -1336,9 +1389,10 @@
},
//
removeNodes: function ($node) {
var $parent = $node.closest('table').parent();
var $sibs = $parent.parent().siblings();
if ($parent.is('td')) {
var isVerticalNode = $node.parents('.verticalNodes').length > 0 ? true : false
var $parent = isVerticalNode ? $node.parent() : $node.closest('table').parent();
var $sibs = isVerticalNode ? $parent.siblings() : $parent.parent().siblings();
if ($parent.is('td') || $parent.is('li')) {
if (this.getNodeState($node, 'siblings').exist) {
$sibs.eq(2).children('.topLine:lt(2)').remove();
$sibs.slice(0, 2).children().attr('colspan', $sibs.eq(2).children().length);
Expand Down