From 67cdb0ddc3dff460ecc00d0ffab97f70e48ffcae Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Wed, 11 Dec 2024 18:10:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A1=A5=E5=85=85TS=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E9=83=A8=E5=88=86TODO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/modules/test-plan/testPlan.ts         |  3 ++-
 .../src/components/pure/ms-advance-filter/index.vue    |  4 ++--
 frontend/src/components/pure/ms-advance-filter/type.ts |  1 -
 frontend/src/config/testPlan.ts                        |  1 -
 frontend/src/models/testPlan/testPlan.ts               | 10 +++++++++-
 .../management/components/management/api/apiTable.vue  |  9 +--------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frontend/src/api/modules/test-plan/testPlan.ts b/frontend/src/api/modules/test-plan/testPlan.ts
index cc208a909c..2353ae80ed 100644
--- a/frontend/src/api/modules/test-plan/testPlan.ts
+++ b/frontend/src/api/modules/test-plan/testPlan.ts
@@ -135,6 +135,7 @@ import type {
   RunFeatureCaseParams,
   SortApiCaseParams,
   TestPlanBaseParams,
+  TestPlanCaseDetail,
   TestPlanDetail,
   TestPlanItem,
   TestPlanWithoutPageItem,
@@ -298,7 +299,7 @@ export function runFeatureCase(data: RunFeatureCaseParams) {
 }
 // 计划详情-功能用例-详情
 export function getCaseDetail(id: string) {
-  return MSR.get({ url: `${TestPlanCaseDetailUrl}/${id}` });
+  return MSR.get<TestPlanCaseDetail>({ url: `${TestPlanCaseDetailUrl}/${id}` });
 }
 // 测试计划-用例详情-缺陷列表
 export function associatedBugPage(data: TableQueryParams) {
diff --git a/frontend/src/components/pure/ms-advance-filter/index.vue b/frontend/src/components/pure/ms-advance-filter/index.vue
index 1bbbe0eae0..66d909b23c 100644
--- a/frontend/src/components/pure/ms-advance-filter/index.vue
+++ b/frontend/src/components/pure/ms-advance-filter/index.vue
@@ -142,12 +142,12 @@
       </MsTag>
     </div>
   </div>
-  <!-- TODO lmy 高级搜索全部覆盖后将此代码删除：?? ViewTypeEnum.FUNCTIONAL_CASE -->
   <FilterDrawer
+    v-if="props.viewType"
     ref="filterDrawerRef"
     v-model:visible="visible"
     :current-view="currentView"
-    :view-type="props.viewType ?? ViewTypeEnum.FUNCTIONAL_CASE"
+    :view-type="props.viewType"
     :internal-views="internalViews"
     :all-view-names="allViewNames"
     :config-list="props.filterConfigList"
diff --git a/frontend/src/components/pure/ms-advance-filter/type.ts b/frontend/src/components/pure/ms-advance-filter/type.ts
index 4f5e5227e5..44515c1375 100644
--- a/frontend/src/components/pure/ms-advance-filter/type.ts
+++ b/frontend/src/components/pure/ms-advance-filter/type.ts
@@ -67,7 +67,6 @@ export interface FilterResult {
   searchMode?: AccordBelowType;
   // 高级搜索
   conditions?: ConditionsItem[];
-  combine?: any; // TODO lmy 此为防报错占位 所有高级筛选都完成后 删除这一行
 }
 
 export interface ViewItem {
diff --git a/frontend/src/config/testPlan.ts b/frontend/src/config/testPlan.ts
index 0ea268d67f..76fd3565c8 100644
--- a/frontend/src/config/testPlan.ts
+++ b/frontend/src/config/testPlan.ts
@@ -7,7 +7,6 @@ import type { countDetail, PlanReportDetail, StatusListType } from '@/models/tes
 import { LastExecuteResults } from '@/enums/caseEnum';
 
 import type { TooltipOption } from 'echarts/types/dist/shared';
-// TODO: 对照后端字段
 // 测试计划详情
 export const testPlanDefaultDetail: TestPlanDetail = {
   id: '',
diff --git a/frontend/src/models/testPlan/testPlan.ts b/frontend/src/models/testPlan/testPlan.ts
index 0df3699671..e431d3dbd8 100644
--- a/frontend/src/models/testPlan/testPlan.ts
+++ b/frontend/src/models/testPlan/testPlan.ts
@@ -2,7 +2,7 @@ import type { MinderJsonNode, MinderJsonNodeData } from '@/components/pure/ms-mi
 import type { BatchActionQueryParams } from '@/components/pure/ms-table/type';
 import type { saveParams } from '@/components/business/ms-associate-case/types';
 
-import type { customFieldsItem } from '@/models/caseManagement/featureCase';
+import type { customFieldsItem, DetailCase } from '@/models/caseManagement/featureCase';
 import type { TableQueryParams } from '@/models/common';
 import { BatchApiParams, DragSortParams } from '@/models/common';
 import { CaseLinkEnum, LastExecuteResults } from '@/enums/caseEnum';
@@ -482,3 +482,11 @@ export interface PlanExecuteResult extends TaskReportDetail {
   apiCaseTotal: number;
   apiScenarioTotal: number;
 }
+
+export interface TestPlanCaseDetail extends DetailCase {
+  createUserName: string;
+  createTime: number;
+  lastExecuteResult: string;
+  bugListCount: number;
+  customFields: Record<string, any>[];
+}
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 caa64e8960..a1b555036d 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
@@ -138,7 +138,7 @@
       >
         <template v-if="batchForm.attr === 'method'" #extra>{{ t('apiTestManagement.requestTypeTip') }}</template>
         <a-select v-model="batchForm.attr" :placeholder="t('common.pleaseSelect')">
-          <a-option v-for="item of attrOptions" :key="item.value" :value="item.value">
+          <a-option v-for="item of fullAttrs" :key="item.value" :value="item.value">
             {{ t(item.name) }}
           </a-option>
         </a-select>
@@ -936,13 +936,6 @@
       value: 'tags',
     },
   ];
-  const attrOptions = computed(() => {
-    // TODO 协议 选择的数据不包含HTTP协议，则选择属性中不展示“请求类型“
-    // if (props.protocol === 'HTTP') {
-    return fullAttrs;
-    // }
-    // return fullAttrs.filter((e) => e.value !== 'method');
-  });
   const valueOptions = computed(() => {
     switch (batchForm.value.attr) {
       case 'status':