From 5ff9bd0461a5d8ee6dfeea772aa6023712a97c6f Mon Sep 17 00:00:00 2001 From: "nathan.liu" Date: Wed, 17 Aug 2022 11:44:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DUI=E5=9B=9E=E6=94=B6=E7=AB=99=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=89=80=E5=B1=9E=E6=A8=A1=E5=9D=97=E6=9C=AA?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9B=9E=E6=94=B6=E7=AB=99=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1015864 --user=刘瑶 【UI测试】回收站-高级搜索-所属模块-未展示回收站对应模块树 https://www.tapd.cn/55049933/s/1224987 --- backend/src/main/java/io/metersphere/xpack | 2 +- .../common/components/search/search-components.js | 8 +++++++- frontend/src/business/components/xpack | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index a77e10934a..d2dbace022 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit a77e10934ad743ea3bcb72fe0f18de92a1a010f7 +Subproject commit d2dbace022db593cfc56fe40eaa531074da422df 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 c0242b42a7..b200715234 100644 --- a/frontend/src/business/components/common/components/search/search-components.js +++ b/frontend/src/business/components/common/components/search/search-components.js @@ -773,6 +773,12 @@ export const UI_MODULE_TREE = _getModuleTree({ params: {} }) +export const UI_TRASH_MODULE_TREE = _getModuleTree({ + url: "/ui/scenario/module/trash/list", + type: "GET", + params: {} +}) + export const TEST_CONFIGS = [ID, NAME, UPDATE_TIME, CREATE_TIME, STATUS, CREATOR, FOLLOW_PEOPLE]; export const PROJECT_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, CREATOR]; @@ -784,7 +790,7 @@ export const REPORT_CASE_CONFIGS = [NAME, CREATE_TIME, STATUS, CREATOR, TRIGGER_ export const UI_REPORT_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, UI_REPORT_STATUS, PROJECT_CREATOR, UI_TRIGGER_MODE, UI_MODULE_TREE]; export const UI_SCENARIO_CONFIGS = [NAME, CREATE_TIME, API_STATUS, PROJECT_CREATOR, UI_MODULE_TREE]; -export const UI_SCENARIO_CONFIGS_TRASH = [NAME, CREATE_TIME, API_STATUS_TRASH, PROJECT_CREATOR, UI_MODULE_TREE]; +export const UI_SCENARIO_CONFIGS_TRASH = [NAME, CREATE_TIME, API_STATUS_TRASH, PROJECT_CREATOR, UI_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]; diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 8815a82d41..8dfc4f8341 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 8815a82d4126cb6329f7c737f96f4a4fe80efce1 +Subproject commit 8dfc4f8341c88c1472ef5d03b11f350b3f622376