Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7
This commit is contained in:
commit
bd12a36af5
|
@ -11,6 +11,7 @@
|
||||||
@edit="edit"
|
@edit="edit"
|
||||||
@drag="drag"
|
@drag="drag"
|
||||||
@remove="remove"
|
@remove="remove"
|
||||||
|
@refresh="list"
|
||||||
@nodeSelectEvent="nodeChange"
|
@nodeSelectEvent="nodeChange"
|
||||||
ref="nodeTree">
|
ref="nodeTree">
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
@edit="edit"
|
@edit="edit"
|
||||||
@drag="drag"
|
@drag="drag"
|
||||||
@remove="remove"
|
@remove="remove"
|
||||||
|
@refresh="list"
|
||||||
@nodeSelectEvent="nodeChange"
|
@nodeSelectEvent="nodeChange"
|
||||||
ref="nodeTree">
|
ref="nodeTree">
|
||||||
|
|
||||||
|
|
|
@ -469,11 +469,12 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
'report.testId': {
|
report: {
|
||||||
handler() {
|
handler() {
|
||||||
this.getJmxContent();
|
this.getJmxContent();
|
||||||
},
|
},
|
||||||
}
|
deep: true
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -220,6 +220,10 @@ export default {
|
||||||
if (dropType === "none" || dropType === undefined) {
|
if (dropType === "none" || dropType === undefined) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (dropNode.data.id === 'root' && dropType === 'before') {
|
||||||
|
this.$emit('refresh');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
let param = this.buildParam(draggingNode, dropNode, dropType);
|
let param = this.buildParam(draggingNode, dropNode, dropType);
|
||||||
let list = [];
|
let list = [];
|
||||||
this.getNodeTree(this.treeNodes, draggingNode.data.id, list);
|
this.getNodeTree(this.treeNodes, draggingNode.data.id, list);
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
@drag="drag"
|
@drag="drag"
|
||||||
@remove="remove"
|
@remove="remove"
|
||||||
@nodeSelectEvent="nodeChange"
|
@nodeSelectEvent="nodeChange"
|
||||||
|
@refresh="list"
|
||||||
ref="nodeTree"/>
|
ref="nodeTree"/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue