From 74fe5c1bba9779498d7fc7b685a1c4412eca14d0 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Fri, 29 Jul 2022 17:16:26 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2):=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E7=AB=99=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=92=8C=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1015469 --user=李玉号 【接口测试】接口自动化-回收站-高级搜索-状态字段和列表状态字段不一致 https://www.tapd.cn/55049933/s/1215767 --- .../components/api/automation/scenario/ApiScenarioList.vue | 7 +++++-- .../common/components/search/search-components.js | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index 87276504ec..e79e697eef 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -319,7 +319,10 @@ import { objToStrMap, strMapToObj } from "@/common/js/utils"; -import {API_SCENARIO_CONFIGS} from "@/business/components/common/components/search/search-components"; +import { + API_SCENARIO_CONFIGS, + API_SCENARIO_CONFIGS_TRASH +} from "@/business/components/common/components/search/search-components"; import {API_SCENARIO_LIST} from "../../../../../common/js/constants"; import { @@ -431,7 +434,7 @@ export default { fieldsWidth: getCustomTableWidth('API_SCENARIO'), screenHeight: 'calc(100vh - 180px)',//屏幕高度, condition: { - components: API_SCENARIO_CONFIGS + components: this.trashEnable ? API_SCENARIO_CONFIGS_TRASH : API_SCENARIO_CONFIGS }, scenarioId: "", isMoveBatch: true, diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js index 6c95dfafe3..7e07754526 100644 --- a/frontend/src/business/components/common/components/search/search-components.js +++ b/frontend/src/business/components/common/components/search/search-components.js @@ -799,6 +799,7 @@ export const API_DEFINITION_CONFIGS_TRASH = [ID, NAME, API_METHOD, API_PATH, API export const API_CASE_CONFIGS = [ID, NAME, PRIORITY, TAGS, API_CASE_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR, FOLLOW_PEOPLE, API_PATH]; export const API_SCENARIO_CONFIGS = [ID, NAME, PRIORITY, TAGS, API_SCENARIO_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR, FOLLOW_PEOPLE, STEP_COUNT, SCENARIO_MODULE_TREE, API_STATUS]; +export const API_SCENARIO_CONFIGS_TRASH = [ID, NAME, PRIORITY, TAGS, API_SCENARIO_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR, FOLLOW_PEOPLE, STEP_COUNT, SCENARIO_MODULE_TREE, API_STATUS_TRASH]; export const TEST_PLAN_REPORT_CONFIGS = [NAME, TEST_PLAN_NAME, CREATOR, CREATE_TIME, TEST_PLAN_TRIGGER_MODE, TEST_PLAN_REPORT_STATUS];