From 7be677f3bb22d1d276dda911f5684cd73236fa5a Mon Sep 17 00:00:00 2001 From: huangbaojin Date: Tue, 23 Oct 2018 19:18:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(orgchart=E5=9E=82=E7=9B=B4=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AD=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/OrgChart.iml | 12 ++++++ .idea/misc.xml | 6 +++ .idea/modules.xml | 8 ++++ .idea/vcs.xml | 6 +++ demo/fonts/fontawesome-webfont.woff2 | Bin 77160 -> 77672 bytes dist/js/jquery.orgchart.js | 53 +++++++++++++++++++++++++++ src/js/jquery.orgchart.js | 53 +++++++++++++++++++++++++++ 7 files changed, 138 insertions(+) create mode 100644 .idea/OrgChart.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/OrgChart.iml b/.idea/OrgChart.iml new file mode 100644 index 00000000..24643cc3 --- /dev/null +++ b/.idea/OrgChart.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..28a804d8 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..cb647463 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/demo/fonts/fontawesome-webfont.woff2 b/demo/fonts/fontawesome-webfont.woff2 index 4d13fc60404b91e398a37200c4a77b645cfd9586..55103d6d90b0e529a760080836a6f4dbee4dc0eb 100644 GIT binary patch delta 23 fcmaEHi{-^VmWC~i8M+*cOoO*cIk0kU_`wJOe;f%@ delta 11 ScmaEHkLATJmWC~i8M*)_aRpld diff --git a/dist/js/jquery.orgchart.js b/dist/js/jquery.orgchart.js index 1de81800..9fdf7be9 100644 --- a/dist/js/jquery.orgchart.js +++ b/dist/js/jquery.orgchart.js @@ -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(''); + } else { + $node.append(''); + } + } + if (!$node.find('.symbol').length) { + $node.children('.title').prepend(''); + } + }, + 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= $('