## v2.0.0

* Can use & display ListTree and TableTree
* Combinding with list-tree.
* Fix any bug.
* Remove function hashedTree(), replace by attribute '__hashKey__'

```html
<script type="text/ng-template" id="tree-table-template-render.html">
    <ul tree-table-nodes="tree_data" class="tree-table-rows">
        <li tree-table-node="row" ng-repeat="row in datas track by row.__hashKey__" ng-show="row.__visible__"
            ng-class="(row.__selected__ ? ' active':'')"
            ng-style="expandingProperty.cellStyle ? expandingProperty.cellStyle : {}" ng-click="user_clicks_branch(row)"
            ng-class="expandingProperty.cellClass" compile="expandingProperty.cellTemplate"
            ng-include="'tree-table-template-fetch.html'"></li>
    </ul>
</script>
<script type="text/ng-template" id="tree-table-template-fetch.html">
    <a tree-table-node-handle class="btn btn-default"> - </a>{{row[expandingProperty.field] || row[expandingProperty]}}
    <a ng-if="row.__expanded__ != null" class="btn btn-default"
       ng-click="expand(row)"> {{ (row.__expanded__) ? '-' : '+' }} </a>
    <ul tree-table-nodes="row.__children__" class="tree-table-rows">
        <li tree-table-node="row" ng-repeat="row in datas track by row.__hashKey__" ng-show="row.__visible__"
            ng-class="(row.__selected__ ? ' active':'')"
            ng-style="expandingProperty.cellStyle ? expandingProperty.cellStyle : {}" ng-click="user_clicks_branch(row)"
            ng-class="[expandingProperty.cellClass]" compile="expandingProperty.cellTemplate"
            ng-include="'tree-table-template-fetch.html'"></li>
    </ul>
</script>
<tree-table tree-data="tree_data" tree-control="my_tree" drag-enabled="true" column-defs="[]"
            expand-on="expanding_property" on-select="my_tree_handler(branch)" on-click="my_tree_handler(branch)"
            template-url="tree-table-template-render.html"></tree-table>
``` (reverted from commit afe1a7ed193b4fa512b7c3cc1ce7d0b9ea8be47b)

Author: thienhung1989

CHANGELOG

@@ -1,3 +1,35 @@
+## v2.0.0
+* Fix any bug.
+* Can use & display ListTree and TableTree
+* Combinding with list-tree.
+
+```html
+<script type="text/ng-template" id="tree-table-template-render.html">
+    <ul tree-table-nodes="tree_data" class="tree-table-rows">
+        <li tree-table-node="row" ng-repeat="row in datas track by row.__hashKey__" ng-show="row.__visible__"
+            ng-class="(row.__selected__ ? ' active':'')"
+            ng-style="expandingProperty.cellStyle ? expandingProperty.cellStyle : {}" ng-click="user_clicks_branch(row)"
+            ng-class="expandingProperty.cellClass" compile="expandingProperty.cellTemplate"
+            ng-include="'tree-table-template-fetch.html'"></li>
+    </ul>
+</script>
+<script type="text/ng-template" id="tree-table-template-fetch.html">
+    <a tree-table-node-handle class="btn btn-default"> - </a>{{row[expandingProperty.field] || row[expandingProperty]}}
+    <a ng-if="row.__expanded__ != null" class="btn btn-default"
+       ng-click="expand(row)"> {{ (row.__expanded__) ? '-' : '+' }} </a>
+    <ul tree-table-nodes="row.__children__" class="tree-table-rows">
+        <li tree-table-node="row" ng-repeat="row in datas track by row.__hashKey__" ng-show="row.__visible__"
+            ng-class="(row.__selected__ ? ' active':'')"
+            ng-style="expandingProperty.cellStyle ? expandingProperty.cellStyle : {}" ng-click="user_clicks_branch(row)"
+            ng-class="[expandingProperty.cellClass]" compile="expandingProperty.cellTemplate"
+            ng-include="'tree-table-template-fetch.html'"></li>
+    </ul>
+</script>
+<tree-table tree-data="tree_data" tree-control="my_tree" drag-enabled="true" column-defs="[]"
+            expand-on="expanding_property" on-select="my_tree_handler(branch)" on-click="my_tree_handler(branch)"
+            template-url="tree-table-template-render.html"></tree-table>
+```
+
 ## v1.1.0
 * Fix any bug.
 * Fix not refresh data

README.md

@@ -1,5 +1,3 @@
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/thienhung1989/angular-tree-table/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
 # angular-tree-table
 [Angular 1.x] Display tree table & event DrapnDrop, field 'td' by tree (other normal) - without jQuery.
 ## Current Version
@@ -189,3 +187,34 @@ $scope.$callbacks = {
     ....
 </tr>
 ```
+
+# Display ListTree (UL, OL)
+
+* Combinding with list-tree.
+
+```html
+<script type="text/ng-template" id="tree-table-template-render.html">
+    <ul tree-table-nodes="tree_data" class="tree-table-rows">
+        <li tree-table-node="row" ng-repeat="row in datas track by row.__hashKey__" ng-show="row.__visible__"
+            ng-class="(row.__selected__ ? ' active':'')"
+            ng-style="expandingProperty.cellStyle ? expandingProperty.cellStyle : {}" ng-click="user_clicks_branch(row)"
+            ng-class="expandingProperty.cellClass" compile="expandingProperty.cellTemplate"
+            ng-include="'tree-table-template-fetch.html'"></li>
+    </ul>
+</script>
+<script type="text/ng-template" id="tree-table-template-fetch.html">
+    <a tree-table-node-handle class="btn btn-default"> - </a>{{row[expandingProperty.field] || row[expandingProperty]}}
+    <a ng-if="row.__expanded__ != null" class="btn btn-default"
+       ng-click="expand(row)"> {{ (row.__expanded__) ? '-' : '+' }} </a>
+    <ul tree-table-nodes="row.__children__" class="tree-table-rows">
+        <li tree-table-node="row" ng-repeat="row in datas track by row.__hashKey__" ng-show="row.__visible__"
+            ng-class="(row.__selected__ ? ' active':'')"
+            ng-style="expandingProperty.cellStyle ? expandingProperty.cellStyle : {}" ng-click="user_clicks_branch(row)"
+            ng-class="[expandingProperty.cellClass]" compile="expandingProperty.cellTemplate"
+            ng-include="'tree-table-template-fetch.html'"></li>
+    </ul>
+</script>
+<tree-table tree-data="tree_data" tree-control="my_tree" drag-enabled="true" column-defs="[]"
+            expand-on="expanding_property" on-select="my_tree_handler(branch)" on-click="my_tree_handler(branch)"
+            template-url="tree-table-template-render.html"></tree-table>
+```

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "angular-tree-table",
-    "version": "1.0.4",
+    "version": "2.0.0",
     "description":"A Grid That display column tree and display column other to nest in a row by AngularJS, using CSS animation and Bootstrap style",
     "main":[
         "src/ng-tree-table.css",

package.json

@@ -6,13 +6,13 @@
     "files": [
       "ng-tree-table.js",
       "ng-tree-table.css",
-      "src/ng-tree-table.min.css",
-      "src/ng-tree-table.min.js"
+      "ng-tree-table.min.css",
+      "ng-tree-table.min.js"
     ]
   },
   "author": "https://github.com/thienhung1989/angular-tree-table/graphs/contributors",
   "name": "angular-tree-table",
-  "version": "1.0.4",
+  "version": "2.0.0",
   "homepage": "http://thienhung1989.github.io/angular-tree-table/",
   "dependencies": {},
   "repository": {

src/ng-tree-table.css

@@ -31,6 +31,7 @@
     opacity: 1;
 }
 
+
 .tree-table-animate-leave.tree-table-animate-leave-active,
 .tree-table-row.ng-leave-active {
     height: 0;
@@ -70,6 +71,10 @@
 
 .tree-table-placeholder {
     position: relative;
+    margin: 0px;
+    padding: 0px;
+    min-height: 20px;
+    line-height: 20px;
 }
 
 .tree-table-handle {
@@ -79,6 +84,8 @@
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box;
+    min-height: 20px;
+    line-height: 20px;
 }
 
 .tree-table-drag {
@@ -88,4 +95,23 @@
     opacity: .7;
     background-color: #cdffdc;
     border: 2px dashed #385736;
-}
+}
+
+
+.tree-table-rows {
+    position: relative;
+    margin: 0px;
+    padding: 0px;
+    list-style: none;
+}
+
+.tree-table-rows .tree-table-rows {
+    padding-left: 20px;
+}
+
+.tree-table-row, .tree-table-placeholder {
+    /*margin: 0px;*/
+    /*padding: 0px;*/
+    min-height: 20px;
+    line-height: 20px;
+}