Merge pull request #356 from FEMessage/dev

release

.all-contributorsrc

@@ -234,6 +234,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "huazaili",
+      "name": "huazaili",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13534495?v=4",
+      "profile": "https://github.com/huazaili",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -333,6 +333,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://www.jogiter.cn/"><img src="https://avatars0.githubusercontent.com/u/9711036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jogiter</b></sub></a><br /><a href="https://github.com/FEMessage/el-data-table/commits?author=Jogiter" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/yolofit"><img src="https://avatars.githubusercontent.com/u/20294811?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yolofit</b></sub></a><br /><a href="https://github.com/FEMessage/el-data-table/issues?q=author%3Ayolofit" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/huazaili"><img src="https://avatars.githubusercontent.com/u/13534495?v=4?s=100" width="100px;" alt=""/><br /><sub><b>huazaili</b></sub></a><br /><a href="https://github.com/FEMessage/el-data-table/issues?q=author%3Ahuazaili" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

src/el-data-table.vue

@@ -1056,6 +1056,7 @@ export default {
           // 树形结构逻辑
           if (this.isTree) {
             this.data = this.tree2Array(data, this.expandAll)
+            this.total = total //树翻页总数
           } else {
             this.data = data
             this.total = total