diff --git a/backend/src/main/java/io/metersphere/track/service/TrackService.java b/backend/src/main/java/io/metersphere/track/service/TrackService.java index 36377ea65c..a2aae3ce11 100644 --- a/backend/src/main/java/io/metersphere/track/service/TrackService.java +++ b/backend/src/main/java/io/metersphere/track/service/TrackService.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) @@ -87,18 +86,10 @@ public class TrackService { public List getCaseMaintenanceBar(String projectId) { List funcMaintainer = extTestCaseMapper.countFuncMaintainer(projectId); List relevanceMaintainer = extTestCaseMapper.countRelevanceMaintainer(projectId); - List list = relevanceMaintainer.stream().map(TrackCountResult::getGroupField).collect(Collectors.toList()); List charts = new ArrayList<>(); for (TrackCountResult result : funcMaintainer) { String groupField = result.getGroupField(); - if (!list.contains(groupField)) { - // 创建了功能用例,但是未关联测试 - TrackCountResult trackCount = new TrackCountResult(); - trackCount.setCountNumber(0); - trackCount.setGroupField(groupField); - relevanceMaintainer.add(trackCount); - } ChartsData chartsData = new ChartsData(); chartsData.setxAxis(groupField); chartsData.setyAxis(BigDecimal.valueOf(result.getCountNumber())); diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue index 95a3ab2f8b..4548ab4f3a 100644 --- a/frontend/src/business/components/api/automation/ApiAutomation.vue +++ b/frontend/src/business/components/api/automation/ApiAutomation.vue @@ -133,6 +133,9 @@ }); } } + }, + selectNodeIds() { + this.activeName = "default"; } }, methods: { diff --git a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue index 60ef124715..13f043723f 100644 --- a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue +++ b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue @@ -244,6 +244,9 @@ }); }, list(data) { + if (data.protocol === "dubbo://") { + data.protocol = "DUBBO"; + } let url = "/api/module/list/" + getCurrentProjectID() + "/" + data.protocol; this.result = this.$get(url, response => { if (response.data != undefined && response.data != null) { diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue index 0e9f8d2806..cf5fa0edc0 100644 --- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue +++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue @@ -6,7 +6,7 @@
{{data.index}}
{{title}} - {{data.method}} + {{getMethod()}} @@ -125,6 +125,17 @@ //this.$set(this.data, 'active', !this.data.active); this.$emit('active'); }, + getMethod() { + if (this.data.protocol === "HTTP") { + return this.data.method; + } + else if (this.data.protocol === "dubbo://") { + return "DUBBO"; + } + else { + return this.data.protocol; + } + }, copyRow() { this.$emit('copy'); }, diff --git a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue index 3e81f770a1..d028acef6b 100644 --- a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue +++ b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue @@ -13,7 +13,7 @@ - + @@ -32,6 +32,7 @@ data() { return { allSamplers: ELEMENTS.get('AllSamplerProxy'), + currentProtocol: "HTTP", } }, methods: { @@ -63,7 +64,8 @@ } }); }, - saveAsApi(){ + saveAsApi() { + this.currentProtocol = this.data.protocol; this.$refs.api.open(this.data); } } diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue index dc13136a3c..6f7a3c3e0a 100644 --- a/frontend/src/business/components/api/definition/ApiDefinition.vue +++ b/frontend/src/business/components/api/definition/ApiDefinition.vue @@ -1,152 +1,152 @@