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

fix: 测试计划用例ID排序报错

This commit is contained in:
chenjianxing 2021-06-17 16:46:45 +08:00 committed by jianxing
parent 46a719c8a0
commit 083961f208
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,7 +237,19 @@
left join test_case_node on 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 inner join project on project.id = test_case.project_id
<include refid="queryWhereCondition"/> <include refid="queryWhereCondition"/>
<include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/> <if test="request.orders != null and request.orders.size() > 0">
order by
<foreach collection="request.orders" separator="," item="order">
<choose>
<when test="order.name == 'custom_num'">
customNum ${order.type}
</when>
<otherwise>
${order.name} ${order.type}
</otherwise>
</choose>
</foreach>
</if>
</select> </select>
<select id="selectIds" resultType="java.lang.String"> <select id="selectIds" resultType="java.lang.String">
select distinct test_plan_test_case.id as id select distinct test_plan_test_case.id as id

8
frontend/src/business/components/track/case/components/TestCaseList.vue
View File

@ -342,7 +342,9 @@ export default {
this.testCaseTemplate = template; this.testCaseTemplate = template;
this.fields = getTableHeaderWithCustomFields('TRACK_TEST_CASE', this.testCaseTemplate.customFields); this.fields = getTableHeaderWithCustomFields('TRACK_TEST_CASE', this.testCaseTemplate.customFields);
this.page.result.loading = false; this.page.result.loading = false;
this.$refs.table.reloadTable(); if (this.$refs.table) {
this.$refs.table.reloadTable();
}
getCustomFieldBatchEditOption(template.customFields, this.typeArr, this.valueArr, this.members); getCustomFieldBatchEditOption(template.customFields, this.typeArr, this.valueArr, this.members);
}); });
}, },
@ -418,7 +420,9 @@ export default {
let data = response.data; let data = response.data;
this.page.total = data.itemCount; this.page.total = data.itemCount;
this.page.data = data.listObject; this.page.data = data.listObject;
this.$refs.table.clear(); if (this.$refs.table) {
this.$refs.table.clear();
}
this.page.data.forEach(item => { this.page.data.forEach(item => {
if (item.customFields) { if (item.customFields) {
item.customFields = JSON.parse(item.customFields); item.customFields = JSON.parse(item.customFields);