From a0bcb9f31c65c34172676dcc25047ba032723fbb Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 7 Mar 2024 19:15:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7=E8=AF=A6=E6=83=85=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=88=97=E8=A1=A8=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?id=E6=90=9C=E7=B4=A2=E7=9A=84=E7=BC=BA=E9=99=B7=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E9=83=A8=E5=88=86=E6=96=87=E6=A1=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1036879 --user=宋天阳 【缺陷管理】缺陷详情-用例-列表-未支持ID搜索 https://www.tapd.cn/55049933/s/1471704；--bug=1036878 --user=宋天阳 【缺陷管理】缺陷详情-用例-列表-文案修改 https://www.tapd.cn/55049933/s/1471633；--bug=1036875 --user=宋天阳 【缺陷管理】缺陷详情-用例-关联测试计划字段隐藏起来 https://www.tapd.cn/55049933/s/1471634；--bug=1036385 --user=宋天阳 【缺陷管理】缺陷详情-名称hover展示ID https://www.tapd.cn/55049933/s/1471719
---
 .../bug/mapper/ExtBugRelateCaseMapper.xml     |  5 +++-
 .../business/ms-detail-drawer/index.vue       |  4 ++-
 .../components/bug-detail-drawer.vue          |  1 +
 .../bug-management/components/bugCaseTab.vue  | 26 ++++++++-----------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
index 28057bce0f..b9099f115d 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
@@ -49,7 +49,10 @@
         from bug_relation_case brc join functional_case fc on (brc.case_id = fc.id or brc.test_plan_case_id = fc.id)
         where brc.bug_id = #{request.bugId} and fc.deleted = false
         <if test="request.keyword != null and request.keyword != ''">
-            and fc.name like concat('%', #{request.keyword}, '%')
+            and (
+            fc.name like concat('%', #{request.keyword}, '%')
+            or fc.num like concat('%', #{request.keyword}, '%')
+            )
         </if>
     </select>
 
diff --git a/frontend/src/components/business/ms-detail-drawer/index.vue b/frontend/src/components/business/ms-detail-drawer/index.vue
index 663503c94b..04b925845c 100644
--- a/frontend/src/components/business/ms-detail-drawer/index.vue
+++ b/frontend/src/components/business/ms-detail-drawer/index.vue
@@ -10,7 +10,8 @@
   >
     <template #title>
       <div class="flex flex-1 items-center">
-        <a-tooltip :content="props.title" position="bottom">
+        <!-- 如果设置了tooltipText，则优先展示-->
+        <a-tooltip :content="props.tooltipText ? props.tooltipText : props.title" position="bottom">
           <div class="one-line-text max-w-[300px]">
             {{ props.title }}
           </div>
@@ -49,6 +50,7 @@
     title: string;
     width: number;
     detailId: string; // 详情 id
+    tooltipText?: string; // tooltip内容
     detailIndex: number; // 详情 下标
     tableData: any[]; // 表格数据
     pagination: MsPaginationI; // 分页器对象
diff --git a/frontend/src/views/bug-management/components/bug-detail-drawer.vue b/frontend/src/views/bug-management/components/bug-detail-drawer.vue
index a551fe7564..b1786936ed 100644
--- a/frontend/src/views/bug-management/components/bug-detail-drawer.vue
+++ b/frontend/src/views/bug-management/components/bug-detail-drawer.vue
@@ -5,6 +5,7 @@
     :width="1200"
     :footer="false"
     :title="t('bugManagement.detail.title', { id: detailInfo?.num, name: detailInfo?.title })"
+    :tooltip-text="(detailInfo && detailInfo.title) || null"
     :detail-id="props.detailId"
     :detail-index="props.detailIndex"
     :get-detail-func="getBugDetail"
diff --git a/frontend/src/views/bug-management/components/bugCaseTab.vue b/frontend/src/views/bug-management/components/bugCaseTab.vue
index 927efe1ee7..668fd8c80b 100644
--- a/frontend/src/views/bug-management/components/bugCaseTab.vue
+++ b/frontend/src/views/bug-management/components/bugCaseTab.vue
@@ -4,7 +4,7 @@
       <a-button type="primary" @click="handleSelect">{{ t('caseManagement.featureCase.linkCase') }}</a-button>
       <a-input-search
         v-model:model-value="keyword"
-        :placeholder="t('caseManagement.featureCase.searchByNameAndId')"
+        :placeholder="t('caseManagement.featureCase.searchByIdAndName')"
         allow-clear
         class="mx-[8px] w-[240px]"
         @search="searchCase"
@@ -138,16 +138,6 @@
       ellipsis: true,
       showDrag: false,
     },
-    {
-      title: 'bugManagement.detail.isPlanRelateCase',
-      titleSlotName: 'relatePlanTitle',
-      slotName: 'isRelatePlanCase',
-      showInTable: true,
-      showTooltip: true,
-      width: 300,
-      ellipsis: true,
-      showDrag: false,
-    },
     {
       title: 'bugManagement.project',
       slotName: 'projectName',
@@ -205,8 +195,8 @@
   }
 
   async function getFetch() {
+    setKeyword(keyword.value);
     setLoadListParams({
-      keyword: keyword.value,
       bugId: props.bugId,
     });
     await loadList();
@@ -269,6 +259,9 @@
 
   async function searchCase() {
     setKeyword(keyword.value);
+    setLoadListParams({
+      bugId: props.bugId,
+    });
     await loadList();
   }
 
@@ -277,9 +270,12 @@
     getFetch();
   });
 
-  watchEffect(() => {
-    getFetch();
-  });
+  watch(
+    () => props.bugId,
+    () => {
+      getFetch();
+    }
+  );
 </script>
 
 <style scoped></style>