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

fix(接口测试): 修复场景展开问题 

--bug=1011467 --user=赵勇 【接口测试】接口自动化编辑，有复制的场景时，批量展开功能不生效 https://www.tapd.cn/55049933/s/1121918
This commit is contained in:
fit2-zhao 2022-03-21 14:07:24 +08:00 committed by fit2-zhao
parent c3d44b4e7b
commit cad1d26c87
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/metersphere/api/service/MsHashTreeService.java
View File

@ -186,6 +186,7 @@ public class MsHashTreeService {
element.put(REST, refElement.get(REST));
element.put(PATH, refElement.get(PATH));
element.put(BODY, refElement.get(BODY));
element.put("active", false);
element.put(AUTH_MANAGER, refElement.get(AUTH_MANAGER));
element.put(ARGUMENTS, refElement.get(ARGUMENTS));
if (array != null) {

13
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -176,10 +176,10 @@
</span>
<!-- 批量操作 -->
<span :class="data.checkBox? 'custom-tree-node-hide' : 'custom-tree-node-col'" style="padding-left: 0px; padding-right: 0px;"
v-show="(data.hashTree && data.hashTree.length === 0 )|| data.isLeaf">
<show-more-btn :is-show="node.checked" :buttons="batchOperators" :size="selectDataCounts" v-show="data.checkBox" style="margin-right: 3px"/>
v-show="(data.hashTree && data.hashTree.length === 0 )|| data.isLeaf">
<show-more-btn :is-show="node.checked" :buttons="batchOperators" :size="selectDataCounts" v-show="data.checkBox" style="margin-right: 10px"/>
</span>
<span style="width: calc(100% - 40px);">
<span style="width: calc(100% - 30px);">
<!-- 步骤组件-->
<ms-component-config
:scenario-definition="scenarioDefinition"
@ -1736,9 +1736,6 @@ export default {
if (nodes[i] && !(nodes[i].type === 'scenario' && nodes[i].referenced === 'REF')) {
if (resourceIds.indexOf(nodes[i].resourceId) !== -1) {
nodes[i].active = this.expandedStatus;
if (this.stepSize > 35 && this.expandedStatus) {
nodes[i].active = false;
}
}
if (nodes[i].hashTree != undefined && nodes[i].hashTree.length > 0) {
this.changeNodeStatus(nodes[i].hashTree);
@ -2071,14 +2068,14 @@ export default {
}
.custom-tree-node-col {
width: 20px;
width: 25px;
padding: 0px;
margin-left: 5px;
vertical-align: center;
}
.custom-tree-node-hide {
width: 5px;
width: 15px;
padding: 0px;
vertical-align: center;
}