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

fix(测试跟踪): 模块树顶部缺失搜索框问题 

https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001028391
This commit is contained in:
song-cc-rock 2023-08-07 11:46:37 +08:00 committed by 刘瑞斌
parent 4f9f9ee2d1
commit 37b1caf8b3
3 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
framework/sdk-parent/frontend/src/components/module/ModulePublicButton.vue
View File

@ -4,7 +4,7 @@
<svg-icon icon-class="icon_folder-share" style="width: 1.3em;height: 1.3em;position: relative;top: 2px;left: 1px;margin-right: 9px;"/> <svg-icon icon-class="icon_folder-share" style="width: 1.3em;height: 1.3em;position: relative;top: 2px;left: 1px;margin-right: 9px;"/>
<span style="margin-right: 12px;" class="to-public-content">{{ $t('project.case_public') }}</span> <span style="margin-right: 12px;" class="to-public-content">{{ $t('project.case_public') }}</span>
<span style="color: #8F959E">{{ '(' + publicTotal + ')' }}</span> <span style="color: #8F959E">{{ '(' + publicTotal + ')' }}</span>
<svg-icon icon-class="icon_arrow-right_outlined_1" class-name="enter-public" style="float: right;display: none;position: relative;top: 4px;left: 150px;width: 1.1em;height: 1.1em;"/> <svg-icon icon-class="icon_arrow-right_outlined_1" class-name="enter-public" style="display: none; width: 1.1em; height: 1.1em; order: 100; margin-left: auto; margin-top: 2px;"/>
</div> </div>
</div> </div>
</template> </template>
@ -28,27 +28,20 @@ export default {
}, },
data() { data() {
return { return {
isXPack: false isXpack: false
} }
}, },
created() { created() {
if (hasLicense()) { this.isXpack = hasLicense();
this.isXpack = true;
} else {
this.isXpack = false;
}
}, },
methods: {}
} }
</script> </script>
<style scoped> <style scoped>
.recycle { .recycle {
padding: 14px 0px 14px 13px px; padding-bottom: 24px;
height: 26px;
line-height: 26px; line-height: 26px;
height: 52px; height: 26px;
border-bottom: 1px solid rgba(31, 35, 41, 0.15); border-bottom: 1px solid rgba(31, 35, 41, 0.15);
} }
@ -88,8 +81,4 @@ export default {
.to-public:hover .enter-public{ .to-public:hover .enter-public{
display: block!important; display: block!important;
} }
.to-public:hover .to-public-content{
margin-left: -10.5px;
}
</style> </style>

13
framework/sdk-parent/frontend/src/components/new-ui/MsNodeTree.vue
View File

@ -1,9 +1,6 @@
<template> <template>
<div> <div>
<slot name="header"></slot>
<slot name="header">
<el-input :placeholder="$t('test_track.module.search')" v-model="filterText" size="small" :clearable="true" class="search-input"/>
</slot>
<el-scrollbar> <el-scrollbar>
<ms-left-2-right-container v-if="scroll"> <ms-left-2-right-container v-if="scroll">
@ -536,7 +533,7 @@ export default {
this.$emit('remove', nodeIds, data); this.$emit('remove', nodeIds, data);
} }
}, },
handleDragEnd(draggingNode, dropNode, dropType, ev) { handleDragEnd(draggingNode, dropNode, dropType) {
if (dropType === "none" || dropType === undefined) { if (dropType === "none" || dropType === undefined) {
return; return;
} }
@ -563,7 +560,7 @@ export default {
} else { } else {
param.level = 1; param.level = 1;
param.type = 'add'; param.type = 'add';
if (parentData.id != 'root') { if (parentData.id !== 'root') {
// 非根节点 // 非根节点
param.parentId = parentData.id; param.parentId = parentData.id;
param.level = parentData.level + 1; param.level = parentData.level + 1;
@ -714,7 +711,7 @@ export default {
} }
.node-tree { .node-tree {
height: calc(100vh - 270px); height: calc(100vh - 300px);
} }
.father .child { .father .child {
@ -761,7 +758,7 @@ export default {
width: auto; width: auto;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
padding: 0px 5px; padding: 0 5px;
overflow: hidden; overflow: hidden;
} }

3
test-track/frontend/src/business/module/TestCaseNodeTree.vue
View File

@ -21,6 +21,9 @@
@filter="filter" @filter="filter"
ref="nodeTree"> ref="nodeTree">
<template v-slot:header> <template v-slot:header>
<ms-search-bar
:show-operator="showOperator"
:condition="condition"/>
<module-public-button <module-public-button
v-if="showPublicBtn" v-if="showPublicBtn"
:condition="condition" :condition="condition"