drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#6139 bug fixed

Browse source 
#6139 bug fixed
This commit is contained in:
mo.duan 2019-08-29 11:42:30 +08:00
parent e61df0d038
commit 96bd19e9bf
2 changed files with 75 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
examples/routers/tree.vue
View file

@ -1,43 +1,81 @@
<template> <template>
<Tree :data="data2" check-directly show-checkbox></Tree> <Tree :data="data3" :load-data="loadData" show-checkbox></Tree>
</template> </template>
<script> <script>
//验证bug #6139
export default { export default {
data () { data () {
return { return {
data2: [ data3: [
{ {
title: 'parent 1', title: 'parent',
expand: true, loading: false,
children: [ children: []
{
title: 'parent 1-1',
expand: true,
children: [
{
title: 'leaf 1-1-1'
},
{
title: 'leaf 1-1-2'
}
]
},
{
title: 'parent 1-2',
expand: true,
children: [
{
title: 'leaf 1-2-1'
},
{
title: 'leaf 1-2-1'
}
]
}
]
} }
] ]
};
},
methods: {
loadData (item, callback) {
setTimeout(() => {
const isSet = Math.ceil(Math.random()*10)%2;
let data = [];
if( isSet ){
data = [
{
title: 'children-1',
loading: false,
children: []
}
];
}
callback(data);
}, 1000);
} }
} }
} };
</script> </script>
<!--<template>-->
<!-- <Tree :data="data2" check-directly show-checkbox></Tree>-->
<!--</template>-->
<!--<script>-->
<!-- export default {-->
<!-- data () {-->
<!-- return {-->
<!-- data2: [-->
<!-- {-->
<!-- title: 'parent 1',-->
<!-- expand: true,-->
<!-- children: [-->
<!-- {-->
<!-- title: 'parent 1-1',-->
<!-- expand: true,-->
<!-- children: [-->
<!-- {-->
<!-- title: 'leaf 1-1-1'-->
<!-- },-->
<!-- {-->
<!-- title: 'leaf 1-1-2'-->
<!-- }-->
<!-- ]-->
<!-- },-->
<!-- {-->
<!-- title: 'parent 1-2',-->
<!-- expand: true,-->
<!-- children: [-->
<!-- {-->
<!-- title: 'leaf 1-2-1'-->
<!-- },-->
<!-- {-->
<!-- title: 'leaf 1-2-1'-->
<!-- }-->
<!-- ]-->
<!-- }-->
<!-- ]-->
<!-- }-->
<!-- ]-->
<!-- }-->
<!-- }-->
<!-- }-->
<!--</script>-->

8
src/components/tree/node.vue
View file

@ -71,7 +71,9 @@
data () { data () {
return { return {
prefixCls: prefixCls, prefixCls: prefixCls,
appearByClickArrow: false appearByClickArrow: false,
// #6139
loadingChildrenState : true
}; };
}, },
computed: { computed: {
@ -105,7 +107,7 @@
]; ];
}, },
showArrow () { showArrow () {
return (this.data[this.childrenKey] && this.data[this.childrenKey].length) || ('loading' in this.data && !this.data.loading); return (this.data[this.childrenKey] && this.data[this.childrenKey].length) || ('loading' in this.data && !this.data.loading && this.loadingChildrenState);
}, },
showLoading () { showLoading () {
return 'loading' in this.data && this.data.loading; return 'loading' in this.data && this.data.loading;
@ -188,6 +190,8 @@
if (children.length) { if (children.length) {
this.$set(this.data, this.childrenKey, children); this.$set(this.data, this.childrenKey, children);
this.$nextTick(() => this.handleExpand()); this.$nextTick(() => this.handleExpand());
}else{
this.loadingChildrenState = false;
} }
}); });
return; return;