From 3d8c6787a310414aafd1fa411cf7a77b61f36822 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 17 Oct 2022 14:06:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E5=92=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96=E4=B8=AD=E5=9B=9E?=
 =?UTF-8?q?=E6=94=B6=E7=AB=99=E7=9A=84=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?-=E6=89=80=E5=B1=9E=E6=A8=A1=E5=9D=97=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=A0=91=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017178 --user=宋天阳 【接口测试】场景-回收站/api-回收站-高级搜索-所属模块展示的不是回收站对应的模块树
https://www.tapd.cn/55049933/s/1263578
---
 .../business/automation/scenario/Setting.js   | 20 ++++++++++++-------
 .../src/business/definition/api-definition.js | 20 ++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/api-test/frontend/src/business/automation/scenario/Setting.js b/api-test/frontend/src/business/automation/scenario/Setting.js
index a247aeb47f..d63df797e9 100644
--- a/api-test/frontend/src/business/automation/scenario/Setting.js
+++ b/api-test/frontend/src/business/automation/scenario/Setting.js
@@ -1,15 +1,15 @@
 import {
-  ID,
-  NAME,
-  PRIORITY,
-  TAGS,
   API_SCENARIO_RESULT,
-  UPDATE_TIME,
   CREATE_TIME,
   CREATOR,
   FOLLOW_PEOPLE,
+  ID,
+  NAME,
+  OPERATORS,
+  PRIORITY,
   STEP_COUNT,
-  OPERATORS
+  TAGS,
+  UPDATE_TIME
 } from "metersphere-frontend/src/components/search/search-components";
 
 export function STEP() {
@@ -152,6 +152,12 @@ export const SCENARIO_MODULE_TREE = _getModuleTree({
   params: {}
 })
 
+export const SCENARIO_MODULE_TRASH_TREE = _getModuleTree({
+  url: "/api/automation/module/trash/list",
+  type: "GET",
+  params: {}
+})
+
 export const API_STATUS_TRASH = {
   key: "status",
   name: 'MsTableSearchSelect',
@@ -165,5 +171,5 @@ export const API_STATUS_TRASH = {
   }
 }
 
-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 API_SCENARIO_CONFIGS_TRASH = [ID, NAME, PRIORITY, TAGS, API_SCENARIO_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR, FOLLOW_PEOPLE, STEP_COUNT, SCENARIO_MODULE_TRASH_TREE, API_STATUS_TRASH];
 
diff --git a/api-test/frontend/src/business/definition/api-definition.js b/api-test/frontend/src/business/definition/api-definition.js
index 1b56b49dbc..177744a413 100644
--- a/api-test/frontend/src/business/definition/api-definition.js
+++ b/api-test/frontend/src/business/definition/api-definition.js
@@ -1,16 +1,16 @@
 import {Assertions} from "@/business/definition/model/ApiTestModel";
 import {getUUID} from "metersphere-frontend/src/utils";
 import {
-  ID,
-  NAME,
   API_METHOD,
   API_PATH,
-  TAGS,
-  UPDATE_TIME,
-  CREATE_TIME,
   API_PRINCIPAL,
+  CREATE_TIME,
   FOLLOW_PEOPLE,
-  OPERATORS
+  ID,
+  NAME,
+  OPERATORS,
+  TAGS,
+  UPDATE_TIME
 } from "metersphere-frontend/src/components/search/search-components";
 
 function _getModuleTree(options) {
@@ -32,6 +32,12 @@ export const API_MODULE_TREE = _getModuleTree({
   type: "GET",
   params: {}
 })
+
+export const API_MODULE_TRASH_TREE = _getModuleTree({
+  url: "/api/module/trash/list",
+  type: "GET",
+  params: {}
+})
 export const API_STATUS_TRASH = {
   key: "status",
   name: 'MsTableSearchSelect',
@@ -45,7 +51,7 @@ export const API_STATUS_TRASH = {
   }
 }
 
-export const API_DEFINITION_CONFIGS_TRASH = [ID, NAME, API_METHOD, API_PATH, API_STATUS_TRASH, TAGS, UPDATE_TIME, CREATE_TIME, API_PRINCIPAL, API_MODULE_TREE, FOLLOW_PEOPLE];
+export const API_DEFINITION_CONFIGS_TRASH = [ID, NAME, API_METHOD, API_PATH, API_STATUS_TRASH, TAGS, UPDATE_TIME, CREATE_TIME, API_PRINCIPAL, API_MODULE_TRASH_TREE, FOLLOW_PEOPLE];
 
 export function getProtocolFilter(protocolType) {
   if (protocolType === "HTTP") {