fix(功能用例、接口定义、接口自动化): #1005266 #1006273 用例列表,名称显示不全;选择模块后,在右侧列表选择所有数据,数据条数不正确

【【测试用例】用例列表,名称显示...】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001005266;
【【github#5711】选择模块后,在右侧列表选择所有数据,数据条数不正确,且为上一次选择模块下的条数】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006273
This commit is contained in:
song-tianyang 2021-08-30 14:55:14 +08:00 committed by 刘瑞斌
parent db27da97bb
commit 08af2a2822
5 changed files with 25 additions and 3 deletions

View File

@ -289,12 +289,20 @@ public class ApiDefinitionExecResultService {
testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
} else if (StringUtils.equals(type, ApiRunMode.JENKINS_API_PLAN.name())) {
TestPlanApiCase apiCase = testPlanApiCaseService.getById(item.getName());
userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
// userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
userID = SessionUtils.getUserId();
if(userID == null){
userID = "";
}
apiCase.setStatus(status);
apiCase.setUpdateTime(System.currentTimeMillis());
testPlanApiCaseService.updateByPrimaryKeySelective(apiCase);
} else {
userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
userID = SessionUtils.getUserId();
if(userID == null){
userID = "";
}
// userID = Objects.requireNonNull(SessionUtils.getUser()).getId();
testPlanApiCaseService.setExecResult(item.getName(), status, item.getStartTime());
testCaseReviewApiCaseService.setExecResult(item.getName(), status, item.getStartTime());
}

View File

@ -22,6 +22,7 @@
:page-size="pageSize > total ? total : pageSize"
:table-data-count-in-page="data.length"
:total="total"
:select-type="condition.selectAll"
@selectPageAll="isSelectDataAll(false)"
@selectAll="isSelectDataAll(true)"/>

View File

@ -1,5 +1,5 @@
<template>
<el-table-column
<el-table-column class-name="msTableColumn"
v-if="!field || field.id === prop"
:min-width="minWidth"
:width="fieldsWidth ? fieldsWidth[prop] : width"

View File

@ -41,6 +41,7 @@
return 10;
}
},
selectType: String,
tableDataCountInPage: {
type: Number,
default() {
@ -54,6 +55,11 @@
}
},
},
watch:{
total(){
this.reload();
}
},
created() {
if(this.keyIndex === 0){
this.keyIndex++;
@ -93,6 +99,10 @@
this.$emit(even);
},
reload() {
if(!this.selectType){
this.selectAllFontColor.color = "gray";
this.selectPageFontColor.color = "gray";
}
this.isShow = false;
this.$nextTick(() => {
this.isShow = true;

View File

@ -143,6 +143,9 @@ textarea {
border-right: 0 !important;
}
.msTableColumn .el-tooltip {
width: auto !important;
}
/* 表格拖拽表头调整宽度 --> */
/* <-- 表格 input 编辑效果 */