test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(接口测试): 修复接口定义和接口自动化中回收站的高级搜索-所属模块展示树错误的问题 

--bug=1017178 --user=宋天阳 【接口测试】场景-回收站/api-回收站-高级搜索-所属模块展示的不是回收站对应的模块树
https://www.tapd.cn/55049933/s/1263578
This commit is contained in:
song-tianyang 2022-10-17 14:06:42 +08:00 committed by f2c-ci-robot[bot]
parent f06c9d9c96
commit 3d8c6787a3
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api-test/frontend/src/business/automation/scenario/Setting.js
View File

@ -1,15 +1,15 @@
import { import {
ID,
NAME,
PRIORITY,
TAGS,
API_SCENARIO_RESULT, API_SCENARIO_RESULT,
UPDATE_TIME,
CREATE_TIME, CREATE_TIME,
CREATOR, CREATOR,
FOLLOW_PEOPLE, FOLLOW_PEOPLE,
ID,
NAME,
OPERATORS,
PRIORITY,
STEP_COUNT, STEP_COUNT,
OPERATORS TAGS,
UPDATE_TIME
} from "metersphere-frontend/src/components/search/search-components"; } from "metersphere-frontend/src/components/search/search-components";
export function STEP() { export function STEP() {
@ -152,6 +152,12 @@ export const SCENARIO_MODULE_TREE = _getModuleTree({
params: {} params: {}
}) })
export const SCENARIO_MODULE_TRASH_TREE = _getModuleTree({
url: "/api/automation/module/trash/list",
type: "GET",
params: {}
})
export const API_STATUS_TRASH = { export const API_STATUS_TRASH = {
key: "status", key: "status",
name: 'MsTableSearchSelect', 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];

20
api-test/frontend/src/business/definition/api-definition.js
View File

@ -1,16 +1,16 @@
import {Assertions} from "@/business/definition/model/ApiTestModel"; import {Assertions} from "@/business/definition/model/ApiTestModel";
import {getUUID} from "metersphere-frontend/src/utils"; import {getUUID} from "metersphere-frontend/src/utils";
import { import {
ID,
NAME,
API_METHOD, API_METHOD,
API_PATH, API_PATH,
TAGS,
UPDATE_TIME,
CREATE_TIME,
API_PRINCIPAL, API_PRINCIPAL,
CREATE_TIME,
FOLLOW_PEOPLE, FOLLOW_PEOPLE,
OPERATORS ID,
NAME,
OPERATORS,
TAGS,
UPDATE_TIME
} from "metersphere-frontend/src/components/search/search-components"; } from "metersphere-frontend/src/components/search/search-components";
function _getModuleTree(options) { function _getModuleTree(options) {
@ -32,6 +32,12 @@ export const API_MODULE_TREE = _getModuleTree({
type: "GET", type: "GET",
params: {} params: {}
}) })
export const API_MODULE_TRASH_TREE = _getModuleTree({
url: "/api/module/trash/list",
type: "GET",
params: {}
})
export const API_STATUS_TRASH = { export const API_STATUS_TRASH = {
key: "status", key: "status",
name: 'MsTableSearchSelect', 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) { export function getProtocolFilter(protocolType) {
if (protocolType === "HTTP") { if (protocolType === "HTTP") {