From 4a480830f37dd30aa3d7ccb7681fd222d40298cb Mon Sep 17 00:00:00 2001 From: teukkk Date: Mon, 9 Sep 2024 15:01:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B):=20?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E8=AF=A6=E6=83=85=E6=94=AF=E6=8C=81=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ms-minders/caseReviewMinder/index.vue | 2 - .../pure/ms-advance-filter/filterDrawer.vue | 2 +- .../pure/ms-advance-filter/index.ts | 1 + .../src/models/caseManagement/caseReview.ts | 5 - .../components/management/api/apiTable.vue | 1 + .../case-management/caseReview/caseDetail.vue | 12 +- .../components/detail/caseTable.vue | 241 ++++++++++++------ .../caseReview/components/detail/caseTree.vue | 1 + .../case-management/caseReview/detail.vue | 16 +- 9 files changed, 182 insertions(+), 99 deletions(-) diff --git a/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue b/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue index 3329859076..383c622188 100644 --- a/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue +++ b/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue @@ -158,7 +158,6 @@ const props = defineProps<{ moduleId: string; - viewFlag: boolean; // 是否只看我的 viewStatusFlag: boolean; // 我的评审结果 reviewProgress: string; reviewPassRule: ReviewPassRule; // 评审规则 @@ -277,7 +276,6 @@ projectId: appStore.currentProjectId, moduleId: node.data?.id, reviewId: route.query.id as string, - viewFlag: props.viewFlag, viewStatusFlag: props.viewStatusFlag, }); // 移除占位的虚拟节点 diff --git a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue index ed2110016d..91c374a79c 100644 --- a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue +++ b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue @@ -404,7 +404,7 @@ const conditions = formModel.value.list.map(({ type, value, operator, customField, dataIndex }) => { let timeValue; // 转换成时间戳 - if (type === FilterType.DATE_PICKER) { + if (type === FilterType.DATE_PICKER && value?.[0] && value?.[1]) { timeValue = operator === OperatorEnum.BETWEEN ? [new Date(value[0]).getTime(), new Date(value[1]).getTime()] diff --git a/frontend/src/components/pure/ms-advance-filter/index.ts b/frontend/src/components/pure/ms-advance-filter/index.ts index 72e6679142..33cdc26951 100644 --- a/frontend/src/components/pure/ms-advance-filter/index.ts +++ b/frontend/src/components/pure/ms-advance-filter/index.ts @@ -185,4 +185,5 @@ export function getAllDataDefaultConditions(viewType: ViewTypeEnum) { // 系统视图对应不显示的第一列下拉条件 export const internalViewsHiddenConditionsMap: Record = { my_create: ['createUser'], + my_review: ['reviewId'], }; diff --git a/frontend/src/models/caseManagement/caseReview.ts b/frontend/src/models/caseManagement/caseReview.ts index 4a0cdcf417..31501cb6f4 100644 --- a/frontend/src/models/caseManagement/caseReview.ts +++ b/frontend/src/models/caseManagement/caseReview.ts @@ -117,7 +117,6 @@ export interface ReviewListQueryParams extends TableQueryParams { } // 评审详情-用例列表查询参数 export interface ReviewDetailCaseListQueryParams extends TableQueryParams { - viewFlag: boolean; // 是否只看我的 reviewId: string; viewStatusFlag?: boolean; // 我的评审状态 } @@ -132,7 +131,6 @@ export interface SortReviewCaseParams { // 评审详情-批量评审用例 export interface BatchReviewCaseParams extends BatchApiParams { reviewId: string; // 评审id - userId: string; // 用户id, 用来判断是否只看我的 reviewPassRule: ReviewPassRule; // 评审规则 status: StartReviewStatus; // 评审结果 content: string; // 评论内容 @@ -142,14 +140,12 @@ export interface BatchReviewCaseParams extends BatchApiParams { // 评审详情-批量修改评审人 export interface BatchChangeReviewerParams extends BatchApiParams { reviewId: string; // 评审id - userId: string; // 用户id, 用来判断是否只看我的 reviewerId: string[]; // 评审人员id append: boolean; // 是否追加 } // 评审详情-批量取消关联用例 export interface BatchCancelReviewCaseParams extends BatchApiParams { reviewId: string; // 评审id - userId: string; // 用户id, 用来判断是否只看我的 } export interface ReviewDetailReviewersItem { avatar: string; @@ -275,7 +271,6 @@ export interface CaseReviewMinderParams { moduleId: string; current?: number; reviewId: string; - viewFlag: boolean; // 是否只看我的 viewStatusFlag: boolean; // 我的评审结果 } diff --git a/frontend/src/views/api-test/management/components/management/api/apiTable.vue b/frontend/src/views/api-test/management/components/management/api/apiTable.vue index f7b5858d66..a015045d09 100644 --- a/frontend/src/views/api-test/management/components/management/api/apiTable.vue +++ b/frontend/src/views/api-test/management/components/management/api/apiTable.vue @@ -690,6 +690,7 @@ watch( () => [props.activeModule, props.selectedProtocols], () => { + if (isAdvancedSearchMode.value) return; resetSelector(); loadApiList(true); } diff --git a/frontend/src/views/case-management/caseReview/caseDetail.vue b/frontend/src/views/case-management/caseReview/caseDetail.vue index 0f49d48f75..5c4fa71268 100644 --- a/frontend/src/views/case-management/caseReview/caseDetail.vue +++ b/frontend/src/views/case-management/caseReview/caseDetail.vue @@ -357,7 +357,6 @@ }); }); - const viewFlag = ref(false); const onlyMineStatus = ref(false); const keyword = ref(''); const caseList = ref([]); @@ -376,7 +375,6 @@ const res = await getReviewDetailCasePage({ projectId: appStore.currentProjectId, reviewId: reviewId.value, - viewFlag: viewFlag.value, viewStatusFlag: onlyMineStatus.value, keyword: keyword.value, current: pageNation.value.current || 1, @@ -620,12 +618,11 @@ total, pageSize, current, - viewFlag: _onlyMine, keyword: _keyword, + viewId, + combineSearch, filter, - combine, sort, - searchMode, moduleIds, } = lastPageParams; pageNation.value = { @@ -633,14 +630,13 @@ pageSize, current, }; - viewFlag.value = !!_onlyMine; keyword.value = _keyword; tableFilter.value = filter; type.value = filter.status; otherListQueryParams.value = { - combine, sort, - searchMode, + viewId, + combineSearch, moduleIds, }; } else { diff --git a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue index 6efe009926..5747458be3 100644 --- a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue +++ b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue @@ -2,15 +2,17 @@