Merge branch 'master' of https://github.com/halower/vue-tree

# Conflicts:
#	src/components/treeLi.vue

Author: halower

README.md

@@ -7,16 +7,6 @@
 `
 The document is poorly written and you are welcome to refine your documentation in the process of using it to better help others.
 `
-## Last Version Update Log
-  adjusted some style problems, perfected the demo 
-### (Version 1.5.4)
-1. fix bugs that are not selected by some nodes in the radio mode caused by the previous version (1.5.3) 
-2. perfect Domo Example
-### (Version 1.5.3)
-1. add  ```canDeleteRoot``` option to support the removal of root nodes
-2. fix the ```async``` Invalid bug of the first level node
-### (Version 1.5.2)
-add a ```node-check``` event, ande remove ```nodeChecked``` event， because the ```nodeChecked``` event may be bubbling
 # Version: 2.x  ([中文文档](https://github.com/halower/vue2-tree/blob/master/README_CN.md))
 ```QQ Group: 255965810``` <br/>
 `we guess you may also see` [version 1.0](https://github.com/halower/vue2-tree/tree/1.x)
@@ -59,7 +49,7 @@ Vue.use (VSelectTree)
 |nocheck | specifies that a node does not render check box when multiple checkboxes are open | Boolean | Y | false |
 |loading | open load effect | Boolean | Y | false |
 |chkDisabled | disable the function of a check box for a node | Boolean | Y | false |
-|hasExpended | node has expended| Boolean | Y | false |
+|hasExpanded | node has expanded| Boolean | Y | false |
 |parent | get parent node(when `allowGetParentNode=true`,the node will add `parent`method)) | Function | - | undefined |
 |selDisabled | disable the select function of a node| Boolean | Y | false |
 

README_CN.md

@@ -12,15 +12,6 @@
 [https://halower.github.io/vue-tree](http://120.77.84.4/)
 
 
-## Last Version Update Log
-1. 修复上一个版本（1.5.3）造成的单选模式下某些节点不能选中的bug
-2. 完善domo 示例
-### (Version 1.5.3)
-1. 新增 ```canDeleteRoot```选项，用以支持是否可以删除根节点
-2. 修复一级节点的```async```无效的bug
-### (Version 1.5.2)
-添加了一个 ```node-check``` 事件, 并移除了原有的```nodeChecked``` 事件，因为```nodeChecked``` 可能存在冒泡出发效果
-
 # SelectTree API （2018-4-15 ）
 最新的发布版本已经支持下拉树功能, 在基本属性和事件(与 [Tree API](https://github.com/halower/vue-tree/blob/master/README_CN.md#tree-api-%E6%96%87%E6%A1%A3)一致)不变的前提下扩展了如下 
 
@@ -59,7 +50,7 @@ Vue.use (VSelectTree)
 |loading | 开启加载效果 | Boolean | Y | false |
 |nocheck | 多复选框开启时指定某一节点不渲染复选框 | Boolean | Y | false |
 |chkDisabled | 禁用某一结点的复选框的功能 | Boolean | Y | false |
-|hasExpended | 某一结点是否已经展开过 | Boolean | Y | false |
+|hasExpanded | 某一结点是否已经展开过(之前错误拼写成了hasExpended) | Boolean | Y | false |
 |parent | 获取父节点(当allowGetParentNode=true时,增加parent方法,若父节点不存在时,会返回null)) | Function | - | undefined |
 |selDisabled | 禁用某一结点的select的功能 | Boolean | Y | false |
 ###  Tree 属性
@@ -84,7 +75,7 @@ Vue.use (VSelectTree)
 |---------- |-------- |---------- |
 | getSelectedNodes  | 返回目前被选中的节点所组成的数组,isOriginal:默认false, ignoreInvisibleNode:默认false| isOriginal: Boolean,ignoreInvisibleNode: Boolean |
 | getCheckedNodes  | 返回目前复选框选中的节点组成的数组 | isOriginal: Boolean,ignoreInvisibleNode: Boolean |
-| getNodes | options: 可以包含一些过滤属性对象如{selected: true}，如果为空，请使用 {}; data: 数组,内容为[node,...],默认为传入的data数据;isOriginal:获取的数据是否保持原样,默认为false,会去掉`children``hasExpended``parent`属性,ignoreInvisibleNode:忽略不可见节点,默认false|options: Object, data: Array,isOriginal: Boolean,ignoreInvisibleNode: Boolean|
+| getNodes | options: 可以包含一些过滤属性对象如{selected: true}，如果为空，请使用 {}; data: 数组,内容为[node,...],默认为传入的data数据;isOriginal:获取的数据是否保持原样,默认为false,会去掉`children``hasExpanded``parent`属性,ignoreInvisibleNode:忽略不可见节点,默认false|options: Object, data: Array,isOriginal: Boolean,ignoreInvisibleNode: Boolean|
 | searchNodes | filter:function/string (如果是函数则最终会返回一个boolean类型);data:默认为this.data |filter:Function || String, data: Array|
 | nodeSelected | 选中节点方法 |node: Object|
 | addNode | 增加节点 |parentNode: Object(不能为空), node: Object|