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

fix(缺陷管理): 附件关联抽屉移除全选所有页 

--bug=1039557 --user=宋昌昌 【缺陷管理】缺陷详情-附件关联文件-全选所有页-只关联了最后一页数据 https://www.tapd.cn/55049933/s/1499765
This commit is contained in:
song-cc-rock 2024-04-17 15:01:35 +08:00 committed by 刘瑞斌
parent 9fb041e437
commit fa0daf63d3
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.java
View File

@ -21,10 +21,9 @@ public interface ExtBugRelateCaseMapper {
/** /**
* 获取缺陷关联的用例模块树 * 获取缺陷关联的用例模块树
* @param request 请求参数 * @param request 请求参数
* @param deleted 是否删除状态
* @return 模块树集合 * @return 模块树集合
*/ */
List<BaseTreeNode> getRelateCaseModule(@Param("request") AssociateCaseModuleRequest request, @Param("deleted") boolean deleted); List<BaseTreeNode> getRelateCaseModule(@Param("request") AssociateCaseModuleRequest request);
/** /**
* 获取缺陷关联的用例模块树数量 * 获取缺陷关联的用例模块树数量

3
backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
View File

@ -9,8 +9,7 @@
fcm.pos, fcm.pos,
fcm.project_id fcm.project_id
from functional_case_module fcm left join functional_case fc on fc.module_id = fcm.id from functional_case_module fcm left join functional_case fc on fc.module_id = fcm.id
where fc.deleted = #{deleted} where fcm.project_id = #{request.projectId}
and fc.project_id = #{request.projectId}
and fc.id not in and fc.id not in
( (
select brc.case_id from bug_relation_case brc where brc.bug_id = #{request.sourceId} and brc.case_type = #{request.sourceType} select brc.case_id from bug_relation_case brc where brc.bug_id = #{request.sourceId} and brc.case_type = #{request.sourceType}

4
backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugRelateCaseCommonService.java
View File

@ -68,7 +68,7 @@ public class BugRelateCaseCommonService extends ModuleTreeService {
*/ */
public List<BaseTreeNode> getRelateCaseTree(AssociateCaseModuleRequest request) { public List<BaseTreeNode> getRelateCaseTree(AssociateCaseModuleRequest request) {
// 目前只保留功能用例的左侧模块树方法调用, 后续其他用例根据RelateCaseType扩展 // 目前只保留功能用例的左侧模块树方法调用, 后续其他用例根据RelateCaseType扩展
List<BaseTreeNode> relateCaseModules = extBugRelateCaseMapper.getRelateCaseModule(request, false); List<BaseTreeNode> relateCaseModules = extBugRelateCaseMapper.getRelateCaseModule(request);
// 构建模块树层级数量为通用逻辑 // 构建模块树层级数量为通用逻辑
return super.buildTreeAndCountResource(relateCaseModules, true, Translator.get("api_unplanned_request")); return super.buildTreeAndCountResource(relateCaseModules, true, Translator.get("api_unplanned_request"));
} }
@ -85,7 +85,7 @@ public class BugRelateCaseCommonService extends ModuleTreeService {
List<ModuleCountDTO> moduleCounts = extBugRelateCaseMapper.countRelateCaseModuleTree(request, false); List<ModuleCountDTO> moduleCounts = extBugRelateCaseMapper.countRelateCaseModuleTree(request, false);
AssociateCaseModuleRequest moduleRequest = new AssociateCaseModuleRequest(); AssociateCaseModuleRequest moduleRequest = new AssociateCaseModuleRequest();
BeanUtils.copyBean(moduleRequest, request); BeanUtils.copyBean(moduleRequest, request);
List<BaseTreeNode> relateCaseModules = extBugRelateCaseMapper.getRelateCaseModule(moduleRequest, false); List<BaseTreeNode> relateCaseModules = extBugRelateCaseMapper.getRelateCaseModule(moduleRequest);
List<BaseTreeNode> relateCaseModuleWithCount = buildTreeAndCountResource(relateCaseModules, moduleCounts, true, Translator.get("api_unplanned_request")); List<BaseTreeNode> relateCaseModuleWithCount = buildTreeAndCountResource(relateCaseModules, moduleCounts, true, Translator.get("api_unplanned_request"));
Map<String, Long> moduleCountMap = getIdCountMapByBreadth(relateCaseModuleWithCount); Map<String, Long> moduleCountMap = getIdCountMapByBreadth(relateCaseModuleWithCount);
long total = getAllCount(moduleCounts); long total = getAllCount(moduleCounts);

2
frontend/src/components/business/ms-link-file/linkFileTable.vue
View File

@ -180,7 +180,7 @@
tableKey: TableKeyEnum.FILE_MANAGEMENT_FILE, tableKey: TableKeyEnum.FILE_MANAGEMENT_FILE,
showSetting: false, showSetting: false,
selectable: true, selectable: true,
showSelectAll: true, showSelectorAll: false,
heightUsed: 300, heightUsed: 300,
selectorType: props.selectorType || 'checkbox', selectorType: props.selectorType || 'checkbox',
}, },

7
frontend/src/views/bug-management/components/bug-detail-drawer.vue
View File

@ -127,7 +127,7 @@
:is-platform-default-template="isPlatformDefaultTemplate" :is-platform-default-template="isPlatformDefaultTemplate"
:platform-system-fields="platformSystemFields" :platform-system-fields="platformSystemFields"
:current-platform="props.currentPlatform" :current-platform="props.currentPlatform"
@update-success="updateSuccess" @update-success="detailDrawerRef?.initDetail()"
/> />
<BugCaseTab <BugCaseTab
@ -442,7 +442,6 @@
const editLoading = ref<boolean>(false); const editLoading = ref<boolean>(false);
function updateSuccess() { function updateSuccess() {
rightLoading.value = false;
emit('submit'); emit('submit');
} }
@ -785,4 +784,8 @@
// width: 100%; // width: 100%;
// word-wrap: break-word; // word-wrap: break-word;
//} //}
:deep(.arco-form-item-content) {
overflow-wrap: anywhere;
}
</style> </style>

4
frontend/src/views/bug-management/edit.vue
View File

@ -828,4 +828,8 @@
font-size: 14px; font-size: 14px;
color: var(--color-text-4); color: var(--color-text-4);
} }
:deep(.arco-form-item-content) {
overflow-wrap: anywhere;
}
</style> </style>