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

fix(高级搜索): 接口定义回收站API列表高级搜索状态字段下拉选项和实际列表状态不符 

--bug=1015191 --user=李玉号 【接口测试】接口定义-回收站-api列表-高级搜索-状态字段下拉选项和实际列表状态不符
https://www.tapd.cn/55049933/s/1210878
This commit is contained in:
shiziyuan9527 2022-07-25 18:17:15 +08:00 committed by shiziyuan9527
parent bdee2d7776
commit 5d9004e809
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/business/components/api/definition/components/list/ApiList.vue
View File

@ -238,7 +238,10 @@ import {API_LIST} from '@/common/js/constants';
import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
import {
API_DEFINITION_CONFIGS,
API_DEFINITION_CONFIGS_TRASH
} from "@/business/components/common/components/search/search-components";
import MsTipButton from "@/business/components/common/components/MsTipButton";
import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove";
import {
@ -295,7 +298,7 @@ export default {
fields: getCustomTableHeader('API_DEFINITION'),
fieldsWidth: getCustomTableWidth('API_DEFINITION'),
condition: {
components: API_DEFINITION_CONFIGS
components: this.trashEnable ? API_DEFINITION_CONFIGS_TRASH : API_DEFINITION_CONFIGS
},
selectApi: {},
result: {},

21
frontend/src/business/components/common/components/search/search-components.js
View File

@ -185,14 +185,28 @@ export const API_STATUS = {
options: [OPERATORS.IN, OPERATORS.NOT_IN]
},
options: [
{value: 'Prepare', label: '未开始'},
{value: 'Underway', label: '进行中'},
{value: 'Completed', label: '已完成'}
{value: 'Prepare', label: 'test_track.plan.plan_status_prepare'},
{value: 'Underway', label: 'test_track.plan.plan_status_running'},
{value: 'Completed', label: 'test_track.plan.plan_status_completed'}
],
props: { // 尾部控件的props，一般为element ui控件的props
multiple: true
}
}
export const API_STATUS_TRASH = {
key: "status",
name: 'MsTableSearchSelect',
label: 'commons.status',
operator: {
options: [OPERATORS.IN, OPERATORS.NOT_IN]
},
options: [{value: 'Trash', label: 'test_track.plan.plan_status_trash'}],
props: { // 尾部控件的props，一般为element ui控件的props
multiple: true
}
}
// 用例执行结果
export const API_CASE_RESULT = {
key: "status",
@ -778,6 +792,7 @@ export const TEST_PLAN_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, PRINCIPAL, TES
export const TEST_REVIEW = [NAME, CREATOR, TAGS, TEST_PLAN_STATUS, FOLLOW_PEOPLE, CREATE_TIME, UPDATE_TIME, END_TIME];
export const API_DEFINITION_CONFIGS = [ID, NAME, API_METHOD, API_PATH, API_STATUS, TAGS, UPDATE_TIME, CREATE_TIME, API_PRINCIPAL, API_MODULE_TREE, FOLLOW_PEOPLE, CASE_COUNT];
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, CASE_COUNT];
export const API_CASE_CONFIGS = [ID, NAME, PRIORITY, TAGS, API_CASE_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR, FOLLOW_PEOPLE, API_PATH];