From 0501d1b9dfb42ef0111541ad17024ed93a04a118 Mon Sep 17 00:00:00 2001 From: teukkk Date: Tue, 9 Apr 2024 11:17:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E6=89=80=E6=9C=89CASE=E5=8E=BB=E6=8E=89=E8=81=94=E8=B0=83?= =?UTF-8?q?=E4=B8=AD=E7=8A=B6=E6=80=81&=E8=B0=83=E6=95=B4=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=94=A8=E4=BE=8Btooltip=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1038573 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038573 --- .../components/pure/ms-detail-card/index.vue | 3 ++- .../views/api-test/components/apiStatus.vue | 4 +-- .../components/management/case/caseTable.vue | 26 ++++--------------- .../case/createAndEditCaseDrawer.vue | 9 ++++--- .../components/recycle/case/caseTable.vue | 4 +-- 5 files changed, 16 insertions(+), 30 deletions(-) diff --git a/frontend/src/components/pure/ms-detail-card/index.vue b/frontend/src/components/pure/ms-detail-card/index.vue index 45b87fda7a..d0aa445a54 100644 --- a/frontend/src/components/pure/ms-detail-card/index.vue +++ b/frontend/src/components/pure/ms-detail-card/index.vue @@ -28,7 +28,7 @@
-
- +
{{ item.value || '-' }}
(); diff --git a/frontend/src/views/api-test/management/components/management/case/caseTable.vue b/frontend/src/views/api-test/management/components/management/case/caseTable.vue index c27f7ee778..ea595d5093 100644 --- a/frontend/src/views/api-test/management/components/management/case/caseTable.vue +++ b/frontend/src/views/api-test/management/components/management/case/caseTable.vue @@ -107,7 +107,7 @@ - + @@ -127,7 +127,7 @@
- + @@ -409,11 +409,11 @@ import { ApiCaseDetail } from '@/models/apiTest/management'; import { DragSortParams } from '@/models/common'; - import { RequestDefinitionStatus } from '@/enums/apiEnum'; + import { RequestCaseStatus } from '@/enums/apiEnum'; import { ReportEnum, ReportStatus } from '@/enums/reportEnum'; import { TableKeyEnum } from '@/enums/tableEnum'; - import { casePriorityOptions } from '@/views/api-test/components/config'; + import { casePriorityOptions, caseStatusOptions } from '@/views/api-test/components/config'; import type { RequestParam } from '@/views/api-test/components/requestComposition/index.vue'; import { parseRequestBodyFiles } from '@/views/api-test/components/utils'; @@ -437,9 +437,6 @@ const keyword = ref(''); - const requestCaseStatus = computed(() => - Object.values(RequestDefinitionStatus).filter((item) => item !== RequestDefinitionStatus.DEBUGGING) - ); const hasOperationPermission = computed(() => hasAnyPermission([ 'PROJECT_API_DEFINITION_CASE:READ+DELETE', @@ -872,20 +869,7 @@ case 'priority': return casePriorityOptions; case 'status': - return [ - { - label: 'apiTestManagement.processing', - value: RequestDefinitionStatus.PROCESSING, - }, - { - label: 'apiTestManagement.done', - value: RequestDefinitionStatus.DONE, - }, - { - label: 'apiTestManagement.deprecate', - value: RequestDefinitionStatus.DEPRECATED, - }, - ]; + return caseStatusOptions; default: return []; } diff --git a/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue b/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue index 72397442ae..f433405c5f 100644 --- a/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue +++ b/frontend/src/views/api-test/management/components/management/case/createAndEditCaseDrawer.vue @@ -60,7 +60,7 @@ - + @@ -95,7 +95,7 @@ import { FormInstance, Message } from '@arco-design/web-vue'; import { cloneDeep } from 'lodash-es'; - import MsDetailCard from '@/components/pure/ms-detail-card/index.vue'; + import MsDetailCard, { type Description } from '@/components/pure/ms-detail-card/index.vue'; import MsDrawer from '@/components/pure/ms-drawer/index.vue'; import MsTagsInput from '@/components/pure/ms-tags-input/index.vue'; import caseLevel from '@/components/business/ms-case-associate/caseLevel.vue'; @@ -124,7 +124,7 @@ import { AddApiCaseParams, ApiCaseDetail, ApiDefinitionDetail } from '@/models/apiTest/management'; import { EnvConfig } from '@/models/projectManagement/environmental'; - import { RequestDefinitionStatus, RequestMethods } from '@/enums/apiEnum'; + import { RequestCaseStatus, RequestMethods } from '@/enums/apiEnum'; import { casePriorityOptions, defaultResponse } from '@/views/api-test/components/config'; @@ -152,7 +152,7 @@ } } - const description = computed(() => [ + const description = computed(() => [ { key: 'type', locale: 'apiTestManagement.apiType', @@ -162,6 +162,7 @@ key: 'path', locale: 'apiTestManagement.path', value: apiDetailInfo.value.url || apiDetailInfo.value.path, + tooltipPosition: 'tr', }, ]); diff --git a/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue b/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue index c0e97fffa8..9a8bac1b8b 100644 --- a/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue +++ b/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue @@ -77,7 +77,7 @@
- + @@ -236,7 +236,7 @@ import useAppStore from '@/store/modules/app'; import { ApiCaseBatchParams, ApiCaseDetail } from '@/models/apiTest/management'; - import { RequestDefinitionStatus } from '@/enums/apiEnum'; + import { RequestCaseStatus } from '@/enums/apiEnum'; import { ReportEnum, ReportStatus } from '@/enums/reportEnum'; import { TableKeyEnum } from '@/enums/tableEnum';