From c96ae8caf2814de8054963935d3e49284cc1761b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 17 May 2021 15:18:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=BB=E6=8E=89=E6=9A=AB=E6=9C=AA?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=84=E6=8C=89=E9=88=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/constants/APITestStatus.java | 5 -- .../commons/constants/ApiImportPlatform.java | 5 -- .../commons/constants/ApiRunMode.java | 5 -- .../commons/constants/LoopConstants.java | 5 -- .../commons/constants/MsRequestBodyType.java | 17 ------- .../constants/MsTestElementConstants.java | 5 -- .../constants/PerformanceTestStatus.java | 5 -- .../constants/PostmanRequestBodyMode.java | 16 ------- .../commons/constants/TestCaseConstants.java | 48 ------------------- .../constants/TestCaseReviewStatus.java | 5 -- .../constants/TestPlanReportStatus.java | 5 -- .../constants/TestPlanTestCaseStatus.java | 5 -- .../constants/TestReviewCaseStatus.java | 5 -- frontend/src/components/RightPanel/index.vue | 6 +-- frontend/src/layout/components/Topbar.vue | 25 ++++------ 15 files changed, 13 insertions(+), 149 deletions(-) delete mode 100644 backend/src/main/java/io/dataease/commons/constants/APITestStatus.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/ApiImportPlatform.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/ApiRunMode.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/LoopConstants.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/MsRequestBodyType.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/MsTestElementConstants.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/PerformanceTestStatus.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/PostmanRequestBodyMode.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/TestCaseConstants.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/TestCaseReviewStatus.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/TestPlanReportStatus.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/TestPlanTestCaseStatus.java delete mode 100644 backend/src/main/java/io/dataease/commons/constants/TestReviewCaseStatus.java diff --git a/backend/src/main/java/io/dataease/commons/constants/APITestStatus.java b/backend/src/main/java/io/dataease/commons/constants/APITestStatus.java deleted file mode 100644 index d424907078..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/APITestStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum APITestStatus { - Saved, Starting, Running, Reporting, Completed, Debug, Error, Success,Underway -} diff --git a/backend/src/main/java/io/dataease/commons/constants/ApiImportPlatform.java b/backend/src/main/java/io/dataease/commons/constants/ApiImportPlatform.java deleted file mode 100644 index c7d532c016..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/ApiImportPlatform.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum ApiImportPlatform { - Metersphere, Postman, Swagger2, Plugin -} diff --git a/backend/src/main/java/io/dataease/commons/constants/ApiRunMode.java b/backend/src/main/java/io/dataease/commons/constants/ApiRunMode.java deleted file mode 100644 index 6d18a029a6..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/ApiRunMode.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum ApiRunMode { - RUN, DEBUG, DEFINITION, SCENARIO, API_PLAN, JENKINS_API_PLAN, JENKINS, SCENARIO_PLAN, API, SCHEDULE_API_PLAN, SCHEDULE_SCENARIO_PLAN, SCHEDULE_PERFORMANCE_TEST -} diff --git a/backend/src/main/java/io/dataease/commons/constants/LoopConstants.java b/backend/src/main/java/io/dataease/commons/constants/LoopConstants.java deleted file mode 100644 index 72897f0acc..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/LoopConstants.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum LoopConstants { - LOOP_COUNT, WHILE, FOREACH -} diff --git a/backend/src/main/java/io/dataease/commons/constants/MsRequestBodyType.java b/backend/src/main/java/io/dataease/commons/constants/MsRequestBodyType.java deleted file mode 100644 index e3ba37cc42..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/MsRequestBodyType.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.dataease.commons.constants; - -public enum MsRequestBodyType { - - - KV("KeyValue"), FORM_DATA("Form Data"), RAW("Raw"); - - private String value; - - MsRequestBodyType(String value) { - this.value = value; - } - - public String value() { - return this.value; - } -} diff --git a/backend/src/main/java/io/dataease/commons/constants/MsTestElementConstants.java b/backend/src/main/java/io/dataease/commons/constants/MsTestElementConstants.java deleted file mode 100644 index 14ee381e99..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/MsTestElementConstants.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum MsTestElementConstants { - LoopController,SCENARIO,REF -} diff --git a/backend/src/main/java/io/dataease/commons/constants/PerformanceTestStatus.java b/backend/src/main/java/io/dataease/commons/constants/PerformanceTestStatus.java deleted file mode 100644 index c74e6ab7cb..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/PerformanceTestStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum PerformanceTestStatus { - Saved, Starting, Running, Reporting, Completed, Error -} diff --git a/backend/src/main/java/io/dataease/commons/constants/PostmanRequestBodyMode.java b/backend/src/main/java/io/dataease/commons/constants/PostmanRequestBodyMode.java deleted file mode 100644 index a729cfcd06..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/PostmanRequestBodyMode.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.dataease.commons.constants; - -public enum PostmanRequestBodyMode { - - RAW("raw"), FORM_DATA("formdata"), URLENCODED("urlencoded"), FILE("file"); - - private String value; - - PostmanRequestBodyMode(String value) { - this.value = value; - } - - public String value() { - return this.value; - } -} diff --git a/backend/src/main/java/io/dataease/commons/constants/TestCaseConstants.java b/backend/src/main/java/io/dataease/commons/constants/TestCaseConstants.java deleted file mode 100644 index 8fce6327af..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/TestCaseConstants.java +++ /dev/null @@ -1,48 +0,0 @@ -package io.dataease.commons.constants; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -public class TestCaseConstants { - - public static final int MAX_NODE_DEPTH = 8; - - public enum Type { - Functional("functional"), Performance("performance"), Aapi("api"); - - private String value; - - Type(String value) { - this.value = value; - } - - public String getValue() { - return this.value; - } - - public static List getValues() { - List types = Arrays.asList(Type.values()); - return types.stream().map(Type::getValue).collect(Collectors.toList()); - } - } - - public enum Method { - Manual("manual"), Auto("auto"); - - private String value; - - Method(String value) { - this.value = value; - } - - public String getValue() { - return this.value; - } - - public static List getValues() { - List types = Arrays.asList(Method.values()); - return types.stream().map(Method::getValue).collect(Collectors.toList()); - } - } -} diff --git a/backend/src/main/java/io/dataease/commons/constants/TestCaseReviewStatus.java b/backend/src/main/java/io/dataease/commons/constants/TestCaseReviewStatus.java deleted file mode 100644 index 85355808ce..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/TestCaseReviewStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum TestCaseReviewStatus { - Prepare, Underway, Completed -} diff --git a/backend/src/main/java/io/dataease/commons/constants/TestPlanReportStatus.java b/backend/src/main/java/io/dataease/commons/constants/TestPlanReportStatus.java deleted file mode 100644 index 2531c3bb12..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/TestPlanReportStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum TestPlanReportStatus { - RUNNING, COMPLETED, SUCCESS, FAILED -} diff --git a/backend/src/main/java/io/dataease/commons/constants/TestPlanTestCaseStatus.java b/backend/src/main/java/io/dataease/commons/constants/TestPlanTestCaseStatus.java deleted file mode 100644 index a0801dc9cc..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/TestPlanTestCaseStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum TestPlanTestCaseStatus { - Prepare, Pass, Failure, Blocking, Skip, Underway -} diff --git a/backend/src/main/java/io/dataease/commons/constants/TestReviewCaseStatus.java b/backend/src/main/java/io/dataease/commons/constants/TestReviewCaseStatus.java deleted file mode 100644 index 83e7373001..0000000000 --- a/backend/src/main/java/io/dataease/commons/constants/TestReviewCaseStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.commons.constants; - -public enum TestReviewCaseStatus { - Prepare, Pass, UnPass -} diff --git a/frontend/src/components/RightPanel/index.vue b/frontend/src/components/RightPanel/index.vue index ab863836f5..79b23bba81 100644 --- a/frontend/src/components/RightPanel/index.vue +++ b/frontend/src/components/RightPanel/index.vue @@ -2,9 +2,9 @@
-
- -
+ + +
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index 07ea10fd2b..ffe536ed24 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -23,13 +23,13 @@