fix(场景报告): #1006152 #1006216 事物控制器展示问题,error状态鼠标悬停后提示气泡弹窗显示id

【【接口测试】事物控制器展示问题】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006152;【【接口测试-测试报告】error状态鼠标悬停后提示气泡弹窗显示id】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006216
This commit is contained in:
song-tianyang 2021-08-26 18:32:53 +08:00 committed by 刘瑞斌
parent 2515719c7a
commit 850084190b
7 changed files with 26 additions and 20 deletions

View File

@ -291,16 +291,16 @@ public abstract class MsTestElement {
protected String getParentName(MsTestElement parent) {
if (parent != null) {
if (MsTestElementConstants.TransactionController.name().equals(parent.getType())) {
MsTransactionController transactionController = (MsTransactionController) parent;
if (StringUtils.isNotEmpty(transactionController.getName())) {
return transactionController.getName();
} else if (StringUtils.isNotEmpty(transactionController.getLabelName())) {
return transactionController.getLabelName();
} else {
return "TransactionController";
}
}
// if (MsTestElementConstants.TransactionController.name().equals(parent.getType())) {
// MsTransactionController transactionController = (MsTransactionController) parent;
// if (StringUtils.isNotEmpty(transactionController.getName())) {
// return transactionController.getName();
// } else if (StringUtils.isNotEmpty(transactionController.getLabelName())) {
// return transactionController.getLabelName();
// } else {
// return "TransactionController";
// }
// }
// 获取全路径以备后面使用
String fullPath = getFullPath(parent, new String());
return fullPath + DelimiterConstants.SEPARATOR.toString() + parent.getName();

View File

@ -3,6 +3,7 @@ package io.metersphere.api.dto.definition.request.controller;
import com.alibaba.fastjson.annotation.JSONType;
import io.metersphere.api.dto.definition.request.MsTestElement;
import io.metersphere.api.dto.definition.request.ParameterConfig;
import io.metersphere.commons.constants.DelimiterConstants;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.collections.CollectionUtils;
@ -30,7 +31,14 @@ public class MsTransactionController extends MsTestElement {
if (!config.isOperating() && !this.isEnable()) {
return;
}
final HashTree groupTree = tree.add(transactionController());
TransactionController transactionController = transactionController();
String name = this.getParentName(this.getParent());
if (StringUtils.isNotEmpty(name) && !config.isOperating()) {
transactionController.setName(this.getName() + DelimiterConstants.SEPARATOR.toString() + name);
}
final HashTree groupTree = tree.add(transactionController);
if (CollectionUtils.isNotEmpty(hashTree)) {
hashTree.forEach(el -> {
// 给所有孩子加一个父亲标志

View File

@ -12,14 +12,9 @@
<el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
{{ row.status }}
</el-tag>
<el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
<template v-slot:content>
<div>{{row.description}}</div>
</template>
<el-tag size="mini" type="danger">
{{ row.status }}
</el-tag>
</el-tooltip>
<el-tag size="mini" type="danger" v-else-if="row.status === 'Error'">
{{ row.status }}
</el-tag>
<el-tag v-else size="mini" type="info">
{{ row.status }}
</el-tag>

View File

@ -1,5 +1,5 @@
<template>
<el-dialog class="testcase-import" :title="$t('test_track.case.import.case_import')" :visible.sync="dialogVisible"
<el-dialog class="testcase-import" :title="$t('test_track.case.import.case_export')" :visible.sync="dialogVisible"
@close="close">
<el-row class="import-row" style="margin-left: 34px">

View File

@ -1477,6 +1477,7 @@ export default {
import: {
import: "Import test case",
case_import: "Import test case",
case_export: "Export test case",
download_template: "Download template",
click_upload: "Upload",
upload_limit: "Only XLS/XLSX/XMIND files can be uploaded, and no more than 100M",

View File

@ -1487,6 +1487,7 @@ export default {
import: {
import: "导入用例",
case_import: "导入测试用例",
case_export: "导出测试用例",
download_template: "下载模版",
click_upload: "点击上传",
upload_limit: "只能上传xls/xlsx文件且不超过100M",

View File

@ -1487,6 +1487,7 @@ export default {
import: {
import: "導入用例",
case_import: "導入測試用例",
case_export: "導出測試用例",
download_template: "下載模版",
click_upload: "點擊上傳",
upload_limit: "只能上傳xls/xlsx文件且不超過100M",