feat(用例管理): 功能用例回收站列表增加删除人和删除时间
--bug=1036281 --user=宋天阳 【用例管理】回收站-表头字段-缺少删除时间、删除人字段 https://www.tapd.cn/55049933/s/1465544
This commit is contained in:
parent
bd24fbf7b4
commit
28c7f3abbb
|
@ -581,7 +581,7 @@ public class FunctionalCaseService {
|
|||
functionalCasePageDTO.setCustomFields(collect.get(functionalCasePageDTO.getId()));
|
||||
functionalCasePageDTO.setCreateUserName(userMap.get(functionalCasePageDTO.getCreateUser()));
|
||||
functionalCasePageDTO.setUpdateUserName(userMap.get(functionalCasePageDTO.getUpdateUser()));
|
||||
functionalCasePageDTO.setDeleteUserName(userMap.get(functionalCasePageDTO.getDeleteUserName()));
|
||||
functionalCasePageDTO.setDeleteUserName(userMap.get(functionalCasePageDTO.getDeleteUser()));
|
||||
});
|
||||
return functionalCaseLists;
|
||||
|
||||
|
|
|
@ -148,6 +148,19 @@
|
|||
</template>
|
||||
</TableFilter>
|
||||
</template>
|
||||
<template #deleteUserFilter="{ columnConfig }">
|
||||
<TableFilter
|
||||
v-model:visible="deleteUserFilterVisible"
|
||||
v-model:status-filters="deleteUserFilters"
|
||||
:title="(columnConfig.title as string)"
|
||||
:list="memberOptions"
|
||||
@search="initRecycleList()"
|
||||
>
|
||||
<template #item="{ item }">
|
||||
{{ item.label }}
|
||||
</template>
|
||||
</TableFilter>
|
||||
</template>
|
||||
<template #reviewStatus="{ record }">
|
||||
<MsIcon
|
||||
:type="statusIconMap[record.reviewStatus]?.icon || ''"
|
||||
|
@ -439,6 +452,25 @@
|
|||
width: 200,
|
||||
showDrag: true,
|
||||
},
|
||||
{
|
||||
title: 'caseManagement.featureCase.tableColumnDeleteUser',
|
||||
dataIndex: 'deleteUserName',
|
||||
titleSlotName: 'deleteUserFilter',
|
||||
showInTable: true,
|
||||
width: 200,
|
||||
showDrag: true,
|
||||
},
|
||||
{
|
||||
title: 'caseManagement.featureCase.tableColumnDeleteTime',
|
||||
slotName: 'deleteTime',
|
||||
dataIndex: 'deleteTime',
|
||||
showInTable: true,
|
||||
sortable: {
|
||||
sortDirections: ['ascend', 'descend'],
|
||||
},
|
||||
width: 200,
|
||||
showDrag: true,
|
||||
},
|
||||
{
|
||||
title: 'caseManagement.featureCase.tableColumnActions',
|
||||
slotName: 'operation',
|
||||
|
@ -588,6 +620,7 @@
|
|||
const executeResultFilters = ref(Object.keys(executionResultMap));
|
||||
const updateUserFilters = ref<string[]>([]);
|
||||
const createUserFilters = ref<string[]>([]);
|
||||
const deleteUserFilters = ref<string[]>([]);
|
||||
|
||||
function getExecuteResultList() {
|
||||
const list: any = [];
|
||||
|
@ -614,6 +647,7 @@
|
|||
lastExecuteResult: executeResultFilters.value,
|
||||
updateUserName: updateUserFilters.value,
|
||||
createUserName: createUserFilters.value,
|
||||
deleteUserName: deleteUserFilters.value,
|
||||
},
|
||||
condition: {
|
||||
keyword: keyword.value,
|
||||
|
@ -634,6 +668,7 @@
|
|||
lastExecuteResult: executeResultFilters.value,
|
||||
updateUserName: updateUserFilters.value,
|
||||
createUserName: createUserFilters.value,
|
||||
deleteUserName: deleteUserFilters.value
|
||||
},
|
||||
condition: {
|
||||
keyword: keyword.value,
|
||||
|
@ -666,6 +701,7 @@
|
|||
const executeResultFilterVisible = ref(false);
|
||||
const updateUserFilterVisible = ref(false);
|
||||
const createUserFilterVisible = ref(false);
|
||||
const deleteUserFilterVisible = ref(false);
|
||||
|
||||
// 初始化回收站列表
|
||||
async function initRecycleList() {
|
||||
|
|
|
@ -45,6 +45,8 @@ export default {
|
|||
'caseManagement.featureCase.tableColumnCreateTime': 'CreateTime',
|
||||
'caseManagement.featureCase.tableColumnUpdateUser': 'UpdateUser',
|
||||
'caseManagement.featureCase.tableColumnUpdateTime': 'UpdateTime',
|
||||
'caseManagement.featureCase.tableColumnDeleteUser': 'DeleteUser',
|
||||
'caseManagement.featureCase.tableColumnDeleteTime': 'DeleteTime',
|
||||
'caseManagement.featureCase.tableColumnActions': 'operation',
|
||||
'caseManagement.featureCase.beforeDeleteCase':
|
||||
'The deleted content will be put into the recycle bin, where data can be recovered',
|
||||
|
|
|
@ -44,6 +44,8 @@ export default {
|
|||
'caseManagement.featureCase.tableColumnCreateTime': '创建时间',
|
||||
'caseManagement.featureCase.tableColumnUpdateUser': '更新人',
|
||||
'caseManagement.featureCase.tableColumnUpdateTime': '更新时间',
|
||||
'caseManagement.featureCase.tableColumnDeleteUser': '删除人',
|
||||
'caseManagement.featureCase.tableColumnDeleteTime': '删除时间',
|
||||
'caseManagement.featureCase.tableColumnActions': '操作',
|
||||
'caseManagement.featureCase.beforeDeleteCase': '删除后的内容将放入回收站,可在回收站内进行恢复数据',
|
||||
'caseManagement.featureCase.deleteCaseTitle': '确认删除 {name} 用例 ?',
|
||||
|
|
Loading…
Reference in New Issue