From fa94637dc7c6afdfbe4416cb0f636702651b5e2c Mon Sep 17 00:00:00 2001 From: baiqi Date: Mon, 5 Feb 2024 11:44:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=85=A8=E5=B1=80):=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/modules/case-management/caseReview.ts | 3 +- .../modules/case-management/featureCase.ts | 6 ++-- .../project-management/fileManagement.ts | 3 +- .../business/ms-case-associate/index.vue | 3 +- .../ms-common-script/formApiImportDrawer.vue | 6 +--- .../ms-link-file/associatedFileDrawer.vue | 4 +-- .../business/ms-link-file/fileTree.vue | 4 +-- .../business/ms-link-file/linkFileTable.vue | 4 +-- .../pure/ms-advance-filter/FilterForm.vue | 1 - .../pure/ms-advance-filter/index.vue | 27 ++++++++++------- .../components/pure/ms-menu-panel/index.vue | 4 +-- .../components/pure/ms-table/batchAction.vue | 8 ++--- .../src/models/caseManagement/caseReview.ts | 29 ++++++++++++++++--- frontend/src/models/common.ts | 11 +++++++ frontend/src/models/projectManagement/file.ts | 7 ----- .../src/store/modules/case/featureCase.ts | 2 +- frontend/src/utils/index.ts | 8 +++-- frontend/src/utils/permission.ts | 16 +++++++++- .../api-test/debug/components/debug/index.vue | 2 +- .../api-test/debug/components/moduleTree.vue | 2 +- frontend/src/views/api-test/debug/index.vue | 2 +- .../api-test/management/components/import.vue | 2 +- .../management/components/moduleTree.vue | 2 +- .../src/views/api-test/management/index.vue | 6 +--- frontend/src/views/base/no-project/index.vue | 2 +- .../components/caseDetailDrawer.vue | 2 +- .../components/caseTemplateDetail.vue | 3 +- .../components/caseTree.vue | 2 +- .../components/recycleCaseTable.vue | 3 +- .../tabDependency/preAndPostCaseDrawer.vue | 3 +- .../components/detail/caseTable.vue | 7 ++--- .../caseReview/components/detail/caseTree.vue | 2 +- .../components/index/moduleTree.vue | 12 ++++++-- .../components/index/reviewTable.vue | 25 ++++++++++++---- .../case-management/caseReview/create.vue | 4 +-- .../case-management/caseReview/detail.vue | 2 +- .../case-management/caseReview/index.vue | 7 +++-- .../fileManagement/components/folderTree.vue | 2 +- .../fileManagement/components/rightBox.vue | 6 +++- .../src/views/setting/system/user/index.vue | 10 +++---- .../testPlan/components/allTable.vue | 3 +- .../testPlan/components/testPlanTree.vue | 2 +- 42 files changed, 160 insertions(+), 99 deletions(-) diff --git a/frontend/src/api/modules/case-management/caseReview.ts b/frontend/src/api/modules/case-management/caseReview.ts index 485b559478..1d497660e1 100644 --- a/frontend/src/api/modules/case-management/caseReview.ts +++ b/frontend/src/api/modules/case-management/caseReview.ts @@ -38,6 +38,7 @@ import { BatchReviewCaseParams, CommitReviewResultParams, CopyReviewParams, + CopyReviewResponse, FollowReviewParams, Review, ReviewCaseItem, @@ -97,7 +98,7 @@ export const associateReviewCase = (data: AssociateReviewCaseParams) => { // 复制评审 export const copyReview = (data: CopyReviewParams) => { - return MSR.post({ url: CopyReviewUrl, data }); + return MSR.post({ url: CopyReviewUrl, data }); }; // 编辑评审 diff --git a/frontend/src/api/modules/case-management/featureCase.ts b/frontend/src/api/modules/case-management/featureCase.ts index a3cb580e73..c4ba3cbb5a 100644 --- a/frontend/src/api/modules/case-management/featureCase.ts +++ b/frontend/src/api/modules/case-management/featureCase.ts @@ -91,11 +91,11 @@ import type { PreviewImages, UpdateModule, } from '@/models/caseManagement/featureCase'; -import type { CommonList, MoveModules, TableQueryParams } from '@/models/common'; +import type { CommonList, ModuleTreeNode, MoveModules, TableQueryParams } from '@/models/common'; // 获取模块树 export function getCaseModuleTree(params: TableQueryParams) { - return MSR.get({ url: `${GetCaseModuleTreeUrl}/${params.projectId}` }); + return MSR.get({ url: `${GetCaseModuleTreeUrl}/${params.projectId}` }); } // 创建模块树 @@ -320,7 +320,7 @@ export function getPublicLinkCaseModulesCounts(data: TableQueryParams) { // 获取关联用例接口模块树 export function getPublicLinkModuleTree(data: TableQueryParams) { - return MSR.post({ url: GetAssociationPublicModuleTreeUrl, data }); + return MSR.post({ url: GetAssociationPublicModuleTreeUrl, data }); } // 关联用例 export function associationPublicCase(data: TableQueryParams) { diff --git a/frontend/src/api/modules/project-management/fileManagement.ts b/frontend/src/api/modules/project-management/fileManagement.ts index 55686ce7a7..85e5db9149 100644 --- a/frontend/src/api/modules/project-management/fileManagement.ts +++ b/frontend/src/api/modules/project-management/fileManagement.ts @@ -30,7 +30,7 @@ import { UploadFileUrl, } from '@/api/requrls/project-management/fileManagement'; -import type { CommonList } from '@/models/common'; +import type { CommonList, ModuleTreeNode } from '@/models/common'; import type { AddModuleParams, AddRepositoryFileParams, @@ -42,7 +42,6 @@ import type { FileItem, FileListQueryParams, ModuleCount, - ModuleTreeNode, MoveModuleParams, Repository, RepositoryInfo, diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index 8989563156..897a322a8c 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -159,8 +159,7 @@ import { mapTree } from '@/utils'; import type { CaseManagementTable } from '@/models/caseManagement/featureCase'; - import type { CommonList, TableQueryParams } from '@/models/common'; - import { ModuleTreeNode } from '@/models/projectManagement/file'; + import type { CommonList, ModuleTreeNode, TableQueryParams } from '@/models/common'; import { CaseManagementRouteEnum } from '@/enums/routeEnum'; import type { CaseLevel } from './types'; diff --git a/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue b/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue index acee9397f9..368ae32522 100644 --- a/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue +++ b/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue @@ -105,13 +105,9 @@ getFormApiImportPageList, } from '@/api/modules/project-management/commonScript'; import { useI18n } from '@/hooks/useI18n'; - import useAppStore from '@/store/modules/app'; import { mapTree } from '@/utils'; - import type { TableQueryParams } from '@/models/common'; - import { ModuleTreeNode } from '@/models/projectManagement/file'; - - const appStore = useAppStore(); + import type { ModuleTreeNode, TableQueryParams } from '@/models/common'; const { t } = useI18n(); diff --git a/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue b/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue index acd4242a83..e5a10d9304 100644 --- a/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue +++ b/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue @@ -92,8 +92,8 @@ import { useI18n } from '@/hooks/useI18n'; import type { AssociatedList } from '@/models/caseManagement/featureCase'; - import type { CommonList, TableQueryParams } from '@/models/common'; - import { FileListQueryParams, ModuleTreeNode, Repository } from '@/models/projectManagement/file'; + import type { CommonList, ModuleTreeNode, TableQueryParams } from '@/models/common'; + import { FileListQueryParams, Repository } from '@/models/projectManagement/file'; const { t } = useI18n(); diff --git a/frontend/src/components/business/ms-link-file/fileTree.vue b/frontend/src/components/business/ms-link-file/fileTree.vue index 79f533e381..cf9ba2b9a7 100644 --- a/frontend/src/components/business/ms-link-file/fileTree.vue +++ b/frontend/src/components/business/ms-link-file/fileTree.vue @@ -41,7 +41,7 @@