From 5d00e2996ffb66de55f700f9b3724447acbe61ed Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Fri, 9 Aug 2024 18:45:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?= =?UTF-8?q?=20=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=88=AB=E6=98=BE=E7=A4=BA=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E7=9A=84=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/TestPlanCaseExecHistoryResponse.java | 2 +- .../plan/service/TestPlanFunctionalCaseService.java | 2 +- frontend/src/models/testPlan/testPlan.ts | 2 +- .../detail/featureCase/detail/executionHistory/index.vue | 8 ++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanCaseExecHistoryResponse.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanCaseExecHistoryResponse.java index 7c44516d4d..b74e4abb18 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanCaseExecHistoryResponse.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanCaseExecHistoryResponse.java @@ -26,5 +26,5 @@ public class TestPlanCaseExecHistoryResponse extends TestPlanCaseExecuteHistory private String email; @Schema(description = "步骤描述") - private boolean isStep = false; + private boolean stepModule = false; } diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java index 063caa6f8c..12f06725a2 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java @@ -705,7 +705,7 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService { item.setContentText(new String(item.getContent(), StandardCharsets.UTF_8)); } if (item.getSteps() != null) { - item.setStep(true); + item.setStepModule(true); item.setStepsExecResult(new String(item.getSteps(), StandardCharsets.UTF_8)); } }); diff --git a/frontend/src/models/testPlan/testPlan.ts b/frontend/src/models/testPlan/testPlan.ts index b6ab526c86..9aafd8fde4 100644 --- a/frontend/src/models/testPlan/testPlan.ts +++ b/frontend/src/models/testPlan/testPlan.ts @@ -268,7 +268,7 @@ export interface ExecuteHistoryItem { steps: string; createTime: string; deleted: boolean; - isStep: boolean; // 类型是:步骤描述 + stepModule: boolean; // 类型是:步骤描述 } export interface moduleForm { diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue index 9a07221ec3..4ffa56daa9 100644 --- a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue +++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue @@ -8,9 +8,13 @@
{{ item.userName }}
- +