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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
fit2-zhao 2020-10-13 17:31:41 +08:00
parent 106505f3a6 0e23dbd564
commit 21685342e4
2 changed files with 380 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
View File

@ -173,6 +173,12 @@
#{value} #{value}
</foreach> </foreach>
</when> </when>
<when test="key=='executor'">
and test_plan_test_case.executor in
<foreach collection="values" item="value" separator="," open="(" close=")">
#{value}
</foreach>
</when>
<otherwise> <otherwise>
and test_plan_test_case.status in and test_plan_test_case.status in
<foreach collection="values" item="value" separator="," open="(" close=")"> <foreach collection="values" item="value" separator="," open="(" close=")">

12
frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
View File

@ -136,6 +136,8 @@
<el-table-column <el-table-column
prop="executorName" prop="executorName"
:filters="executorFilters"
column-key="executor"
:label="$t('test_track.plan_view.executor')"> :label="$t('test_track.plan_view.executor')">
</el-table-column> </el-table-column>
@ -219,8 +221,8 @@
import MsTableButton from '../../../../common/components/MsTableButton'; import MsTableButton from '../../../../common/components/MsTableButton';
import NodeBreadcrumb from '../../../common/NodeBreadcrumb'; import NodeBreadcrumb from '../../../common/NodeBreadcrumb';
import {ROLE_TEST_MANAGER, ROLE_TEST_USER, TokenKey, WORKSPACE_ID} from '../../../../../../common/js/constants'; import {ROLE_TEST_MANAGER, ROLE_TEST_USER, TokenKey, WORKSPACE_ID} from "@/common/js/constants";
import {_filter, _sort, checkoutTestManagerOrTestUser, hasRoles} from '../../../../../../common/js/utils'; import {_filter, _sort, checkoutTestManagerOrTestUser, hasRoles} from "@/common/js/utils";
import PriorityTableItem from "../../../common/tableItems/planview/PriorityTableItem"; import PriorityTableItem from "../../../common/tableItems/planview/PriorityTableItem";
import StatusTableItem from "../../../common/tableItems/planview/StatusTableItem"; import StatusTableItem from "../../../common/tableItems/planview/StatusTableItem";
import TypeTableItem from "../../../common/tableItems/planview/TypeTableItem"; import TypeTableItem from "../../../common/tableItems/planview/TypeTableItem";
@ -288,6 +290,7 @@
{text: this.$t('test_track.plan_view.skip'), value: 'Skip'}, {text: this.$t('test_track.plan_view.skip'), value: 'Skip'},
{text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'}, {text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
], ],
executorFilters: [],
showMore: false, showMore: false,
buttons: [ buttons: [
{ {
@ -344,6 +347,11 @@
}); });
this.refreshTableAndPlan(); this.refreshTableAndPlan();
this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser(); this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
this.result = this.$get('user/list', response => {
this.executorFilters = response.data.map(u => {
return {text: u.name, value: u.id}
});
});
}, },
beforeDestroy() { beforeDestroy() {
hub.$off("openFailureTestCase"); hub.$off("openFailureTestCase");