From 37ecb924d914da8f2ff05abd75938a8eb971c147 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 12 Dec 2024 17:02:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=A6=82?=
 =?UTF-8?q?=E8=A7=88=E6=9C=AA=E5=88=86=E9=85=8D=E8=B0=83=E6=95=B4=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96&=E7=BC=BA=E9=99=B7=E6=95=B0=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=85=A5=E5=8F=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/config/workbench.ts                     |  4 +++-
 .../homePage/components/testPlanOverview.vue         |  9 +++++++--
 .../src/views/workbench/homePage/locale/en-US.ts     |  1 +
 .../src/views/workbench/homePage/locale/zh-CN.ts     |  1 +
 frontend/src/views/workbench/homePage/utils.ts       | 12 ++++++++++--
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/frontend/src/config/workbench.ts b/frontend/src/config/workbench.ts
index 5a6b6f77e2..be4d491d95 100644
--- a/frontend/src/config/workbench.ts
+++ b/frontend/src/config/workbench.ts
@@ -415,7 +415,9 @@ export const NAV_NAVIGATION: Record<WorkNavValueEnum, any> = {
     relatedToPlan: true,
     unresolved: false,
   },
-  [WorkNavValueEnum.BUG_COUNT]: {},
+  [WorkNavValueEnum.BUG_COUNT]: {
+    boardCount: true,
+  },
   [WorkNavValueEnum.BUG_COUNT_LEGACY]: {
     unresolved: true,
   },
diff --git a/frontend/src/views/workbench/homePage/components/testPlanOverview.vue b/frontend/src/views/workbench/homePage/components/testPlanOverview.vue
index b555578148..97ced3a68f 100644
--- a/frontend/src/views/workbench/homePage/components/testPlanOverview.vue
+++ b/frontend/src/views/workbench/homePage/components/testPlanOverview.vue
@@ -22,7 +22,6 @@
             label-path-mode
             path-mode
             popup-container=".cascader-wrapper-self"
-            :search-option-only-label="true"
             :load-more="loadMore"
             @change="changeHandler"
           >
@@ -36,7 +35,7 @@
             <template #option="{ data }">
               <div :class="`flex ${data.isLeaf ? ' w-[130px]' : 'w-[120px]'} items-center`" title="">
                 <a-tooltip :mouse-enter-delay="300" :content="t(data.label)">
-                  <div :class="`one-line-text ${data.isLeaf ? 'max-w-[85%]' : ''}`" title="">
+                  <div class="one-line-text" title="">
                     {{ t(data.label) }}
                   </div>
                 </a-tooltip>
@@ -468,6 +467,12 @@
     :deep(.arco-trigger-position-bl) {
       transform: translateX(-8%);
     }
+    :deep(.arco-scrollbar) {
+      transform: translateX(9%);
+    }
+  }
+  :deep(.arco-cascader-option-label, .arco-cascader-search-option-label) {
+    padding-right: 20px;
   }
 </style>
 
diff --git a/frontend/src/views/workbench/homePage/locale/en-US.ts b/frontend/src/views/workbench/homePage/locale/en-US.ts
index ab19871517..edf57e2a70 100644
--- a/frontend/src/views/workbench/homePage/locale/en-US.ts
+++ b/frontend/src/views/workbench/homePage/locale/en-US.ts
@@ -122,4 +122,5 @@ export default {
   'workbench.homePage.completeUseCases': 'Complete use case',
   'workbench.homePage.commitDefects': 'Commit defects',
   'workbench.homePage.closedDefect': 'Closed defect',
+  'workbench.homePage.planUnExecutor': 'plan_executor',
 };
diff --git a/frontend/src/views/workbench/homePage/locale/zh-CN.ts b/frontend/src/views/workbench/homePage/locale/zh-CN.ts
index 37e00ae219..ab44f65014 100644
--- a/frontend/src/views/workbench/homePage/locale/zh-CN.ts
+++ b/frontend/src/views/workbench/homePage/locale/zh-CN.ts
@@ -109,4 +109,5 @@ export default {
   'workbench.homePage.completeUseCases': '完成用例',
   'workbench.homePage.commitDefects': '提交缺陷',
   'workbench.homePage.closedDefect': '关闭缺陷',
+  'workbench.homePage.planUnExecutor': '未分配',
 };
diff --git a/frontend/src/views/workbench/homePage/utils.ts b/frontend/src/views/workbench/homePage/utils.ts
index e8ffd22870..ddf5f84ea9 100644
--- a/frontend/src/views/workbench/homePage/utils.ts
+++ b/frontend/src/views/workbench/homePage/utils.ts
@@ -108,10 +108,16 @@ export function getCommonBarOptions(
         },
         formatter(params: any) {
           let testPlanHtml = '';
+          // 如果是测试计划未分配
+          let paramsList = [];
           if (isTestPlan) {
+            const unAssign = params[0].axisValueLabel === t('workbench.homePage.planUnExecutor');
+            paramsList = unAssign ? params.slice(0, 1) : params;
             const [assigning, complete] = params;
             const passRate = assigning.value > 0 ? `${((complete.value / assigning.value) * 100).toFixed(2)}%` : '0%';
-            testPlanHtml = `<div class="flex items-center justify-between">
+            testPlanHtml = unAssign
+              ? ``
+              : `<div class="flex items-center justify-between">
                               <div class="flex items-center gap-[8px] text-[var(--color-text-2)]">
                                 <div style="background:#00C261;" class="flex items-center justify-center w-[11px] h-[11px] rounded-full text-[10px]">
                                   <span class="text-[var(--color-text-fff)] text-center">✓</span>
@@ -121,12 +127,14 @@ export function getCommonBarOptions(
                              
                               <div class="text-[rgb(var(--success-6))] font-semibold">${passRate}</div>
                             </div>`;
+          } else {
+            paramsList = params;
           }
           const html = `
         <div class="w-[186px] ms-scroll-bar max-h-[236px] overflow-y-auto p-[16px] gap-[8px] flex flex-col">
         <div class="font-medium max-w-[150px] one-line-text" style="color:#323233">${params[0].axisValueLabel}</div>
         ${testPlanHtml}
-        ${params
+        ${paramsList
           .map(
             (item: any) => `
           <div class="flex h-[18px] items-center justify-between">