From c57a6f078c7d0171cfd4c44d7ebe503822d611bc Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Tue, 16 Aug 2022 14:40:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2=E9=81=97=E7=95=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/base/domain/TestCase.java | 2 - .../base/domain/TestCaseExample.java | 70 ------ .../io/metersphere/base/domain/TestPlan.java | 4 - .../base/domain/TestPlanExample.java | 140 ----------- .../base/mapper/TestCaseMapper.xml | 59 ++--- .../base/mapper/TestPlanMapper.xml | 67 ++--- .../base/mapper/ext/ExtTestCaseMapper.xml | 9 +- .../log/vo/track/TestCaseReference.java | 3 +- .../db/migration/V129__2.1.0__release.sql | 6 + .../track/TestCaseNotification.vue | 4 - .../components/track/case/TestCase.vue | 6 - .../track/case/components/TestCaseDetail.vue | 234 ------------------ .../track/case/components/TestCaseEdit.vue | 1 - .../track/case/components/TestCaseList.vue | 5 - frontend/src/i18n/en-US.js | 1 - frontend/src/i18n/zh-CN.js | 1 - frontend/src/i18n/zh-TW.js | 1 - 17 files changed, 46 insertions(+), 567 deletions(-) delete mode 100644 frontend/src/business/components/track/case/components/TestCaseDetail.vue diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCase.java b/backend/src/main/java/io/metersphere/base/domain/TestCase.java index 11f7e7ed3e..5042437781 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCase.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCase.java @@ -33,8 +33,6 @@ public class TestCase implements Serializable { private Integer num; - private String otherTestName; - private String reviewStatus; private String tags; diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java index 1df2aa5861..bfcfdfa448 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java @@ -1044,76 +1044,6 @@ public class TestCaseExample { return (Criteria) this; } - public Criteria andOtherTestNameIsNull() { - addCriterion("other_test_name is null"); - return (Criteria) this; - } - - public Criteria andOtherTestNameIsNotNull() { - addCriterion("other_test_name is not null"); - return (Criteria) this; - } - - public Criteria andOtherTestNameEqualTo(String value) { - addCriterion("other_test_name =", value, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameNotEqualTo(String value) { - addCriterion("other_test_name <>", value, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameGreaterThan(String value) { - addCriterion("other_test_name >", value, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameGreaterThanOrEqualTo(String value) { - addCriterion("other_test_name >=", value, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameLessThan(String value) { - addCriterion("other_test_name <", value, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameLessThanOrEqualTo(String value) { - addCriterion("other_test_name <=", value, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameLike(String value) { - addCriterion("other_test_name like", value, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameNotLike(String value) { - addCriterion("other_test_name not like", value, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameIn(List values) { - addCriterion("other_test_name in", values, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameNotIn(List values) { - addCriterion("other_test_name not in", values, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameBetween(String value1, String value2) { - addCriterion("other_test_name between", value1, value2, "otherTestName"); - return (Criteria) this; - } - - public Criteria andOtherTestNameNotBetween(String value1, String value2) { - addCriterion("other_test_name not between", value1, value2, "otherTestName"); - return (Criteria) this; - } - public Criteria andReviewStatusIsNull() { addCriterion("review_status is null"); return (Criteria) this; diff --git a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java index 53713dad52..78317b5a3f 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java @@ -19,10 +19,6 @@ public class TestPlan implements Serializable { private String stage; - private String testCaseMatchRule; - - private String executorMatchRule; - private Long createTime; private Long updateTime; diff --git a/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java b/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java index d7c3597c65..85cbda9d95 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java @@ -594,146 +594,6 @@ public class TestPlanExample { return (Criteria) this; } - public Criteria andTestCaseMatchRuleIsNull() { - addCriterion("test_case_match_rule is null"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleIsNotNull() { - addCriterion("test_case_match_rule is not null"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleEqualTo(String value) { - addCriterion("test_case_match_rule =", value, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleNotEqualTo(String value) { - addCriterion("test_case_match_rule <>", value, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleGreaterThan(String value) { - addCriterion("test_case_match_rule >", value, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleGreaterThanOrEqualTo(String value) { - addCriterion("test_case_match_rule >=", value, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleLessThan(String value) { - addCriterion("test_case_match_rule <", value, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleLessThanOrEqualTo(String value) { - addCriterion("test_case_match_rule <=", value, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleLike(String value) { - addCriterion("test_case_match_rule like", value, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleNotLike(String value) { - addCriterion("test_case_match_rule not like", value, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleIn(List values) { - addCriterion("test_case_match_rule in", values, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleNotIn(List values) { - addCriterion("test_case_match_rule not in", values, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleBetween(String value1, String value2) { - addCriterion("test_case_match_rule between", value1, value2, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andTestCaseMatchRuleNotBetween(String value1, String value2) { - addCriterion("test_case_match_rule not between", value1, value2, "testCaseMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleIsNull() { - addCriterion("executor_match_rule is null"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleIsNotNull() { - addCriterion("executor_match_rule is not null"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleEqualTo(String value) { - addCriterion("executor_match_rule =", value, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleNotEqualTo(String value) { - addCriterion("executor_match_rule <>", value, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleGreaterThan(String value) { - addCriterion("executor_match_rule >", value, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleGreaterThanOrEqualTo(String value) { - addCriterion("executor_match_rule >=", value, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleLessThan(String value) { - addCriterion("executor_match_rule <", value, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleLessThanOrEqualTo(String value) { - addCriterion("executor_match_rule <=", value, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleLike(String value) { - addCriterion("executor_match_rule like", value, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleNotLike(String value) { - addCriterion("executor_match_rule not like", value, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleIn(List values) { - addCriterion("executor_match_rule in", values, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleNotIn(List values) { - addCriterion("executor_match_rule not in", values, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleBetween(String value1, String value2) { - addCriterion("executor_match_rule between", value1, value2, "executorMatchRule"); - return (Criteria) this; - } - - public Criteria andExecutorMatchRuleNotBetween(String value1, String value2) { - addCriterion("executor_match_rule not between", value1, value2, "executorMatchRule"); - return (Criteria) this; - } - public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml index 8e47636977..4494e9e4f6 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml @@ -16,7 +16,6 @@ - @@ -103,9 +102,9 @@ id, node_id, test_id, node_path, project_id, `name`, `type`, maintainer, priority, - `method`, create_time, update_time, sort, num, other_test_name, review_status, tags, - demand_id, demand_name, `status`, step_model, custom_num, create_user, original_status, - delete_time, delete_user_id, `order`, case_public, version_id, ref_id, latest, last_execute_result + `method`, create_time, update_time, sort, num, review_status, tags, demand_id, demand_name, + `status`, step_model, custom_num, create_user, original_status, delete_time, delete_user_id, + `order`, case_public, version_id, ref_id, latest, last_execute_result prerequisite, remark, steps, step_description, expected_result, custom_fields @@ -163,28 +162,28 @@ node_path, project_id, `name`, `type`, maintainer, priority, `method`, create_time, update_time, - sort, num, other_test_name, - review_status, tags, demand_id, - demand_name, `status`, step_model, - custom_num, create_user, original_status, - delete_time, delete_user_id, `order`, - case_public, version_id, ref_id, - latest, last_execute_result, prerequisite, - remark, steps, step_description, - expected_result, custom_fields) + sort, num, review_status, + tags, demand_id, demand_name, + `status`, step_model, custom_num, + create_user, original_status, delete_time, + delete_user_id, `order`, case_public, + version_id, ref_id, latest, + last_execute_result, prerequisite, remark, + steps, step_description, expected_result, + custom_fields) values (#{id,jdbcType=VARCHAR}, #{nodeId,jdbcType=VARCHAR}, #{testId,jdbcType=VARCHAR}, #{nodePath,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{maintainer,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, - #{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, #{otherTestName,jdbcType=VARCHAR}, - #{reviewStatus,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, #{demandId,jdbcType=VARCHAR}, - #{demandName,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{stepModel,jdbcType=VARCHAR}, - #{customNum,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR}, - #{deleteTime,jdbcType=BIGINT}, #{deleteUserId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT}, - #{casePublic,jdbcType=BIT}, #{versionId,jdbcType=VARCHAR}, #{refId,jdbcType=VARCHAR}, - #{latest,jdbcType=BIT}, #{lastExecuteResult,jdbcType=VARCHAR}, #{prerequisite,jdbcType=LONGVARCHAR}, - #{remark,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR}, #{stepDescription,jdbcType=LONGVARCHAR}, - #{expectedResult,jdbcType=LONGVARCHAR}, #{customFields,jdbcType=LONGVARCHAR}) + #{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, #{reviewStatus,jdbcType=VARCHAR}, + #{tags,jdbcType=VARCHAR}, #{demandId,jdbcType=VARCHAR}, #{demandName,jdbcType=VARCHAR}, + #{status,jdbcType=VARCHAR}, #{stepModel,jdbcType=VARCHAR}, #{customNum,jdbcType=VARCHAR}, + #{createUser,jdbcType=VARCHAR}, #{originalStatus,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT}, + #{deleteUserId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT}, #{casePublic,jdbcType=BIT}, + #{versionId,jdbcType=VARCHAR}, #{refId,jdbcType=VARCHAR}, #{latest,jdbcType=BIT}, + #{lastExecuteResult,jdbcType=VARCHAR}, #{prerequisite,jdbcType=LONGVARCHAR}, #{remark,jdbcType=LONGVARCHAR}, + #{steps,jdbcType=LONGVARCHAR}, #{stepDescription,jdbcType=LONGVARCHAR}, #{expectedResult,jdbcType=LONGVARCHAR}, + #{customFields,jdbcType=LONGVARCHAR}) insert into test_case @@ -231,9 +230,6 @@ num, - - other_test_name, - review_status, @@ -347,9 +343,6 @@ #{num,jdbcType=INTEGER}, - - #{otherTestName,jdbcType=VARCHAR}, - #{reviewStatus,jdbcType=VARCHAR}, @@ -472,9 +465,6 @@ num = #{record.num,jdbcType=INTEGER}, - - other_test_name = #{record.otherTestName,jdbcType=VARCHAR}, - review_status = #{record.reviewStatus,jdbcType=VARCHAR}, @@ -565,7 +555,6 @@ update_time = #{record.updateTime,jdbcType=BIGINT}, sort = #{record.sort,jdbcType=INTEGER}, num = #{record.num,jdbcType=INTEGER}, - other_test_name = #{record.otherTestName,jdbcType=VARCHAR}, review_status = #{record.reviewStatus,jdbcType=VARCHAR}, tags = #{record.tags,jdbcType=VARCHAR}, demand_id = #{record.demandId,jdbcType=VARCHAR}, @@ -609,7 +598,6 @@ update_time = #{record.updateTime,jdbcType=BIGINT}, sort = #{record.sort,jdbcType=INTEGER}, num = #{record.num,jdbcType=INTEGER}, - other_test_name = #{record.otherTestName,jdbcType=VARCHAR}, review_status = #{record.reviewStatus,jdbcType=VARCHAR}, tags = #{record.tags,jdbcType=VARCHAR}, demand_id = #{record.demandId,jdbcType=VARCHAR}, @@ -673,9 +661,6 @@ num = #{num,jdbcType=INTEGER}, - - other_test_name = #{otherTestName,jdbcType=VARCHAR}, - review_status = #{reviewStatus,jdbcType=VARCHAR}, @@ -763,7 +748,6 @@ update_time = #{updateTime,jdbcType=BIGINT}, sort = #{sort,jdbcType=INTEGER}, num = #{num,jdbcType=INTEGER}, - other_test_name = #{otherTestName,jdbcType=VARCHAR}, review_status = #{reviewStatus,jdbcType=VARCHAR}, tags = #{tags,jdbcType=VARCHAR}, demand_id = #{demandId,jdbcType=VARCHAR}, @@ -804,7 +788,6 @@ update_time = #{updateTime,jdbcType=BIGINT}, sort = #{sort,jdbcType=INTEGER}, num = #{num,jdbcType=INTEGER}, - other_test_name = #{otherTestName,jdbcType=VARCHAR}, review_status = #{reviewStatus,jdbcType=VARCHAR}, tags = #{tags,jdbcType=VARCHAR}, demand_id = #{demandId,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml index 5bf29b7cc7..39f76fbfa5 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml @@ -9,8 +9,6 @@ - - @@ -88,10 +86,9 @@ - id, workspace_id, report_id, `name`, description, `status`, stage, test_case_match_rule, - executor_match_rule, create_time, update_time, planned_start_time, planned_end_time, - actual_start_time, actual_end_time, creator, project_id, execution_times, automatic_status_update, - repeat_case + id, workspace_id, report_id, `name`, description, `status`, stage, create_time, update_time, + planned_start_time, planned_end_time, actual_start_time, actual_end_time, creator, + project_id, execution_times, automatic_status_update, repeat_case tags, report_summary, report_config, run_mode_config @@ -147,22 +144,20 @@ insert into test_plan (id, workspace_id, report_id, `name`, description, `status`, - stage, test_case_match_rule, executor_match_rule, - create_time, update_time, planned_start_time, - planned_end_time, actual_start_time, actual_end_time, - creator, project_id, execution_times, - automatic_status_update, repeat_case, tags, - report_summary, report_config, run_mode_config - ) + stage, create_time, update_time, + planned_start_time, planned_end_time, actual_start_time, + actual_end_time, creator, project_id, + execution_times, automatic_status_update, repeat_case, + tags, report_summary, report_config, + run_mode_config) values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, - #{stage,jdbcType=VARCHAR}, #{testCaseMatchRule,jdbcType=VARCHAR}, #{executorMatchRule,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{plannedStartTime,jdbcType=BIGINT}, - #{plannedEndTime,jdbcType=BIGINT}, #{actualStartTime,jdbcType=BIGINT}, #{actualEndTime,jdbcType=BIGINT}, - #{creator,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{executionTimes,jdbcType=INTEGER}, - #{automaticStatusUpdate,jdbcType=BIT}, #{repeatCase,jdbcType=BIT}, #{tags,jdbcType=LONGVARCHAR}, - #{reportSummary,jdbcType=LONGVARCHAR}, #{reportConfig,jdbcType=LONGVARCHAR}, #{runModeConfig,jdbcType=LONGVARCHAR} - ) + #{stage,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, + #{plannedStartTime,jdbcType=BIGINT}, #{plannedEndTime,jdbcType=BIGINT}, #{actualStartTime,jdbcType=BIGINT}, + #{actualEndTime,jdbcType=BIGINT}, #{creator,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, + #{executionTimes,jdbcType=INTEGER}, #{automaticStatusUpdate,jdbcType=BIT}, #{repeatCase,jdbcType=BIT}, + #{tags,jdbcType=LONGVARCHAR}, #{reportSummary,jdbcType=LONGVARCHAR}, #{reportConfig,jdbcType=LONGVARCHAR}, + #{runModeConfig,jdbcType=LONGVARCHAR}) insert into test_plan @@ -188,12 +183,6 @@ stage, - - test_case_match_rule, - - - executor_match_rule, - create_time, @@ -262,12 +251,6 @@ #{stage,jdbcType=VARCHAR}, - - #{testCaseMatchRule,jdbcType=VARCHAR}, - - - #{executorMatchRule,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}, @@ -345,12 +328,6 @@ stage = #{record.stage,jdbcType=VARCHAR}, - - test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR}, - - - executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, @@ -410,8 +387,6 @@ description = #{record.description,jdbcType=VARCHAR}, `status` = #{record.status,jdbcType=VARCHAR}, stage = #{record.stage,jdbcType=VARCHAR}, - test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR}, - executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT}, @@ -440,8 +415,6 @@ description = #{record.description,jdbcType=VARCHAR}, `status` = #{record.status,jdbcType=VARCHAR}, stage = #{record.stage,jdbcType=VARCHAR}, - test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR}, - executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT}, @@ -478,12 +451,6 @@ stage = #{stage,jdbcType=VARCHAR}, - - test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR}, - - - executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, @@ -540,8 +507,6 @@ description = #{description,jdbcType=VARCHAR}, `status` = #{status,jdbcType=VARCHAR}, stage = #{stage,jdbcType=VARCHAR}, - test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR}, - executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, planned_start_time = #{plannedStartTime,jdbcType=BIGINT}, @@ -567,8 +532,6 @@ description = #{description,jdbcType=VARCHAR}, `status` = #{status,jdbcType=VARCHAR}, stage = #{stage,jdbcType=VARCHAR}, - test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR}, - executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, planned_start_time = #{plannedStartTime,jdbcType=BIGINT}, diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml index 2305dfe771..89ee022465 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml @@ -262,7 +262,7 @@ test_case.id, test_case.node_id, test_case.node_path, test_case.project_id, test_case.`name`, test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`, test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num, - test_case.other_test_name, test_case.review_status, test_case.tags, + test_case.review_status, test_case.tags, test_case.demand_id, test_case.demand_name, test_case.`status`, test_case.custom_num, test_case.step_model, test_case.create_user, test_case.ref_id @@ -286,7 +286,7 @@ test_case.version_id, test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`, test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num, - test_case.other_test_name, test_case.review_status, test_case.tags, + test_case.review_status, test_case.tags, test_case.demand_id, test_case.demand_name, test_case.`status`, test_case.custom_num, test_case.step_model, test_case.create_user, test_case.custom_fields,test_case.case_public , @@ -425,7 +425,7 @@ test_case.id, test_case.node_id, test_case.node_path, test_case.project_id, test_case.`name`, test_case.`type`, test_case.maintainer, test_case.priority, test_case.`method`, test_case.create_time, test_case.update_time, test_case.test_id, test_case.sort, test_case.num, - test_case.other_test_name, test_case.review_status, test_case.tags, + test_case.review_status, test_case.tags, test_case.demand_id, test_case.demand_name, test_case.`status`, test_case.custom_num, test_case.step_model, test_case.create_user, test_case.custom_fields,test_case.case_public,test_case.ref_id ,test_case.`order` @@ -1264,9 +1264,6 @@ num = #{record.num,jdbcType=INTEGER}, - - other_test_name = #{record.otherTestName,jdbcType=VARCHAR}, - review_status = #{record.reviewStatus,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/metersphere/log/vo/track/TestCaseReference.java b/backend/src/main/java/io/metersphere/log/vo/track/TestCaseReference.java index c1f4d55fbf..b3fe34c19c 100644 --- a/backend/src/main/java/io/metersphere/log/vo/track/TestCaseReference.java +++ b/backend/src/main/java/io/metersphere/log/vo/track/TestCaseReference.java @@ -19,7 +19,6 @@ public class TestCaseReference { testCaseColumns.put("remark", "备注"); testCaseColumns.put("customNum", "ID"); testCaseColumns.put("steps", "用例步骤"); - testCaseColumns.put("other_test_name", "其他名称"); testCaseColumns.put("review_status", "评审状态"); testCaseColumns.put("tags", "标签"); testCaseColumns.put("demand_name", "需求名称"); @@ -33,4 +32,4 @@ public class TestCaseReference { testCaseColumns.put("ms-dff-col", "tags,steps"); } -} \ No newline at end of file +} diff --git a/backend/src/main/resources/db/migration/V129__2.1.0__release.sql b/backend/src/main/resources/db/migration/V129__2.1.0__release.sql index 2b587e9e1e..9e56b953b3 100644 --- a/backend/src/main/resources/db/migration/V129__2.1.0__release.sql +++ b/backend/src/main/resources/db/migration/V129__2.1.0__release.sql @@ -62,3 +62,9 @@ ALTER TABLE `api_scenario_report` ADD INDEX index_relevance_test_plan_report_id (`relevance_test_plan_report_id`); ALTER TABLE `load_test_report` ADD INDEX index_relevance_test_plan_report_id (`relevance_test_plan_report_id`); + +-- V129__2-1-0_drop_useless_column +-- +ALTER TABLE test_case DROP COLUMN other_test_name; +ALTER TABLE test_plan DROP COLUMN test_case_match_rule; +ALTER TABLE test_plan DROP COLUMN executor_match_rule; diff --git a/frontend/src/business/components/project/notification/track/TestCaseNotification.vue b/frontend/src/business/components/project/notification/track/TestCaseNotification.vue index fc12b34e8c..a4ea271bda 100644 --- a/frontend/src/business/components/project/notification/track/TestCaseNotification.vue +++ b/frontend/src/business/components/project/notification/track/TestCaseNotification.vue @@ -130,10 +130,6 @@ export default { label:this.$t('test_track.case.number'), value:'num', }, - { - label:this.$t('test_track.other_test_name'), - value:'otherTestName', - }, { label:this.$t('test_track.review.review_status'), value:'reviewStatus', diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue index faf0983be2..390afb3a22 100644 --- a/frontend/src/business/components/track/case/TestCase.vue +++ b/frontend/src/business/components/track/case/TestCase.vue @@ -53,7 +53,6 @@ :version-enable="versionEnable" @testCaseEdit="editTestCase" @testCaseCopy="copyTestCase" - @testCaseDetail="showTestCaseDetail" @getTrashList="getTrashList" @getPublicList="getPublicList" @refresh="refreshTrashNode" @@ -77,7 +76,6 @@ @testCaseEdit="editTestCase" @testCaseEditShow="editTestCaseShow" @testCaseCopy="copyTestCase" - @testCaseDetail="showTestCaseDetail" @getTrashList="getTrashList" @getPublicList="getPublicList" @refresh="refresh" @@ -112,7 +110,6 @@ @refreshTable="refresh" @testCaseEdit="editTestCase" @testCaseCopy="copyTestCase" - @testCaseDetail="showTestCaseDetail" @getTrashList="getTrashList" @getPublicList="getPublicList" @refresh="refresh" @@ -689,9 +686,6 @@ export default { testCase.isCopy = true; this.addTab({name: 'edit', testCaseInfo: testCase}); }, - showTestCaseDetail(testCase) { - this.testCaseReadOnly = true; - }, refresh(data) { if (this.selectNodeIds && this.selectNodeIds.length > 0) { this.$store.commit('setTestCaseSelectNode', {}); diff --git a/frontend/src/business/components/track/case/components/TestCaseDetail.vue b/frontend/src/business/components/track/case/components/TestCaseDetail.vue deleted file mode 100644 index e98a78a015..0000000000 --- a/frontend/src/business/components/track/case/components/TestCaseDetail.vue +++ /dev/null @@ -1,234 +0,0 @@ - - - - - diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index d36dfdb894..b7712fe45f 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -235,7 +235,6 @@ export default { method: '', prerequisite: '', testId: '', - otherTestName: '', steps: [{ num: 1, desc: '', diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue index bac2be4610..5a1bbef26e 100644 --- a/frontend/src/business/components/track/case/components/TestCaseList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseList.vue @@ -236,7 +236,6 @@ import {TEST_CASE_CONFIGS} from "../../../common/components/search/search-compon import BatchEdit from "./BatchEdit"; import {TEST_CASE_LIST} from "@/common/js/constants"; import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem"; -import TestCaseDetail from "./TestCaseDetail"; import ReviewStatus from "@/business/components/track/case/components/ReviewStatus"; import MsTag from "@/business/components/common/components/MsTag"; import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus.vue"; @@ -317,7 +316,6 @@ export default { MsTableHeader, BatchEdit, StatusTableItem, - TestCaseDetail, ReviewStatus, MsTag, ApiStatus, "relationshipGraphDrawer": relationshipGraphDrawer.default, @@ -1011,9 +1009,6 @@ export default { this.$refs.table.clear(); this.$emit('refreshAll'); }, - showDetail(row, event, column) { - this.$emit('testCaseDetail', row); - }, importTestCase() { if (!this.projectId) { this.$warning(this.$t('commons.check_project_tip')); diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index d6f52be484..f8ff9307cd 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -2079,7 +2079,6 @@ export default { ui_scenario_test_case: "UI Scenario Case", report_statistics: "Report Statistics", sort: 'Sort', - other_test_name: 'Other Test Name', demand: { id: 'Demand ID', name: 'Demand Name', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index e6fb4c22bf..8ae0d9730f 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -2087,7 +2087,6 @@ export default { ui_scenario_test_case: "UI 测试用例", report_statistics: "报告统计", sort: '种类', - other_test_name: '其他测试名称', automatic_status_update: "自动状态更新", case: { list: "列表", diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index b04ac9d8a3..36bd889946 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -2084,7 +2084,6 @@ export default { ui_scenario_test_case: "UI 測試用例", report_statistics: "報告統計", sort: '種類', - other_test_name: '其他測試名稱', automatic_status_update: "自動狀態更新", case: { list: "列表",