1.fix bug (#431)

* 1.fix bug
2.update treeTable readme
3.update args name in treetable/eval.js

* 1.treeTable animate
This commit is contained in:
Zenon
2018-01-30 09:58:25 +08:00
committed by 花裤衩
parent d754eae662
commit dc9e27e4b1
5 changed files with 24 additions and 13 deletions

View File

@@ -4,12 +4,12 @@
*/
'use strict'
import Vue from 'vue'
export default function treeToArray(data, parent, level, expandedAll, item) {
export default function treeToArray(data, expandAll, parent, level, item) {
const marLTemp = []
let tmp = []
Array.from(data).forEach(function(record) {
if (record._expanded === undefined) {
Vue.set(record, '_expanded', expandedAll)
Vue.set(record, '_expanded', expandAll)
}
let _level = 1
if (level !== undefined && level !== null) {
@@ -40,7 +40,7 @@ export default function treeToArray(data, parent, level, expandedAll, item) {
}
tmp.push(record)
if (record.children && record.children.length > 0) {
const children = treeToArray(record.children, record, _level, expandedAll, item)
const children = treeToArray(record.children, expandAll, record, _level, item)
tmp = tmp.concat(children)
}
})

View File

@@ -5,7 +5,7 @@
<a href="https://github.com/PanJiaChen/vue-element-admin/tree/master/src/components/TreeTable" target="_blank">Documentation</a>
</el-tag>
<tree-table :data="data" :evalFunc="func" :evalArgs="args" border>
<tree-table :data="data" :evalFunc="func" :evalArgs="args" :expandAll="expandAll" border>
<el-table-column label="事件">
<template slot-scope="scope">
<span style="color:sandybrown">{{scope.row.event}}</span>
@@ -48,6 +48,7 @@ export default {
data() {
return {
func: treeToArray,
expandAll: false,
data:
{
id: 1,
@@ -123,7 +124,7 @@ export default {
}
]
},
args: [null, null, true, 'timeLine']
args: [null, null, 'timeLine']
}
},
methods: {