From 0bbfbf2e768a0e1b327ab62752f66a94e9e6a678 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Fri, 17 Mar 2023 18:48:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8=E9=AB=98=E7=BA=A7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E8=B4=A3=E4=BB=BB=E4=BA=BA=EF=BC=8C=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1024596 --user=陈建星 [测试跟踪]功能用例-筛选-筛选责任人结果错误 https://www.tapd.cn/55049933/s/1352425 --- .../src/components/search/search-components.js | 15 ++++++++++++++- .../base/mapper/ext/ExtTestCaseMapper.xml | 6 ++++++ .../src/business/case/components/TestCaseList.vue | 2 +- .../frontend/src/business/case/test-case.js | 1 + .../base/mapper/ext/ExtTestCaseMapper.xml | 6 ++++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/framework/sdk-parent/frontend/src/components/search/search-components.js b/framework/sdk-parent/frontend/src/components/search/search-components.js index d0040f6e3d..9bb0fc16d9 100644 --- a/framework/sdk-parent/frontend/src/components/search/search-components.js +++ b/framework/sdk-parent/frontend/src/components/search/search-components.js @@ -716,6 +716,19 @@ export const TEST_CASE_STATUS = { } } +export const TEST_CASE_MAINTAINER = { + key: "maintainer", + name: 'MsTableSearchSelect', + label: "custom_field.case_maintainer", + operator: { + options: [OPERATORS.IN, OPERATORS.NOT_IN] + }, + options: MS_PROJECT_USER_OPTIONS, + props: { + multiple: true + } +} + export const TEST_CASE_PRIORITY = { key: "priority", name: 'MsTableSearchSelect', @@ -937,7 +950,7 @@ export const UI_CUSTOM_COMMAND_CONFIGS = [NAME, CREATE_TIME, PROJECT_CREATOR, UI export const UI_CUSTOM_COMMAND_CONFIGS_TRASH = [NAME, CREATE_TIME, PROJECT_CREATOR, UI_CUSTOM_COMMAND_TRASH_MODULE_TREE]; // 测试跟踪-测试用例 列表 -export const TEST_CASE_CONFIGS = [ID, NAME, TAGS, TEST_CASE_MODULE_TREE, CREATE_TIME, UPDATE_TIME, CREATOR, CASE_REVIEW_STATUS, FOLLOW_PEOPLE, CASE_DEMAND, TEST_CASE_STATUS, TEST_CASE_PRIORITY]; +export const TEST_CASE_CONFIGS = [ID, NAME, TAGS, TEST_CASE_MODULE_TREE, CREATE_TIME, UPDATE_TIME, CREATOR, CASE_REVIEW_STATUS, FOLLOW_PEOPLE, CASE_DEMAND, TEST_CASE_STATUS, TEST_CASE_PRIORITY, TEST_CASE_MAINTAINER]; export const TEST_PLAN_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, PRINCIPAL, TEST_PLAN_STATUS, STAGE, TAGS, FOLLOW_PEOPLE, ACTUAL_START_TIME, ACTUAL_END_TIME, PLAN_START_TIME, PLAN_END_TIME]; diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml index 3f2b0a0202..2a5136537d 100644 --- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml +++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml @@ -52,6 +52,12 @@ + + and test_case.maintainer + + + + and test_case.create_time diff --git a/test-track/frontend/src/business/case/components/TestCaseList.vue b/test-track/frontend/src/business/case/components/TestCaseList.vue index be413d2f10..01a1f0f93a 100644 --- a/test-track/frontend/src/business/case/components/TestCaseList.vue +++ b/test-track/frontend/src/business/case/components/TestCaseList.vue @@ -258,7 +258,7 @@ import HomePagination from '@/business/home/components/pagination/HomePagination import MsTableCountBar from 'metersphere-frontend/src/components/table/MsTableCountBar'; import PriorityTableItem from "../../common/tableItems/planview/PriorityTableItem"; import TypeTableItem from "../../common/tableItems/planview/TypeTableItem"; -import {OPERATORS, TEST_CASE_CONFIGS} from "metersphere-frontend/src/components/search/search-components"; +import {TEST_CASE_CONFIGS} from "metersphere-frontend/src/components/search/search-components"; import BatchEdit from "./BatchEdit"; import {TEST_CASE_LIST} from "metersphere-frontend/src/utils/constants"; import MsSingleTag from "metersphere-frontend/src/components/new-ui/MsSingleTag"; diff --git a/test-track/frontend/src/business/case/test-case.js b/test-track/frontend/src/business/case/test-case.js index cc0d2587db..5ce9059473 100644 --- a/test-track/frontend/src/business/case/test-case.js +++ b/test-track/frontend/src/business/case/test-case.js @@ -11,6 +11,7 @@ export function initTestCaseConditionComponents(condition, customFields, trashEn comp = comp.filter(element => { if (element.label === '责任人') { element.label = i18n.t('custom_field.case_maintainer'); + return false; } if (element.label === '用例等级') { element.label = i18n.t('custom_field.case_priority'); diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml index 20be88d7bd..a24fe8027d 100644 --- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml +++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml @@ -46,6 +46,12 @@ + + and test_case.maintainer + + + + and test_case.create_time