diff --git a/frontend/src/api/modules/bug-management/index.ts b/frontend/src/api/modules/bug-management/index.ts index 156e95368c..69eefcd595 100644 --- a/frontend/src/api/modules/bug-management/index.ts +++ b/frontend/src/api/modules/bug-management/index.ts @@ -1,7 +1,7 @@ import MSR from '@/api/http/index'; import * as bugURL from '@/api/requrls/bug-management'; -import { BugExportParams, BugListItem } from '@/models/bug-management'; +import { BugExportParams, BugListItem, DefaultTemplate } from '@/models/bug-management'; import { CommonList, TableQueryParams, TemplateOption } from '@/models/common'; /** @@ -22,7 +22,7 @@ export function updateBatchBug(data: TableQueryParams) { } export function createBug(data: TableQueryParams) { - return MSR.post({ url: bugURL.postCreateBugUrl, data }); + return MSR.uploadFile({ url: bugURL.postCreateBugUrl }, { request: data.request, fileList: data.fileList }, ''); } export function deleteSingleBug(data: TableQueryParams) { @@ -44,6 +44,10 @@ export function getTemplateById(data: TableQueryParams) { export function getExportConfig(projectId: string) { return MSR.get({ url: `${bugURL.getExportConfigUrl}${projectId}` }); } +// 获取模版详情 +export function getTemplateDetailInfo(data: DefaultTemplate) { + return MSR.post({ url: `${bugURL.getTemplateDetailUrl}`, data }); +} // 同步缺陷 export function syncBugOpenSource(params: { projectId: string }) { diff --git a/frontend/src/api/modules/case-management/caseReview.ts b/frontend/src/api/modules/case-management/caseReview.ts index 77a3ae689a..5785aad75e 100644 --- a/frontend/src/api/modules/case-management/caseReview.ts +++ b/frontend/src/api/modules/case-management/caseReview.ts @@ -7,6 +7,7 @@ import { DeleteReviewModuleUrl, EditReviewUrl, FollowReviewUrl, + GetAssociatedIdsUrl, GetReviewDetailUrl, GetReviewListUrl, GetReviewModulesUrl, @@ -107,3 +108,8 @@ export const getReviewDetail = (id: string) => { export const getReviewUsers = (projectId: string, keyword: string) => { return MSR.get({ url: `${GetReviewUsersUrl}/${projectId}`, params: { keyword } }); }; + +// 获取评审人员列表 +export const getAssociatedIds = (reviewId: string) => { + return MSR.get({ url: `${GetAssociatedIdsUrl}/${reviewId}` }); +}; diff --git a/frontend/src/api/modules/case-management/featureCase.ts b/frontend/src/api/modules/case-management/featureCase.ts index d4aef74070..d3ff402272 100644 --- a/frontend/src/api/modules/case-management/featureCase.ts +++ b/frontend/src/api/modules/case-management/featureCase.ts @@ -8,6 +8,7 @@ import { BatchEditCaseUrl, BatchMoveCaseUrl, CancelAssociationDemandUrl, + checkFileIsUpdateUrl, CreateCaseModuleTreeUrl, CreateCaseUrl, CreateCommentItemUrl, @@ -26,6 +27,8 @@ import { GetCommentListUrl, GetDefaultTemplateFieldsUrl, GetDemandListUrl, + GetDetailCaseReviewUrl, + GetFileIsUpdateUrl, GetRecycleCaseListUrl, GetRecycleCaseModulesCountUrl, GetSearchCustomFieldsUrl, @@ -215,13 +218,22 @@ export function getTransferFileTree(projectId: string) { // 预览文件 export function previewFile(data: OperationFile) { - return MSR.post({ url: PreviewFileUrl, data }); + return MSR.post({ url: PreviewFileUrl, data, responseType: 'blob' }, { isTransformResponse: false }); } // 下载文件 export function downloadFileRequest(data: OperationFile) { return MSR.post({ url: DownloadFileUrl, data, responseType: 'blob' }, { isTransformResponse: false }); } +// 检查文件是否更新 +export function checkFileIsUpdateRequest(data: string[]) { + return MSR.post({ url: checkFileIsUpdateUrl, data }); +} + +// 更新文件 +export function updateFile(projectId: string, id: string) { + return MSR.get({ url: `${GetFileIsUpdateUrl}/${projectId}/${id}` }); +} // 删除文件或取消关联用例文件 export function deleteFileOrCancelAssociation(data: OperationFile) { @@ -252,4 +264,9 @@ export function DeleteCommentList(commentId: string) { return MSR.post({ url: `${DeleteCommentItemUrl}/${commentId}` }); } +// 评审 +export function getDetailCaseReviewPage(data: TableQueryParams) { + return MSR.post>({ url: GetDetailCaseReviewUrl, data }); +} + export default {}; diff --git a/frontend/src/api/requrls/bug-management.ts b/frontend/src/api/requrls/bug-management.ts index 6f740660c1..131a141f8f 100644 --- a/frontend/src/api/requrls/bug-management.ts +++ b/frontend/src/api/requrls/bug-management.ts @@ -7,5 +7,6 @@ export const postBatchDeleteBugUrl = '/bug/batch-delete'; export const getTemplateUrl = '/bug/template'; export const getTemplageOption = '/bug/template/option'; export const getExportConfigUrl = '/bug/export/columns/'; +export const getTemplateDetailUrl = '/bug/template/detail'; export const getSyncBugOpenSourceUrl = '/bug/sync/'; export const postExportBugUrl = '/bug/export'; diff --git a/frontend/src/api/requrls/case-management/caseReview.ts b/frontend/src/api/requrls/case-management/caseReview.ts index 2120bdb753..5f2e5971d1 100644 --- a/frontend/src/api/requrls/case-management/caseReview.ts +++ b/frontend/src/api/requrls/case-management/caseReview.ts @@ -13,3 +13,4 @@ export const MoveReviewModuleUrl = '/case/review/module/move'; // 移动评审 export const AddReviewModuleUrl = '/case/review/module/add'; // 新增评审模块 export const GetReviewModulesUrl = '/case/review/module/tree'; // 获取评审模块树 export const DeleteReviewModuleUrl = '/case/review/module/delete'; // 删除评审模块 +export const GetAssociatedIdsUrl = '/case/review/detail/get-ids'; // 获取已关联用例id集合 diff --git a/frontend/src/api/requrls/case-management/featureCase.ts b/frontend/src/api/requrls/case-management/featureCase.ts index efabac8ce5..45f9c8624e 100644 --- a/frontend/src/api/requrls/case-management/featureCase.ts +++ b/frontend/src/api/requrls/case-management/featureCase.ts @@ -85,6 +85,10 @@ export const DownloadFileUrl = '/attachment/download'; export const deleteFileOrCancelAssociationUrl = '/attachment/delete/file'; // 获取转存目录 export const getTransferTreeUrl = '/attachment/options'; +// 附件是否更新 +export const GetFileIsUpdateUrl = '/attachment/update'; +// 检查文件是否更新 +export const checkFileIsUpdateUrl = '/attachment/check-update'; // 评论列表 export const GetCommentListUrl = '/functional/case/comment/get/list'; @@ -94,5 +98,7 @@ export const CreateCommentItemUrl = '/functional/case/comment/save'; export const UpdateCommentItemUrl = '/functional/case/comment/update'; // 删除评论 export const DeleteCommentItemUrl = '/functional/case/comment/delete'; +// 获取详情用例评审 +export const GetDetailCaseReviewUrl = '/functional/case/review/page'; export default {}; diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index 1fcd0445de..05239a5639 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -9,11 +9,14 @@ @@ -21,7 +24,7 @@
- + {{ item }}
@@ -34,8 +37,8 @@
-
{{ t('caseManagement.caseReview.allReviews') }}
-
({{ allCaseCount }})
+
{{ t('caseManagement.featureCase.allCase') }}
+
({{ props.modulesCount['all'] }})
@@ -69,6 +72,7 @@
- + {{ t('common.cancel') }} {{ t('ms.case.associate.associate') }} @@ -123,11 +127,10 @@ diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue index 61afb8332e..dde4b7e7d6 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue @@ -135,7 +135,7 @@ } onMounted(() => { - getFetch(); + // getFetch(); }); diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue index 3299a55ff8..38850abded 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue @@ -34,9 +34,16 @@
-