diff --git a/frontend/src/api/modules/case-management/featureCase.ts b/frontend/src/api/modules/case-management/featureCase.ts index 227a62e75b..40581b168e 100644 --- a/frontend/src/api/modules/case-management/featureCase.ts +++ b/frontend/src/api/modules/case-management/featureCase.ts @@ -1,6 +1,7 @@ import MSR from '@/api/http/index'; import { AddDemandUrl, + AddDependOnRelationUrl, BatchAssociationDemandUrl, BatchCopyCaseUrl, BatchDeleteCaseUrl, @@ -21,12 +22,17 @@ import { DownloadFileUrl, FollowerCaseUrl, GetAssociatedFilePageUrl, + GetAssociationPublicCaseModuleCountUrl, + GetAssociationPublicCasePageUrl, + GetAssociationPublicModuleTreeUrl, GetCaseListUrl, GetCaseModulesCountUrl, GetCaseModuleTreeUrl, GetCommentListUrl, GetDefaultTemplateFieldsUrl, GetDemandListUrl, + GetDependOnPageUrl, + GetDependOnRelationUrl, GetDetailCaseReviewUrl, GetFileIsUpdateUrl, GetRecycleCaseListUrl, @@ -67,8 +73,8 @@ import type { import type { CommonList, MoveModules, TableQueryParams } from '@/models/common'; import type { UserListItem } from '@/models/setting/user'; // 获取模块树 -export function getCaseModuleTree(projectId: string) { - return MSR.get({ url: `${GetCaseModuleTreeUrl}/${projectId}` }); +export function getCaseModuleTree(params: TableQueryParams) { + return MSR.get({ url: `${GetCaseModuleTreeUrl}/${params.projectId}` }); } // 创建模块树 @@ -157,7 +163,7 @@ export function getRecycleModulesCounts(data: CaseModuleQueryParams) { return MSR.post({ url: GetRecycleCaseModulesCountUrl, data }); } // 获取全部用例模块数量 -export function getCaseModulesCounts(data: CaseModuleQueryParams) { +export function getCaseModulesCounts(data: TableQueryParams) { return MSR.post({ url: GetCaseModulesCountUrl, data }); } // 批量恢复回收站用例表 @@ -276,4 +282,31 @@ export function getReviewerList(projectId: string, keyword: string) { return MSR.get({ url: `${GetReviewerListUrl}/${projectId}`, params: { keyword } }); } +// 用例接口用例分页列表 +export function getPublicLinkCaseList(data: TableQueryParams) { + return MSR.post>({ url: GetAssociationPublicCasePageUrl, data }); +} + +// 获取用例详情接口用例模块数量 +export function getPublicLinkCaseModulesCounts(data: TableQueryParams) { + return MSR.post({ url: GetAssociationPublicCaseModuleCountUrl, data }); +} + +// 获取关联用例接口模块树 +export function getPublicLinkModuleTree(data: TableQueryParams) { + return MSR.post({ url: `${GetAssociationPublicModuleTreeUrl}`, data }); +} + +// 获取前后置用例 +export function getDependOnCase(data: TableQueryParams) { + return MSR.post>({ url: `${GetDependOnPageUrl}`, data }); +} +// 用例管理-功能用例-用例详情-前后置关系 +export function getPrepositionRelation(data: TableQueryParams) { + return MSR.post>({ url: `${GetDependOnRelationUrl}`, data }); +} +// 添加前后置关系 +export function addPrepositionRelation(data: TableQueryParams) { + return MSR.post({ url: `${AddDependOnRelationUrl}`, data }); +} export default {}; diff --git a/frontend/src/api/requrls/case-management/featureCase.ts b/frontend/src/api/requrls/case-management/featureCase.ts index d6cd0b4bb3..5afd8acba4 100644 --- a/frontend/src/api/requrls/case-management/featureCase.ts +++ b/frontend/src/api/requrls/case-management/featureCase.ts @@ -102,5 +102,15 @@ export const DeleteCommentItemUrl = '/functional/case/comment/delete'; export const GetDetailCaseReviewUrl = '/functional/case/review/page'; // 获取有权限的评审人 export const GetReviewerListUrl = '/case/review/user-option'; - -export default {}; +// 获取用例详情弹窗关联用例接口用例 +export const GetAssociationPublicCasePageUrl = '/functional/case/test/associate/case/page'; +// 获取接口测试接口模块数量 +export const GetAssociationPublicCaseModuleCountUrl = '/functional/case/test/associate/case/module/count'; +// 获取用例详情接口模块树 +export const GetAssociationPublicModuleTreeUrl = '/functional/case/test/associate/case/module/tree'; +// 获取前后置用例列表 +export const GetDependOnPageUrl = '/functional/case/relationship/page'; +// 用例管理-功能用例-用例详情-前后置关系 +export const GetDependOnRelationUrl = '/functional/case/relationship/relate/page'; +// 添加前后置关系 +export const AddDependOnRelationUrl = '/functional/case/relationship/add'; diff --git a/frontend/src/views/case-management/caseManagementFeature/components/addAttachment.vue b/frontend/src/components/business/ms-add-attachment/index.vue similarity index 100% rename from frontend/src/views/case-management/caseManagementFeature/components/addAttachment.vue rename to frontend/src/components/business/ms-add-attachment/index.vue diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index 05239a5639..00315b64ea 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -5,6 +5,7 @@ :width="1200" :footer="false" no-content-padding + unmount-on-close > diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue index caddb034cd..e7b5be5504 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue @@ -12,14 +12,15 @@
{{ t('caseManagement.featureCase.allCase') }}
-
({{ allFileCount }})
+
({{ modulesCount['all'] }})
@@ -46,7 +51,7 @@
{{ activeFolderName }}
-
({{ activeFolderName }})
+
({{ modulesCount[activeFolder] }})
@@ -84,7 +89,12 @@ {{ t('common.cancel') }} - + {{ t('common.add') }} @@ -104,29 +114,36 @@ import { MsTableColumn } from '@/components/pure/ms-table/type'; import useTable from '@/components/pure/ms-table/useTable'; import caseLevel from '@/components/business/ms-case-associate/caseLevel.vue'; + import type { CaseLevel } from '@/components/business/ms-case-associate/types'; import MsTree from '@/components/business/ms-tree/index.vue'; import type { MsTreeNodeData } from '@/components/business/ms-tree/types'; - import { getModules } from '@/api/modules/project-management/fileManagement'; + import { + addPrepositionRelation, + getCaseModulesCounts, + getCaseModuleTree, + getPrepositionRelation, + } from '@/api/modules/case-management/featureCase'; import { useI18n } from '@/hooks/useI18n'; import useAppStore from '@/store/modules/app'; import { mapTree } from '@/utils'; + import type { CaseManagementTable, CaseModuleQueryParams } from '@/models/caseManagement/featureCase'; + import type { TableQueryParams } from '@/models/common'; import { ModuleTreeNode } from '@/models/projectManagement/file'; const appStore = useAppStore(); + const currentProjectId = computed(() => appStore.currentProjectId); const { t } = useI18n(); const props = defineProps<{ visible: boolean; showType: 'preposition' | 'postPosition'; + caseId: string; }>(); const emit = defineEmits<{ (e: 'update:visible', val: boolean): void; - (e: 'update:project', val: string): void; - (e: 'init', val: string[]): void; - (e: 'folderNodeSelect', ids: (string | number)[], springIds: string[]): void; (e: 'success', val: string[]): void; (e: 'close'): void; }>(); @@ -140,13 +157,11 @@ }, }); - const selectedModuleKeys = ref([]); - const title = computed(() => { return props.showType === 'preposition' ? '添加前置用例' : '添加后置用例'; }); - const folderTree = ref([]); + const caseTree = ref([]); const moduleLoading = ref(false); const moduleKeyword = ref(''); @@ -159,20 +174,30 @@ const activeFolder = ref('all'); const activeFolderName = ref(t('ms.case.associate.allCase')); + const offspringIds = ref([]); + const modulesCount = ref>({}); + + // 选中节点 + const selectedNodeKeys = computed({ + get: () => [activeFolder.value], + set: (val) => val, + }); /** * 处理文件夹树节点选中事件 */ - function folderNodeSelect(_selectedKeys: (string | number)[], node: MsTreeNodeData) { - selectedModuleKeys.value = _selectedKeys as string[]; + const focusNodeKey = ref(''); + + function caseNodeSelect(_selectedKeys: (string | number)[], node: MsTreeNodeData) { + [activeFolder.value] = _selectedKeys as string[]; activeFolder.value = node.id; activeFolderName.value = node.name; - const offspringIds: string[] = []; + offspringIds.value = []; mapTree(node.children || [], (e) => { - offspringIds.push(e.id); + offspringIds.value.push(e.id); return e; }); - emit('folderNodeSelect', _selectedKeys, offspringIds); + focusNodeKey.value = ''; } const allFileCount = ref(0); @@ -183,8 +208,6 @@ function setActiveFolder(id: string) { activeFolder.value = id; activeFolderName.value = t('ms.case.associate.allCase'); - selectedModuleKeys.value = []; - emit('folderNodeSelect', [id], []); } const keyword = ref(''); const version = ref(''); @@ -212,7 +235,7 @@ sortable: { sortDirections: ['ascend', 'descend'], }, - width: 90, + width: 200, }, { title: 'caseManagement.featureCase.tableColumnName', @@ -221,7 +244,7 @@ sortDirections: ['ascend', 'descend'], }, showTooltip: true, - width: 200, + width: 300, }, { title: 'ms.case.associate.caseLevel', @@ -241,85 +264,8 @@ }, ]; - const { propsRes, propsEvent, loadList, setLoadListParams } = useTable( - () => - Promise.resolve({ - list: [ - { - id: 'ded3d43', - name: '测试评审1', - creator: '张三', - reviewer: '李四', - module: '模块1', - caseLevel: 0, // 未开始、进行中、已完成、已归档 - caseCount: 100, - passCount: 0, - failCount: 10, - reviewCount: 20, - reviewingCount: 25, - tags: ['标签1', '标签2'], - type: 'single', - desc: 'douifd9304', - cycle: [1700200794229, 1700200994229], - }, - { - id: 'g545hj4', - name: '测试评审2', - creator: '张三', - reviewer: '李四', - module: '模块1', - caseLevel: 1, // 未开始、进行中、已完成、已归档 - caseCount: 105, - passCount: 50, - failCount: 10, - reviewCount: 20, - reviewingCount: 25, - tags: ['标签1', '标签2'], - type: 'single', - desc: 'douifd9304', - cycle: [1700200794229, 1700200994229], - }, - { - id: 'hj65b54', - name: '测试评审3', - creator: '张三', - reviewer: '李四', - module: '模块1', - caseLevel: 2, // 未开始、进行中、已完成、已归档 - caseCount: 125, - passCount: 70, - failCount: 10, - reviewCount: 20, - reviewingCount: 25, - passRate: '80%', - tags: ['标签1', '标签2'], - type: 'single', - desc: 'douifd9304', - cycle: [1700200794229, 1700200994229], - }, - { - id: 'wefwefw', - name: '测试评审4', - creator: '张三', - reviewer: '李四', - module: '模块1', - caseLevel: 3, // 未开始、进行中、已完成、已归档 - caseCount: 130, - passCount: 70, - failCount: 10, - reviewCount: 0, - reviewingCount: 50, - passRate: '80%', - tags: ['标签1', '标签2'], - type: 'single', - desc: 'douifd9304', - cycle: [1700200794229, 1700200994229], - }, - ], - current: 1, - pageSize: 10, - total: 2, - }), + const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable( + getPrepositionRelation, { columns, scroll: { @@ -329,30 +275,30 @@ selectable: true, showSelectAll: true, }, - (item) => { + (record) => { return { - ...item, - tags: item.tags?.map((e: string) => ({ id: e, name: e })) || [], + ...record, + tags: (JSON.parse(record.tags) || []).map((item: string, i: number) => { + return { + id: `${record.id}-${i}`, + name: item, + }; + }), }; } ); - const loading = ref(false); - - async function handleConfirm() { - try { - loading.value = true; - Message.success(t('ms.case.associate.associateSuccess')); - innerVisible.value = false; - emit('success', Array.from(propsRes.value.selectedKeys)); - } catch (error) { - // eslint-disable-next-line no-console - console.log(error); - } finally { - loading.value = false; + // 用例等级 + function getCaseLevel(record: CaseManagementTable) { + const caseLevelRes = record.customFields.find((item: any) => item.name === '用例等级'); + if (caseLevelRes) { + return JSON.parse(caseLevelRes.value).replaceAll('P', '') * 1; } + return 0; } + const loading = ref(false); + function cancel() { innerVisible.value = false; emit('close'); @@ -361,26 +307,24 @@ * 初始化模块树 * @param isSetDefaultKey 是否设置第一个节点为选中节点 */ + + const selectedKeysNode = ref<(string | number)[]>([]); async function initModules(isSetDefaultKey = false) { try { moduleLoading.value = true; - const res = await getModules(appStore.currentProjectId); - folderTree.value = res; + const res = await getCaseModuleTree({ projectId: appStore.currentProjectId }); + caseTree.value = mapTree(res, (e) => { + return { + ...e, + hideMoreAction: e.id === 'root', + draggable: false, + disabled: false, + count: modulesCount.value?.[e.id] || 0, + }; + }); if (isSetDefaultKey) { - selectedModuleKeys.value = [folderTree.value[0].id]; - activeFolderName.value = folderTree.value[0].name; - const offspringIds: string[] = []; - mapTree(folderTree.value[0].children || [], (e) => { - offspringIds.push(e.id); - return e; - }); - - emit('folderNodeSelect', selectedModuleKeys.value, offspringIds); + selectedKeysNode.value = [caseTree.value[0].id]; } - emit( - 'init', - folderTree.value.map((e) => e.name) - ); } catch (error) { // eslint-disable-next-line no-console console.log(error); @@ -388,17 +332,115 @@ moduleLoading.value = false; } } + /** + * @param 获取回收站模块 + */ - function searchCase() { - setLoadListParams({ - version: version.value, - keyword: keyword.value, - }); - loadList(); + // 回收站模块树count参数 + const emitTableParams: CaseModuleQueryParams = { + keyword: keyword.value, + moduleIds: [], + projectId: currentProjectId.value, + current: propsRes.value.msPagination?.current, + pageSize: propsRes.value.msPagination?.pageSize, + }; + + async function getModulesCount() { + try { + modulesCount.value = await getCaseModulesCounts(emitTableParams); + } catch (error) { + console.log(error); + } } - onBeforeMount(() => { - searchCase(); + const searchParams = ref({ + projectId: currentProjectId.value, + moduleIds: [], + }); + + // 获取用例参数 + function getLoadListParams() { + if (activeFolder.value === 'all') { + searchParams.value.moduleIds = []; + } else { + searchParams.value.moduleIds = [activeFolder.value, ...offspringIds.value]; + } + setLoadListParams({ + ...searchParams.value, + keyword: keyword.value, + id: props.caseId, + type: props.showType === 'preposition' ? 'PRE' : 'POST', + }); + } + + const setFocusKey = (node: MsTreeNodeData) => { + focusNodeKey.value = node.id || ''; + }; + + function searchCase() { + getLoadListParams(); + loadList(); + getModulesCount(); + } + + async function handleConfirm() { + loading.value = true; + try { + const { excludeKeys, selectedKeys, selectorStatus } = propsRes.value; + const { versionId, moduleIds } = searchParams.value; + const params = { + id: props.caseId, + excludeIds: [...excludeKeys], + selectIds: selectorStatus === 'all' ? [] : [...selectedKeys], + selectAll: selectorStatus === 'all', + moduleIds, + versionId, + refId: '', + type: props.showType === 'preposition' ? 'PRE' : 'POST', + projectId: currentProjectId.value, + }; + await addPrepositionRelation(params); + Message.success(t('common.addSuccess')); + innerVisible.value = false; + resetSelector(); + } catch (error) { + // eslint-disable-next-line no-console + console.log(error); + } finally { + loading.value = false; + } + } + + watch( + () => innerVisible.value, + (val) => { + if (val) { + searchCase(); + } + } + ); + + watch( + () => modulesCount.value, + (obj) => { + caseTree.value = mapTree(caseTree.value, (node) => { + return { + ...node, + count: obj?.[node.id] || 0, + }; + }); + } + ); + + watch( + () => activeFolder.value, + () => { + searchCase(); + } + ); + + onMounted(() => { + resetSelector(); }); defineExpose({ diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/tabDependency.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/tabDependency.vue index 5d175ef4ee..39b47d7921 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/tabDependency.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/tabDependency.vue @@ -10,7 +10,7 @@
- + {{ t('caseManagement.featureCase.preCase') }} @@ -26,7 +26,7 @@ >
- + @@ -39,20 +39,7 @@
- - - - - + @@ -65,16 +52,21 @@ import useTable from '@/components/pure/ms-table/useTable'; import PreAndPostCaseDrawer from './preAndPostCaseDrawer.vue'; - import { getRecycleListRequest } from '@/api/modules/case-management/featureCase'; + import { getDependOnCase } from '@/api/modules/case-management/featureCase'; import { useI18n } from '@/hooks/useI18n'; + import { useAppStore } from '@/store'; - import { TableKeyEnum } from '@/enums/tableEnum'; + const appStore = useAppStore(); export type types = 'preposition' | 'postPosition'; + const currentProjectId = computed(() => appStore.currentProjectId); const showType = ref('preposition'); const { t } = useI18n(); const keyword = ref(''); + const props = defineProps<{ + caseId: string; + }>(); const columns: MsTableColumn = [ { @@ -84,7 +76,6 @@ showInTable: true, showTooltip: true, ellipsis: true, - showDrag: false, }, { title: 'caseManagement.featureCase.tableColumnName', @@ -94,7 +85,6 @@ showTooltip: true, width: 300, ellipsis: true, - showDrag: false, }, { title: 'caseManagement.featureCase.tableColumnVersion', @@ -104,7 +94,6 @@ showTooltip: true, width: 300, ellipsis: true, - showDrag: false, }, { title: 'caseManagement.featureCase.tableColumnCreateUser', @@ -114,7 +103,6 @@ showTooltip: true, width: 300, ellipsis: true, - showDrag: false, }, { title: 'caseManagement.featureCase.tableColumnActions', @@ -123,47 +111,29 @@ fixed: 'right', width: 140, showInTable: true, - showDrag: false, }, ]; - const { - propsRes: prePropsRes, - propsEvent: preTableEvent, - loadList: loadPreList, - setLoadListParams: setPreListParams, - } = useTable(getRecycleListRequest, { + const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(getDependOnCase, { columns, - tableKey: TableKeyEnum.CASE_MANAGEMENT_TAB_DEPENDENCY_PRE_CASE, - scroll: { x: '100%' }, - heightUsed: 340, - enableDrag: true, - }); - - const { - propsRes: postPropsRes, - propsEvent: postTableEvent, - loadList: loadPostList, - setLoadListParams: setPostListParams, - } = useTable(getRecycleListRequest, { - columns, - tableKey: TableKeyEnum.CASE_MANAGEMENT_TAB_DEPENDENCY_POST_CASE, scroll: { x: '100%' }, heightUsed: 340, + selectable: false, + noDisable: true, + showSetting: false, enableDrag: true, }); // 取消依赖 function cancelDependency(record: any) {} - function getFetch() { - if (showType.value === 'preposition') { - setPreListParams({ keyword: keyword.value }); - loadPreList(); - } else { - setPostListParams({ keyword: keyword.value }); - loadPostList(); - } + function getParams() { + setLoadListParams({ + projectId: currentProjectId.value, + keyword: keyword.value, + type: showType.value === 'preposition' ? 'PRE' : 'POST', + id: props.caseId, + }); } const showDrawer = ref(false); @@ -176,12 +146,16 @@ watch( () => showType.value, - (val) => { - if (val) { - getFetch(); - } + () => { + getParams(); + loadList(); } ); + + onBeforeMount(() => { + getParams(); + loadList(); + }); diff --git a/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue b/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue index d7255eb8ae..f1c2a12794 100644 --- a/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue +++ b/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue @@ -1,16 +1,18 @@