diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/CountController.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/CountController.java index 808b67cc9e..c55db9540d 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/CountController.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/CountController.java @@ -7,4 +7,6 @@ public class CountController { private int loops; private int interval; private boolean proceed; + private Object requestResult; + } diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/MsForEachController.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/MsForEachController.java index 30a4a59e7f..8e97a204f2 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/MsForEachController.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/MsForEachController.java @@ -7,4 +7,6 @@ public class MsForEachController { private String inputVal; private String returnVal; private String interval; + private Object requestResult; + } diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/MsWhileController.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/MsWhileController.java index 7781abbb0b..4ed9a8cc67 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/MsWhileController.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/loop/MsWhileController.java @@ -8,4 +8,5 @@ public class MsWhileController { private String operator; private String value; private int timeout; + private Object requestResult; } diff --git a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue index c6cd8c15d7..13aaa79791 100644 --- a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue +++ b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue @@ -110,7 +110,6 @@ if (this.isNotRunning) { try { this.content = JSON.parse(this.report.content); - console.log(this.content) if (!this.content) { this.content = {scenarios: []}; } 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 9b0a3f362a..45b2211e7c 100644 --- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue +++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue @@ -24,6 +24,7 @@
+ diff --git a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue index a8d5fb7e07..bccb5c6766 100644 --- a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue +++ b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue @@ -7,7 +7,7 @@ :draggable="true" color="#02A7F0" background-color="#F4F4F5" - :title="$t('api_test.automation.loop_controller')"> + :title="$t('api_test.automation.loop_controller')" v-loading="loading"> + + +
@@ -69,17 +78,34 @@ ms
+

{{$t('api_test.definition.request.res_param')}}

+ + +
+ +
+
+
+ + + @@ -180,6 +322,14 @@ font-weight: normal; } + .tip { + padding: 3px 5px; + font-size: 16px; + border-radius: 4px; + border-left: 4px solid #783887; + margin: 20px 0; + } + .icon.is-active { transform: rotate(90deg); } diff --git a/frontend/src/business/components/api/definition/components/response/RequestMetric.vue b/frontend/src/business/components/api/definition/components/response/RequestMetric.vue index 660da3ecae..3d7f5af105 100644 --- a/frontend/src/business/components/api/definition/components/response/RequestMetric.vue +++ b/frontend/src/business/components/api/definition/components/response/RequestMetric.vue @@ -1,6 +1,10 @@