feat(测试计划): 测试计划下测试用例增加所属项目列
This commit is contained in:
parent
fdd401280e
commit
b55ca479a4
|
@ -115,10 +115,11 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
|
<select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
|
||||||
select test_case.remark, test_plan_test_case.id as id, test_plan_test_case.*,test_case.*,test_case_node.name as model
|
select test_case.remark, test_plan_test_case.id as id, test_plan_test_case.*,test_case.*,test_case_node.name as model, project.name as projectName
|
||||||
from test_plan_test_case
|
from test_plan_test_case
|
||||||
inner join test_case on test_plan_test_case.case_id = test_case.id left join test_case_node on
|
inner join test_case on test_plan_test_case.case_id = test_case.id
|
||||||
test_case_node.id=test_case.node_id
|
left join test_case_node on test_case_node.id=test_case.node_id
|
||||||
|
inner join project on project.id = test_case.project_id
|
||||||
<where>
|
<where>
|
||||||
<if test="request.combine != null">
|
<if test="request.combine != null">
|
||||||
<include refid="combine">
|
<include refid="combine">
|
||||||
|
|
|
@ -17,4 +17,5 @@ public class TestPlanCaseDTO extends TestCaseWithBLOBs {
|
||||||
private String issues;
|
private String issues;
|
||||||
private String reportId;
|
private String reportId;
|
||||||
private String model;
|
private String model;
|
||||||
|
private String projectName;
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,6 +89,13 @@
|
||||||
<span class="cast_item">{{testCase.nodePath}}</span>
|
<span class="cast_item">{{testCase.nodePath}}</span>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4" :offset="1">
|
<el-col :span="4" :offset="1">
|
||||||
|
<span class="cast_label">{{$t('test_track.plan.plan_project')}}:</span>
|
||||||
|
<span class="cast_item">{{testCase.projectName}}</span>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<el-row>
|
||||||
|
<el-col :offset="1">
|
||||||
<span class="cast_label">{{$t('test_track.case.prerequisite')}}:</span>
|
<span class="cast_label">{{$t('test_track.case.prerequisite')}}:</span>
|
||||||
<span class="cast_item">{{testCase.prerequisite}}</span>
|
<span class="cast_item">{{testCase.prerequisite}}</span>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
@ -15,13 +15,6 @@
|
||||||
<ms-table-button :is-tester-permission="true" icon="el-icon-connection"
|
<ms-table-button :is-tester-permission="true" icon="el-icon-connection"
|
||||||
:content="$t('test_track.plan_view.relevance_test_case')"
|
:content="$t('test_track.plan_view.relevance_test_case')"
|
||||||
@click="$emit('openTestCaseRelevanceDialog')"/>
|
@click="$emit('openTestCaseRelevanceDialog')"/>
|
||||||
<!-- <ms-table-button :is-tester-permission="true" icon="el-icon-unlock"-->
|
|
||||||
<!-- :content="$t('test_track.plan_view.cancel_relevance')" @click="handleBatch('delete')"/>-->
|
|
||||||
<!-- <ms-table-button :is-tester-permission="true" icon="el-icon-edit-outline"-->
|
|
||||||
<!-- :content="$t('test_track.plan_view.change_execution_results')"-->
|
|
||||||
<!-- @click="handleBatch('status')"/>-->
|
|
||||||
<!-- <ms-table-button :is-tester-permission="true" icon="el-icon-user"-->
|
|
||||||
<!-- :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>-->
|
|
||||||
<ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document"
|
<ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document"
|
||||||
:content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
|
:content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
|
||||||
<ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document"
|
<ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document"
|
||||||
|
@ -103,7 +96,12 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="nodePath"
|
prop="projectName"
|
||||||
|
:label="$t('test_track.plan.plan_project')"
|
||||||
|
show-overflow-tooltip>
|
||||||
|
</el-table-column>
|
||||||
|
|
||||||
|
<el-table-column
|
||||||
:label="$t('test_track.issue.issue')"
|
:label="$t('test_track.issue.issue')"
|
||||||
show-overflow-tooltip>
|
show-overflow-tooltip>
|
||||||
<template v-slot:default="scope">
|
<template v-slot:default="scope">
|
||||||
|
@ -112,7 +110,6 @@
|
||||||
width="400"
|
width="400"
|
||||||
trigger="hover">
|
trigger="hover">
|
||||||
<el-table border class="adjust-table" :data="scope.row.issuesContent" style="width: 100%">
|
<el-table border class="adjust-table" :data="scope.row.issuesContent" style="width: 100%">
|
||||||
<!-- <el-table-column prop="id" label="缺陷ID" show-overflow-tooltip/>-->
|
|
||||||
<el-table-column prop="title" :label="$t('test_track.issue.title')" show-overflow-tooltip/>
|
<el-table-column prop="title" :label="$t('test_track.issue.title')" show-overflow-tooltip/>
|
||||||
<el-table-column prop="description" :label="$t('test_track.issue.description')">
|
<el-table-column prop="description" :label="$t('test_track.issue.description')">
|
||||||
<template v-slot:default="scope">
|
<template v-slot:default="scope">
|
||||||
|
@ -127,7 +124,6 @@
|
||||||
</el-popover>
|
</el-popover>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<!-- <el-table-column prop="status" label="缺陷状态"/>-->
|
|
||||||
<el-table-column prop="platform" :label="$t('test_track.issue.platform')"/>
|
<el-table-column prop="platform" :label="$t('test_track.issue.platform')"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-button slot="reference" type="text">{{scope.row.issuesSize}}</el-button>
|
<el-button slot="reference" type="text">{{scope.row.issuesSize}}</el-button>
|
||||||
|
@ -262,7 +258,6 @@
|
||||||
currentPage: 1,
|
currentPage: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
total: 0,
|
total: 0,
|
||||||
// selectIds: new Set(),
|
|
||||||
selectRows: new Set(),
|
selectRows: new Set(),
|
||||||
testPlan: {},
|
testPlan: {},
|
||||||
isReadOnly: false,
|
isReadOnly: false,
|
||||||
|
@ -369,7 +364,6 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// this.selectIds.clear();
|
|
||||||
this.selectRows.clear();
|
this.selectRows.clear();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -380,7 +374,6 @@
|
||||||
},
|
},
|
||||||
refresh() {
|
refresh() {
|
||||||
this.condition = {components: TEST_CASE_CONFIGS};
|
this.condition = {components: TEST_CASE_CONFIGS};
|
||||||
// this.selectIds.clear();
|
|
||||||
this.selectRows.clear();
|
this.selectRows.clear();
|
||||||
this.$emit('refresh');
|
this.$emit('refresh');
|
||||||
},
|
},
|
||||||
|
@ -443,13 +436,6 @@
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSelectAll(selection) {
|
handleSelectAll(selection) {
|
||||||
// if (selection.length > 0) {
|
|
||||||
// this.tableData.forEach(item => {
|
|
||||||
// this.selectIds.add(item.id);
|
|
||||||
// });
|
|
||||||
// } else {
|
|
||||||
// this.selectIds.clear();
|
|
||||||
// }
|
|
||||||
if (selection.length > 0) {
|
if (selection.length > 0) {
|
||||||
if (selection.length === 1) {
|
if (selection.length === 1) {
|
||||||
this.selectRows.add(selection[0]);
|
this.selectRows.add(selection[0]);
|
||||||
|
@ -467,11 +453,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleSelectionChange(selection, row) {
|
handleSelectionChange(selection, row) {
|
||||||
// if (this.selectIds.has(row.id)) {
|
|
||||||
// this.selectIds.delete(row.id);
|
|
||||||
// } else {
|
|
||||||
// this.selectIds.add(row.id);
|
|
||||||
// }
|
|
||||||
if (this.selectRows.has(row)) {
|
if (this.selectRows.has(row)) {
|
||||||
this.$set(row, "showMore", false);
|
this.$set(row, "showMore", false);
|
||||||
this.selectRows.delete(row);
|
this.selectRows.delete(row);
|
||||||
|
|
Loading…
Reference in New Issue