add param includeNodeData for getHierarchy()

Author: dabeng

README.md

@@ -309,6 +309,13 @@ var oc = $('#chartContainerId').orgchart(options);
       <td>false</td>
       <td>It enable the export button for orgchart.</td>
     </tr>
+    <tr>
+      <td>exportButtonName</td>
+      <td>string</td>
+      <td>no</td>
+      <td>"Export"</td>
+      <td>It's export button name.</td>
+    </tr>
     <tr>
       <td>exportFilename</td>
       <td>string</td>
@@ -471,6 +478,22 @@ Removes the designated node and its descedant nodes.
 
 #### getHierarchy()
 This method is designed to get the hierarchy relationships of orgchart for further processing. For example, after editing the orgchart, you could send the returned value of this method to server-side and save the new state of orghcart.
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Type</th>
+    <th>Required</th>
+    <th>Default</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>includeNodeData</td>
+    <td>Boolean</td>
+    <td>No</td>
+    <td>false</td>
+    <td>This optional parameter determines whether include the nodeData items in the generated JSON object in addition to the id and children</td>
+  </tr>
+</table>
 
 #### hideParent($node)
 This method allows you to hide programatically the parent node of any specific node(.node element), if it has.

README.zh-cn.md

@@ -300,6 +300,13 @@ var oc = $('#chartContainerId').orgchart(options);
       <td>false</td>
       <td>启用该选项，插件会追加“导出”按钮到组织结构图的容器DIV里。</td>
     </tr>
+    <tr>
+      <td>exportButtonName</td>
+      <td>string</td>
+      <td>否</td>
+      <td>"Export"</td>
+      <td>导出按钮的名字。</td>
+    </tr>
     <tr>
       <td>exportFilename</td>
       <td>string</td>
@@ -463,6 +470,23 @@ Adds parent node(actullay it's always root node) for current orgchart.
 #### getHierarchy()
 这个方法被设计用来提供组织结构图的层次结构关系。举个例子，当你采取某种手段对当前的组织结构图的结构进行了改动后，可以调用本方法获得最新的结构，并将其保存到后台。
 
+<table>
+  <tr>
+    <th>名称</th>
+    <th>类型</th>
+    <th>必填</th>
+    <th>默认值</th>
+    <th>描述</th>
+  </tr>
+  <tr>
+    <td>includeNodeData</td>
+    <td>Boolean</td>
+    <td>否</td>
+    <td>false</td>
+    <td>如果传入的该参数为true，那么导出的层次结构对象中就加入nodeData数据。</td>
+  </tr>
+</table>
+
 #### hideParent($node)
 隐藏指定节点的父节点。当然其兄弟节点及祖先节点也一并隐藏了。
 <table>

README.zh-tw.md

@@ -300,6 +300,13 @@ var oc = $('#chartContainerId').orgchart(options);
       <td>false</td>
       <td>啓用該選項，插件會追加“導出”按鈕到組織結構圖的容器DIV裏。</td>
     </tr>
+    <tr>
+      <td>exportButtonName</td>
+      <td>string</td>
+      <td>否</td>
+      <td>"Export"</td>
+      <td>導出按鈕的名字。</td>
+    </tr>
     <tr>
       <td>exportFilename</td>
       <td>string</td>
@@ -463,6 +470,23 @@ Adds parent node(actullay it's always root node) for current orgchart.
 #### getHierarchy()
 這個方法被設計用來提供組織結構圖的層次結構關系。舉個例子，當你采取某種手段對當前的組織結構圖的結構進行了改動後，可以調用本方法獲得最新的結構，並將其保存到後台。
 
+<table>
+  <tr>
+    <th>名稱</th>
+    <th>類型</th>
+    <th>必填</th>
+    <th>默認值</th>
+    <th>描述</th>
+  </tr>
+  <tr>
+    <td>includeNodeData</td>
+    <td>Boolean</td>
+    <td>否</td>
+    <td>false</td>
+    <td>如果傳入的該參數爲true，那麽導出的層次結構對象中就加入nodeData數據。</td>
+  </tr>
+</table>
+
 #### hideParent($node)
 隱藏指定節點的父節點。當然其兄弟節點及祖先節點也一並隱藏了。
 <table>

dist/js/jquery.orgchart.js

@@ -27,6 +27,7 @@
       'visibleLevel': 999,
       'chartClass': '',
       'exportButton': false,
+      'exportButtonName': 'Export',
       'exportFilename': 'OrgChart',
       'exportFileextension': 'png',
       'parentNodeSymbol': 'oci-leader',
@@ -127,7 +128,7 @@
       var that = this;
       var $exportBtn = $('<button>', {
         'class': 'oc-export-btn' + (this.options.chartClass !== '' ? ' ' + this.options.chartClass : ''),
-        'text': 'Export',
+        'text': this.options.exportButtonName,
         'click': function(e) {
           e.preventDefault();
           that.export();
@@ -365,18 +366,26 @@
       return data;
     },
     //
-    loopChart: function ($chart) {
+    loopChart: function ($chart, includeNodeData) {
+      includeNodeData = (includeNodeData !== null && includeNodeData !== undefined) ? includeNodeData : false;
       var that = this;
       var $tr = $chart.find('tr:first');
       var subObj = { 'id': $tr.find('.node')[0].id };
+      if (includeNodeData) {
+        var $node = $($tr.find('.node')[0])
+        $.each($node.data('nodeData'), function (key, value) {
+          subObj[key] = value;
+        });
+      }
       $tr.siblings(':last').children().each(function() {
         if (!subObj.children) { subObj.children = []; }
-        subObj.children.push(that.loopChart($(this)));
+        subObj.children.push(that.loopChart($(this), includeNodeData));
       });
       return subObj;
     },
     //
-    getHierarchy: function () {
+    getHierarchy: function (includeNodeData) {
+      includeNodeData = (includeNodeData !== null && includeNodeData !== undefined) ? includeNodeData : false;
       if (typeof this.$chart === 'undefined') {
         return 'Error: orgchart does not exist'
       } else {
@@ -395,7 +404,7 @@
           }
         }
       }
-      return this.loopChart(this.$chart);
+      return this.loopChart(this.$chart, includeNodeData);
     },
     // detect the exist/display state of related node
     getNodeState: function ($node, relation) {

dist/js/jquery.orgchart.min.js

@@ -366,7 +366,8 @@
       return data;
     },
     //
-    loopChart: function ($chart, includeNodeData = false) {
+    loopChart: function ($chart, includeNodeData) {
+      includeNodeData = (includeNodeData !== null && includeNodeData !== undefined) ? includeNodeData : false;
       var that = this;
       var $tr = $chart.find('tr:first');
       var subObj = { 'id': $tr.find('.node')[0].id };
@@ -383,7 +384,8 @@
       return subObj;
     },
     //
-    getHierarchy: function (includeNodeData = false) {
+    getHierarchy: function (includeNodeData) {
+      includeNodeData = (includeNodeData !== null && includeNodeData !== undefined) ? includeNodeData : false;
       if (typeof this.$chart === 'undefined') {
         return 'Error: orgchart does not exist'
       } else {