From 1c9e631f385e88852a95b20e5a7a26e40d577352 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 22 Apr 2024 20:41:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E6=98=BE=E7=A4=BA=E4=BB=A5=E5=8F=8A=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8=E6=89=A7=E8=A1=8C=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E5=92=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=9A=E4=B9=89=E5=93=8D=E5=BA=94=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=88=A0=E9=99=A4=E6=97=B6=E8=B6=85=E9=95=BF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1039864 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001039864
--bug=1039852 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001039852
--bug=1037824 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037824
---
 .../ms-case-associate/executeResult.vue       |  3 +-
 .../ms-message/MessageCenterDrawer.vue        | 65 +++++++++++++------
 .../requestComposition/response/edit.vue      |  7 +-
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/business/ms-case-associate/executeResult.vue b/frontend/src/components/business/ms-case-associate/executeResult.vue
index 767cd17de4..9cecd7709f 100644
--- a/frontend/src/components/business/ms-case-associate/executeResult.vue
+++ b/frontend/src/components/business/ms-case-associate/executeResult.vue
@@ -3,9 +3,10 @@
     <MsIcon
       :type="lastExecuteResultMap[props.executeResult]?.icon || ''"
       class="mr-1"
+      :size="16"
       :style="{ color: lastExecuteResultMap[props.executeResult].color }"
     ></MsIcon>
-    <span class="text-[var(--color-text-2)]">{{ status?.text || '' }}</span>
+    <span class="text-[14px] text-[var(--color-text-2)]">{{ status?.text || '' }}</span>
   </div>
 </template>
 
diff --git a/frontend/src/components/business/ms-message/MessageCenterDrawer.vue b/frontend/src/components/business/ms-message/MessageCenterDrawer.vue
index 24f86b3d44..707f261055 100644
--- a/frontend/src/components/business/ms-message/MessageCenterDrawer.vue
+++ b/frontend/src/components/business/ms-message/MessageCenterDrawer.vue
@@ -67,23 +67,35 @@
             @reach-bottom="handleReachBottom"
           >
             <template #item="{ item }">
-              <div v-if="item.type === 'MENTIONED_ME'" class="ms-message-item">
+              <div v-if="item.type === 'MENTIONED_ME'" class="mb-[16px] pt-[8px]">
                 <div class="flex items-center">
                   <MSAvatar v-if="item.avatar" :avatar="item.avatar" :word="item.userName" />
                   <div class="ml-[8px] flex">
-                    <div class="text-[var(--color-text-2)]">
-                      {{ item.subject }}
-                    </div>
+                    <a-tooltip :content="item.subject" :mouse-enter-delay="300">
+                      <div class="one-line-text max-w-[300px] font-medium leading-[22px] text-[var(--color-text-1)]">
+                        {{ item.subject }}
+                      </div>
+                    </a-tooltip>
                     <div class="font-medium text-[rgb(var(--primary-5))]"
                       >&nbsp;&nbsp;{{ t('ms.message.me', { var: '@' }) }}</div
                     >
                   </div>
                 </div>
                 <div class="flex items-center">
-                  <div class="text-[var(--color-text-2)]">{{ item.content.split(':')[0] }}：</div>
-                  <div v-if="item.operation.includes('DELETE')" class="text-[var(--color-text-1)]">
-                    {{ item.resourceName }}
-                  </div>
+                  <a-tooltip :content="item.content.split(':')[0]" :mouse-enter-delay="300">
+                    <div class="one-line-text ml-[8px] max-w-[300px] text-[var(--color-text-2)]"
+                      >{{ item.content.split(':')[0] }}：</div
+                    >
+                  </a-tooltip>
+
+                  <a-tooltip v-if="item.operation.includes('DELETE')" :content="item.resourceName">
+                    <div
+                      v-if="item.operation.includes('DELETE')"
+                      class="one-line-text max-w-[300px] text-[var(--color-text-1)]"
+                    >
+                      {{ item.resourceName }}
+                    </div>
+                  </a-tooltip>
                   <MsButton v-else @click="handleNameClick(item)">
                     <a-tooltip :content="item.resourceName" :mouse-enter-delay="300">
                       <div class="one-line-text max-w-[300px]">
@@ -92,7 +104,7 @@
                     </a-tooltip>
                   </MsButton>
                 </div>
-                <div class="flex items-center text-[var(--color-text-4)]">
+                <div class="ml-[8px] flex items-center text-[var(--color-text-4)]">
                   {{ dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') }}
                 </div>
               </div>
@@ -101,23 +113,38 @@
                 <div class="ml-[8px] flex flex-col">
                   <div class="flex items-center overflow-x-hidden">
                     <a-badge v-if="item.status === 'UNREAD'" :count="9" dot :offset="[6, -2]" class="w-full">
-                      <div class="font-medium leading-[22px] text-[var(--color-text-1)]">
-                        {{ item.subject }}
-                      </div>
+                      <a-tooltip :content="item.subject">
+                        <div class="one-line-text max-w-[300px] font-medium leading-[22px] text-[var(--color-text-1)]">
+                          {{ item.subject }}
+                        </div>
+                      </a-tooltip>
                     </a-badge>
                     <a-tooltip v-else-if="item.status === 'READ'" :content="item.subject">
-                      <div class="font-medium leading-[22px] text-[var(--color-text-1)]">
+                      <div class="one-line-text max-w-[300px] font-medium leading-[22px] text-[var(--color-text-1)]">
                         {{ item.subject }}
                       </div>
                     </a-tooltip>
                   </div>
                   <div class="flex items-center">
-                    <div class="one-line-text max-w-[300px] text-[var(--color-text-2)]"
-                      >{{ item.content.split(':')[0] }}：</div
+                    <a-tooltip
+                      v-if="item.operation.includes('DELETE')"
+                      :content="item.content.split(':')[0]"
+                      :mouse-enter-delay="300"
                     >
-                    <div v-if="item.operation.includes('DELETE')" class="text-[var(--color-text-1)]">
-                      {{ item.resourceName }}
-                    </div>
+                      <div class="one-line-text max-w-[300px] text-[var(--color-text-2)]"
+                        >{{ item.content.split(':')[0] }}：</div
+                      >
+                    </a-tooltip>
+                    <a-tooltip
+                      v-if="item.operation.includes('DELETE')"
+                      :content="item.resourceName"
+                      :mouse-enter-delay="300"
+                    >
+                      <div class="one-line-text max-w-[300px] text-[var(--color-text-1)]">
+                        {{ item.resourceName }}
+                      </div>
+                    </a-tooltip>
+
                     <MsButton v-else @click="handleNameClick(item)">
                       <a-tooltip :content="item.resourceName" :mouse-enter-delay="300">
                         <div class="one-line-text max-w-[300px]">
@@ -412,7 +439,7 @@
     .ms-message-item {
       @apply flex;
 
-      padding: 8px;
+      padding-top: 8px;
       &:not(:last-child) {
         margin-bottom: 16px;
       }
diff --git a/frontend/src/views/api-test/components/requestComposition/response/edit.vue b/frontend/src/views/api-test/components/requestComposition/response/edit.vue
index 6040bae8e0..5073358ad6 100644
--- a/frontend/src/views/api-test/components/requestComposition/response/edit.vue
+++ b/frontend/src/views/api-test/components/requestComposition/response/edit.vue
@@ -57,7 +57,12 @@
               <icon-exclamation-circle-fill class="!text-[rgb(var(--danger-6))]" />
             </template>
             <template #content>
-              <div class="font-semibold text-[var(--color-text-1)]">
+              <a-tooltip v-if="translateTextToPX(t(tab.name || tab.label)) > 200" :content="t(tab.name || tab.label)">
+                <div class="one-line-text max-w-[200px] font-semibold text-[var(--color-text-1)]">
+                  {{ t('apiTestManagement.confirmDelete', { name: tab.label || tab.name }) }}
+                </div>
+              </a-tooltip>
+              <div v-else class="font-semibold text-[var(--color-text-1)]">
                 {{ t('apiTestManagement.confirmDelete', { name: tab.label || tab.name }) }}
               </div>
             </template>