From b729000306c225f8602da5648cc8086a3ad4a3c4 Mon Sep 17 00:00:00 2001 From: "nathan.liu" Date: Tue, 25 Oct 2022 22:34:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92-UI?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8/?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B/=E5=85=B3=E8=81=94?= =?UTF-8?q?=E7=94=A8=E4=BE=8B-=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A23?= =?UTF-8?q?=E4=B8=AA=E5=9C=B0=E6=96=B9=E7=9A=84=E6=89=A7=E8=A1=8C=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E5=8F=8A=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E8=BF=94=E5=9B=9E=E4=B8=8D=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1018856 --user=刘瑶 【测试跟踪】测试计划-UI测试用例列表/关联用例/关联用例-高级搜索3个地方的执行结果状态显示及搜索返回不符 https://www.tapd.cn/55049933/s/1277349 --bug=1018848 --user=刘瑶 【测试跟踪】报告-UI 用例统计分析-未执行和失败tab页未显示数据且点击执行结果未显示报告 https://www.tapd.cn/55049933/s/1277350 --- .../components/search/search-components.js | 19 +++++++++++++++++++ .../report/detail/TestPlanUiReport.vue | 4 ++-- .../comonents/ui/RelevanceUiScenarioList.vue | 8 ++++---- .../comonents/ui/TestPlanUiScenarioList.vue | 4 ++-- 4 files changed, 27 insertions(+), 8 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 3fe124cf2d..063923e4e5 100644 --- a/framework/sdk-parent/frontend/src/components/search/search-components.js +++ b/framework/sdk-parent/frontend/src/components/search/search-components.js @@ -273,6 +273,24 @@ export const API_SCENARIO_RESULT = { multiple: true } } +// 场景执行结果 +export const UI_SCENARIO_RESULT = { + key: "lastResult", + name: 'MsTableSearchSelect', + label: 'test_track.plan_view.execute_result', + operator: { + options: [OPERATORS.IN, OPERATORS.NOT_IN] + }, + options: [ + {text: 'Pending', value: 'PENDING'}, + {text: 'Success', value: 'SUCCESS'}, + {text: 'Error', value: 'ERROR'}, + ], + props: { // 尾部控件的props，一般为element ui控件的props + multiple: true + } +} + // 请求类型 export const API_METHOD = { key: "method", @@ -858,6 +876,7 @@ export const TEST_PLAN_RELEVANCE_FUNC_CONFIGS = [NAME, TAGS, CREATE_TIME, UPDATE export const TEST_PLAN_RELEVANCE_API_DEFINITION_CONFIGS = [NAME, API_METHOD, API_PATH, TAGS, UPDATE_TIME, CREATE_TIME, CREATOR]; export const TEST_PLAN_RELEVANCE_API_CASE_CONFIGS = [NAME, PRIORITY, TAGS, UPDATE_TIME, CREATOR, API_PATH]; export const TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS = [NAME, PRIORITY, TAGS, API_SCENARIO_RESULT, CREATE_TIME, UPDATE_TIME, CREATOR]; +export const TEST_PLAN_RELEVANCE_UI_SCENARIO_CONFIGS = [NAME, PRIORITY, TAGS, UI_SCENARIO_RESULT, CREATE_TIME, UPDATE_TIME, CREATOR]; export const TEST_PLAN_RELEVANCE_LOAD_CASE = [NAME, STATUS, CREATE_TIME, UPDATE_TIME, CREATOR]; // 测试用例关联测试 diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanUiReport.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanUiReport.vue index bba467e1e6..4d78e4484a 100644 --- a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanUiReport.vue +++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanUiReport.vue @@ -11,7 +11,7 @@ @@ -21,7 +21,7 @@ diff --git a/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue b/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue index f451784404..cfb2872b66 100644 --- a/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue +++ b/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue @@ -55,10 +55,10 @@ @@ -79,7 +79,7 @@ import MsTag from "metersphere-frontend/src/components/MsTag"; import TestPlanScenarioListHeader from "../api/TestPlanScenarioListHeader"; import PriorityTableItem from "@/business/common/tableItems/planview/PriorityTableItem"; import MsTableAdvSearchBar from "metersphere-frontend/src/components/search/MsTableAdvSearchBar"; -import {TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS} from "metersphere-frontend/src/components/search/search-components"; +import {TEST_PLAN_RELEVANCE_UI_SCENARIO_CONFIGS} from "metersphere-frontend/src/components/search/search-components"; import {ENV_TYPE} from "metersphere-frontend/src/utils/constants"; import MsTable from "metersphere-frontend/src/components/table/MsTable"; import {getOwnerProjects, getVersionFilters} from "@/business/utils/sdk-utils"; @@ -113,7 +113,7 @@ export default { loading: false, showConfigButtonWithOutPermission: false, condition: { - components: TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS + components: TEST_PLAN_RELEVANCE_UI_SCENARIO_CONFIGS }, currentScenario: {}, schedule: {}, diff --git a/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue b/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue index 4837eacc9d..92fcba594c 100644 --- a/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue +++ b/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue @@ -148,7 +148,7 @@ :label="$t('api_test.automation.last_result')"> @@ -189,7 +189,7 @@ import MsTag from "metersphere-frontend/src/components/MsTag"; import {getCurrentProjectID, getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token"; import {hasLicense} from "metersphere-frontend/src/utils/permission"; import {getUUID, strMapToObj} from "metersphere-frontend/src/utils"; -import TestPlanScenarioListHeader from "../api/TestPlanScenarioListHeader"; +import TestPlanScenarioListHeader from "../ui/TestPlanUiScenarioListHeader"; import MsPlanRunMode from "@/business/plan/common/PlanRunModeWithEnv"; import { initCondition,