fix(接口测试): 用例数增加排序 用例状态增加筛选 用例通过率
This commit is contained in:
parent
dd79c1f3e2
commit
e6dbe2a599
|
@ -113,6 +113,16 @@ public class ApiDefinitionService {
|
||||||
request = this.initRequest(request, true, true);
|
request = this.initRequest(request, true, true);
|
||||||
List<ApiDefinitionResult> resList = extApiDefinitionMapper.list(request);
|
List<ApiDefinitionResult> resList = extApiDefinitionMapper.list(request);
|
||||||
calculateResult(resList, request.getProjectId());
|
calculateResult(resList, request.getProjectId());
|
||||||
|
ApiDefinitionRequest finalRequest = request;
|
||||||
|
if (finalRequest.getFilters().size() > 1) {
|
||||||
|
if (null != finalRequest.getFilters().get("case_status")) {
|
||||||
|
resList = resList.stream()
|
||||||
|
.filter((ApiDefinitionResult b) -> finalRequest.getFilters().get("case_status").contains(b.getCaseStatus()))
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
return resList;
|
return resList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,12 +24,13 @@
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
min-width="80px"
|
min-width="80px"
|
||||||
sortable=true
|
sortable=true
|
||||||
:key="index">
|
:key="index"
|
||||||
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<!-- 判断为只读用户的话不可点击ID进行编辑操作 -->
|
<!-- 判断为只读用户的话不可点击ID进行编辑操作 -->
|
||||||
<!--<span style="cursor:pointer" v-if="isReadOnly"> {{ scope.row.num }} </span>-->
|
<!--<span style="cursor:pointer" v-if="isReadOnly"> {{ scope.row.num }} </span>-->
|
||||||
<!--<el-tooltip v-else content="编辑">-->
|
<!--<el-tooltip v-else content="编辑">-->
|
||||||
<!--<a style="cursor:pointer" @click="editApi(scope.row)"> {{ scope.row.num }} </a>-->
|
<!--<a style="cursor:pointer" @click="editApi(scope.row)"> {{ scope.row.num }} </a>-->
|
||||||
<!--</el-tooltip>-->
|
<!--</el-tooltip>-->
|
||||||
<el-tooltip content="编辑">
|
<el-tooltip content="编辑">
|
||||||
<a style="cursor:pointer" @click="editApi(scope.row)"> {{ scope.row.num }} </a>
|
<a style="cursor:pointer" @click="editApi(scope.row)"> {{ scope.row.num }} </a>
|
||||||
|
@ -127,7 +128,7 @@
|
||||||
<ms-table-column
|
<ms-table-column
|
||||||
v-if="item.id == 'caseTotal'"
|
v-if="item.id == 'caseTotal'"
|
||||||
prop="caseTotal"
|
prop="caseTotal"
|
||||||
sortable="custom"
|
sortable
|
||||||
width="140px"
|
width="140px"
|
||||||
:label="$t('api_test.definition.api_case_number')"
|
:label="$t('api_test.definition.api_case_number')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
@ -141,12 +142,13 @@
|
||||||
:label="$t('api_test.definition.api_case_status')"
|
:label="$t('api_test.definition.api_case_status')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
:key="index"
|
:key="index"
|
||||||
|
:filter-method="filterHandler"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<ms-table-column
|
<ms-table-column
|
||||||
v-if="item.id == 'casePassingRate'"
|
v-if="item.id == 'casePassingRate'"
|
||||||
width="150px"
|
width="150px"
|
||||||
sortable="custom"
|
sortable
|
||||||
prop="casePassingRate"
|
prop="casePassingRate"
|
||||||
:label="$t('api_test.definition.api_case_passing_rate')"
|
:label="$t('api_test.definition.api_case_passing_rate')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
@ -765,6 +767,10 @@ export default {
|
||||||
},
|
},
|
||||||
open() {
|
open() {
|
||||||
this.$refs.searchBar.open();
|
this.$refs.searchBar.open();
|
||||||
|
},
|
||||||
|
filterHandler(value, row, column) {
|
||||||
|
const property = column['property'];
|
||||||
|
return row[property] === value;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,6 +136,9 @@ export function _sort(column, condition) {
|
||||||
hasProp = true;
|
hasProp = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if (column.prop === 'case_passing_rate' || column.prop === 'case_total') {
|
||||||
|
hasProp = true;
|
||||||
|
}
|
||||||
if (!hasProp) {
|
if (!hasProp) {
|
||||||
condition.orders.push({name: column.prop, type: column.order});
|
condition.orders.push({name: column.prop, type: column.order});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue