From 6aa5474860a66122352f701e178b2938c080d2f4 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 19 Aug 2024 11:56:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=BA=E7=A9=BA=E8=A1=A8=E6=A0=BC=E9=94=99=E4=B9=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98&=E6=9B=BF=E6=8D=A2=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=94=A8=E4=BE=8B=E7=AD=89=E7=BA=A7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-associate-case/caseTable.vue  | 24 ++++++-------------
 .../business/ms-case-associate/caseLevel.vue  |  1 +
 .../business/ms-case-associate/index.vue      | 20 +++++-----------
 .../tabDependency/preAndPostCaseDrawer.vue    |  6 -----
 .../caseManagementFeature/components/utils.ts |  5 +---
 .../components/detail/caseTable.vue           |  2 +-
 6 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/frontend/src/components/business/ms-associate-case/caseTable.vue b/frontend/src/components/business/ms-associate-case/caseTable.vue
index bc17d0e594..22a3dbd968 100644
--- a/frontend/src/components/business/ms-associate-case/caseTable.vue
+++ b/frontend/src/components/business/ms-associate-case/caseTable.vue
@@ -33,8 +33,7 @@
       <CaseLevel :case-level="filterContent.value" />
     </template>
     <template #caseLevel="{ record }">
-      <CaseLevel v-if="record.caseLevel" :case-level="record.caseLevel" />
-      <span v-else>-</span>
+      <CaseLevel :case-level="record.caseLevel" />
     </template>
     <template #[FilterSlotNameEnum.CASE_MANAGEMENT_EXECUTE_RESULT]="{ filterContent }">
       <ExecuteResult :execute-result="filterContent.value" />
@@ -50,7 +49,6 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
-  import { TableData } from '@arco-design/web-vue';
 
   import MsButton from '@/components/pure/ms-button/index.vue';
   import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
@@ -60,7 +58,6 @@
   import ExecuteResult from '@/components/business/ms-case-associate/executeResult.vue';
   import type { MsTreeNodeData } from '@/components/business/ms-tree/types';
 
-  import { useI18n } from '@/hooks/useI18n';
   import useOpenNewPage from '@/hooks/useOpenNewPage';
   import useTableStore from '@/hooks/useTableStore';
 
@@ -76,10 +73,13 @@
   import useModuleSelection from './useModuleSelection';
   import { getPublicLinkCaseListMap } from './utils/page';
   import { casePriorityOptions } from '@/views/api-test/components/config';
-  import { executionResultMap, statusIconMap } from '@/views/case-management/caseManagementFeature/components/utils';
+  import {
+    executionResultMap,
+    getCaseLevels,
+    statusIconMap,
+  } from '@/views/case-management/caseManagementFeature/components/utils';
 
   const { openNewPage } = useOpenNewPage();
-  const { t } = useI18n();
 
   const props = defineProps<{
     associationType: string; // 关联类型 项目 | 测试计划 | 用例评审
@@ -229,16 +229,6 @@
     return getPublicLinkCaseListMap[props.getPageApiType][props.activeSourceType];
   });
 
-  function getCaseLevel(record: TableData) {
-    if (record.customFields && record.customFields.length) {
-      const caseItem = record.customFields.find(
-        (item: any) => item.fieldName === t('common.casePriority') && item.internal
-      );
-      return caseItem?.options.find((item: any) => item.value === caseItem?.defaultValue)?.text;
-    }
-    return undefined;
-  }
-
   const { propsRes, propsEvent, loadList, setLoadListParams, resetFilterParams, setTableSelected } = useTable(
     getPageList.value,
     {
@@ -254,7 +244,7 @@
     (record) => {
       return {
         ...record,
-        caseLevel: getCaseLevel(record),
+        caseLevel: getCaseLevels(record.customFields),
       };
     }
   );
diff --git a/frontend/src/components/business/ms-case-associate/caseLevel.vue b/frontend/src/components/business/ms-case-associate/caseLevel.vue
index 8000fa03ac..4245da34ed 100644
--- a/frontend/src/components/business/ms-case-associate/caseLevel.vue
+++ b/frontend/src/components/business/ms-case-associate/caseLevel.vue
@@ -9,6 +9,7 @@
     ></div>
     {{ caseLevel.label }}
   </div>
+  <span v-else class="text-[var(--color-text-2)]"> - </span>
 </template>
 
 <script setup lang="ts">
diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue
index bcccef9e95..e3e4cc51da 100644
--- a/frontend/src/components/business/ms-case-associate/index.vue
+++ b/frontend/src/components/business/ms-case-associate/index.vue
@@ -140,7 +140,7 @@
             <a-button type="text" class="px-0" @click="openDetail(record.id)">{{ record.num }} </a-button>
           </template>
           <template #caseLevel="{ record }">
-            <caseLevel v-if="getCaseLevel(record)" :case-level="getCaseLevel(record)" />
+            <caseLevel :case-level="getCaseLevels(record.customFields)" />
           </template>
           <template #lastExecuteResult="{ record }">
             <ExecuteStatusTag v-if="record.lastExecuteResult" :execute-result="record.lastExecuteResult" />
@@ -223,7 +223,11 @@
 
   import { initGetModuleCountFunc, type RequestModuleEnum } from './utils';
   import { casePriorityOptions } from '@/views/api-test/components/config';
-  import { executionResultMap, statusIconMap } from '@/views/case-management/caseManagementFeature/components/utils';
+  import {
+    executionResultMap,
+    getCaseLevels,
+    statusIconMap,
+  } from '@/views/case-management/caseManagementFeature/components/utils';
 
   const router = useRouter();
   const appStore = useAppStore();
@@ -512,18 +516,6 @@
       }
     );
 
-  // 用例等级
-  // TODO: 这个版本用例和接口以及场景不存在用例等级 不展示等级内容
-  function getCaseLevel(record: CaseManagementTable) {
-    if (record.customFields && record.customFields.length) {
-      const caseItem = record.customFields.find(
-        (item: any) => item.fieldName === t('common.casePriority') && item.internal
-      );
-      return caseItem?.options.find((item: any) => item.value === caseItem?.defaultValue).text;
-    }
-    return undefined;
-  }
-
   const searchParams = ref<TableQueryParams>({
     moduleIds: [],
     version: version.value,
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue
index 9a176c4893..cba9f141f0 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue
@@ -334,12 +334,6 @@
     }
   );
 
-  // 用例等级
-  function getCaseLevel(record: CaseManagementTable) {
-    return record.customFields.find((item: any) => item.internal && item.internalFieldKey === 'functional_priority')
-      ?.value as CaseLevel;
-  }
-
   const loading = ref(false);
 
   function cancel() {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/utils.ts b/frontend/src/views/case-management/caseManagementFeature/components/utils.ts
index 2515ccb58b..c0cfdb03cf 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/utils.ts
+++ b/frontend/src/views/case-management/caseManagementFeature/components/utils.ts
@@ -123,10 +123,7 @@ export function getCaseLevels(customFields: CustomAttributes[]): CaseLevel {
   const caseLevelItem = (customFields || []).find(
     (it: any) => it.internal && it.internalFieldKey === 'functional_priority'
   );
-  return (
-    (caseLevelItem?.options.find((it: any) => it.value === caseLevelItem.defaultValue)?.text as CaseLevel) ||
-    ('P0' as CaseLevel)
-  );
+  return caseLevelItem?.options.find((it: any) => it.value === caseLevelItem.defaultValue)?.text as CaseLevel;
 }
 
 // 获取对应模块name
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 c4e4f5322d..a016ad034a 100644
--- a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue
+++ b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue
@@ -817,7 +817,7 @@
   async function getCaseLevelFields() {
     const result = await getCaseDefaultFields(appStore.currentProjectId);
     caseLevelFields.value = result.customFields.find(
-      (item: any) => item.fieldName === t('common.casePriority') && item.internal
+      (item: any) => item.internal && item.internalFieldKey === 'functional_priority'
     );
     columns = columns.map((item) => {
       if (item.dataIndex === 'caseLevel') {