test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
q4speed 2020-05-13 13:00:00 +08:00
parent 709c207fcc c88030d1d2
commit cdf2d75e6f
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/business/components/track/case/TestCase.vue
View File

@ -14,6 +14,7 @@
@refresh="refresh" @refresh="refresh"
:tree-nodes="treeNodes" :tree-nodes="treeNodes"
:type="'edit'" :type="'edit'"
:draggable="true"
:select-node.sync="selectNode" :select-node.sync="selectNode"
ref="nodeTree"/> ref="nodeTree"/>
</el-aside> </el-aside>

31
frontend/src/business/components/track/common/NodeTree.vue
View File

@ -14,7 +14,7 @@
:filter-node-method="filterNode" :filter-node-method="filterNode"
:expand-on-click-node="false" :expand-on-click-node="false"
highlight-current highlight-current
draggable :draggable="draggable"
ref="tree" ref="tree"
> >
<template v-slot:default="{node,data}"> <template v-slot:default="{node,data}">
@ -33,7 +33,7 @@
:content="$t('test_track.module.rename')" :content="$t('test_track.module.rename')"
placement="top" placement="top"
> >
<i @click="openEditNodeDialog('edit', data)" class="el-icon-edit"></i> <i @click.stop="openEditNodeDialog('edit', data)" class="el-icon-edit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
class="item" class="item"
@ -42,32 +42,13 @@
:content="$t('test_track.module.add_submodule')" :content="$t('test_track.module.add_submodule')"
placement="top" placement="top"
> >
<i @click="openEditNodeDialog('add', data)" class="el-icon-circle-plus-outline"></i> <i @click.stop="openEditNodeDialog('add', data)" class="el-icon-circle-plus-outline"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" <el-tooltip class="item" effect="dark"
:open-delay="200" :content="$t('commons.delete')" placement="top"> :open-delay="200" :content="$t('commons.delete')" placement="top">
<i @click="remove(node, data)" class="el-icon-delete"></i> <i @click.stop="remove(node, data)" class="el-icon-delete"></i>
</el-tooltip> </el-tooltip>
</span> </span>
<!-- <el-dropdown v-if="type == 'edit'" class="node-dropdown child">
<span class="el-dropdown-link">
<i class="el-icon-folder-add"></i>
</span>
<el-dropdown-menu v-slot:default>
<el-dropdown-item>
<div @click="openEditNodeDialog('edit', data)">{{$t('test_track.module.rename')}}</div>
</el-dropdown-item>
<el-dropdown-item>
<div
@click="openEditNodeDialog('add', data)"
>{{$t('test_track.module.add_submodule')}}</div>
</el-dropdown-item>
<el-dropdown-item>
<div @click="remove(node, data)">{{$t('commons.delete')}}</div>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>-->
</span> </span>
</template> </template>
</el-tree> </el-tree>
@ -102,6 +83,10 @@ export default {
}, },
selectNode: { selectNode: {
type: Object type: Object
},
draggable: {
type: Boolean,
default: true
} }
}, },
watch: { watch: {

1
frontend/src/business/components/track/plan/view/TestPlanView.vue
View File

@ -13,6 +13,7 @@
@nodeSelectEvent="nodeChange" @nodeSelectEvent="nodeChange"
@refresh="refresh" @refresh="refresh"
:tree-nodes="treeNodes" :tree-nodes="treeNodes"
:draggable="false"
ref="nodeTree"/> ref="nodeTree"/>
</el-aside> </el-aside>