From ac0c517051fcd37637fc710d13c438bcedac324f Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Sat, 14 Sep 2024 18:09:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98&=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-bug-operation/bugCountPopover.vue        | 17 ++++++++++++++---
 frontend/src/utils/index.ts                     |  1 -
 .../components/caseAndScenarioReportDrawer.vue  |  3 +++
 .../management/case/differentDrawer.vue         |  8 ++------
 .../components/addDefectDrawer/index.vue        | 11 ++++++++---
 .../components/fileDetailDrawer.vue             |  2 +-
 .../detail/bugManagement/caseCountPopover.vue   |  2 +-
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/business/ms-bug-operation/bugCountPopover.vue b/frontend/src/components/business/ms-bug-operation/bugCountPopover.vue
index b47133985c..d99d825217 100644
--- a/frontend/src/components/business/ms-bug-operation/bugCountPopover.vue
+++ b/frontend/src/components/business/ms-bug-operation/bugCountPopover.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-popover position="br" content-class="case-count-popover">
+  <a-popover position="br" content-class="bug-count-popover">
     <div class="one-line-text cursor-pointer px-0 text-[rgb(var(--primary-5))]">{{ props.bugCount ?? 0 }}</div>
     <template #content>
       <div class="w-[500px]">
@@ -76,9 +76,8 @@
     columns: columns.value,
     size: 'mini',
     tableKey: TableKeyEnum.TEST_PLAN_DETAIL_CASE_TABLE_BUG_COUNT,
-    scroll: { x: '100%' },
+    scroll: { x: '100%', y: 400 },
     showSelectorAll: false,
-    heightUsed: 340,
     showPagination: false,
   });
   const { propsRes, propsEvent, setLoading } = useTable(undefined, tableProps.value);
@@ -108,3 +107,15 @@
     }
   }
 </script>
+
+<style scoped lang="less">
+  .bug-count-popover {
+    width: 540px;
+    height: 500px;
+    @apply overflow-y-auto overflow-x-hidden;
+    .ms-scroll-bar();
+    .arco-popover-content {
+      @apply h-full;
+    }
+  }
+</style>
diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.ts
index a3ee17e555..ae4ca9afb8 100644
--- a/frontend/src/utils/index.ts
+++ b/frontend/src/utils/index.ts
@@ -957,7 +957,6 @@ export function customFieldDataToTableData(customFieldData: Record<string, any>[
   if (!customFieldData || !customFields) return {};
 
   const tableData: Record<string, any> = {};
-
   customFieldData.forEach((field) => {
     const customField = customFields.find((item) => item.fieldId === field.id);
     if (!customField) return;
diff --git a/frontend/src/views/api-test/components/caseAndScenarioReportDrawer.vue b/frontend/src/views/api-test/components/caseAndScenarioReportDrawer.vue
index b71413c106..42f4e9da99 100644
--- a/frontend/src/views/api-test/components/caseAndScenarioReportDrawer.vue
+++ b/frontend/src/views/api-test/components/caseAndScenarioReportDrawer.vue
@@ -183,6 +183,9 @@
 
   const shareTime = ref<string>('');
   async function getTime() {
+    if (!appStore.currentProjectId) {
+      return;
+    }
     try {
       const res = await getShareTime(appStore.currentProjectId);
       const match = res.match(/^(\d+)([MYHD])$/);
diff --git a/frontend/src/views/api-test/management/components/management/case/differentDrawer.vue b/frontend/src/views/api-test/management/components/management/case/differentDrawer.vue
index cde9b864a0..0c660ae700 100644
--- a/frontend/src/views/api-test/management/components/management/case/differentDrawer.vue
+++ b/frontend/src/views/api-test/management/components/management/case/differentDrawer.vue
@@ -91,7 +91,7 @@
             <div class="diff-item">
               <div class="flex">
                 <a-tooltip
-                  :content="`【${apiDetailInfo?.num}】${apiDetailInfo?.name}`"
+                  :content="`[${apiDetailInfo?.num}]${apiDetailInfo?.name}`"
                   :mouse-enter-delay="300"
                   position="br"
                 >
@@ -108,11 +108,7 @@
             </div>
             <div class="diff-item">
               <div class="flex">
-                <a-tooltip
-                  :content="`【${caseDetail?.num}】${caseDetail?.name}`"
-                  :mouse-enter-delay="300"
-                  position="br"
-                >
+                <a-tooltip :content="`[${caseDetail?.num}] ${caseDetail?.name}`" :mouse-enter-delay="300" position="br">
                   <div class="title-type one-line-text"> [{{ caseDetail?.num }}] {{ caseDetail?.name }} </div>
                 </a-tooltip>
               </div>
diff --git a/frontend/src/views/case-management/components/addDefectDrawer/index.vue b/frontend/src/views/case-management/components/addDefectDrawer/index.vue
index f940d2f947..1c5060410f 100644
--- a/frontend/src/views/case-management/components/addDefectDrawer/index.vue
+++ b/frontend/src/views/case-management/components/addDefectDrawer/index.vue
@@ -171,9 +171,14 @@
     await getTemplateOptions();
   };
 
-  onBeforeMount(() => {
-    initDefaultFields();
-  });
+  watch(
+    () => showBugDrawer.value,
+    (val) => {
+      if (val) {
+        initDefaultFields();
+      }
+    }
+  );
 </script>
 
 <style scoped></style>
diff --git a/frontend/src/views/project-management/fileManagement/components/fileDetailDrawer.vue b/frontend/src/views/project-management/fileManagement/components/fileDetailDrawer.vue
index 706fc56306..36cc8ef2d7 100644
--- a/frontend/src/views/project-management/fileManagement/components/fileDetailDrawer.vue
+++ b/frontend/src/views/project-management/fileManagement/components/fileDetailDrawer.vue
@@ -472,7 +472,7 @@
 
     routeQuery.value = { id };
     if (type === 'FUNCTIONAL_CASE') {
-      routerName = CaseManagementRouteEnum.CASE_MANAGEMENT_CASE_DETAIL;
+      routerName = CaseManagementRouteEnum.CASE_MANAGEMENT_CASE;
     } else if (type === 'BUG') {
       routerName = BugManagementRouteEnum.BUG_MANAGEMENT;
     } else if (type === 'API_DEBUG') {
diff --git a/frontend/src/views/test-plan/testPlan/detail/bugManagement/caseCountPopover.vue b/frontend/src/views/test-plan/testPlan/detail/bugManagement/caseCountPopover.vue
index 0377adee95..f0e0c50cd4 100644
--- a/frontend/src/views/test-plan/testPlan/detail/bugManagement/caseCountPopover.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/bugManagement/caseCountPopover.vue
@@ -79,7 +79,7 @@
     columns,
     size: 'mini',
     tableKey: TableKeyEnum.TEST_PLAN_DETAIL_BUG_TABLE_CASE_COUNT,
-    scroll: { x: '100%' },
+    scroll: { x: '100%', y: 400 },
     showSelectorAll: false,
     heightUsed: 340,
     showPagination: false,