From f6efb24040eb395024c5dca0050ef37ab7579ea7 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 23 Sep 2024 14:36:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtable=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8tooltip=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/pure/ms-tag/ms-tag-group.vue | 11 +++++++----
 frontend/src/components/pure/ms-tag/ms-tag.vue       |  5 ++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/pure/ms-tag/ms-tag-group.vue b/frontend/src/components/pure/ms-tag/ms-tag-group.vue
index ccffde92a4..f9e3af9835 100644
--- a/frontend/src/components/pure/ms-tag/ms-tag-group.vue
+++ b/frontend/src/components/pure/ms-tag/ms-tag-group.vue
@@ -7,12 +7,15 @@
     <MsTag
       v-for="tag of showTagList"
       :key="tag.id"
-      class="ms-tag-group"
+      :class="`${props.showTable ? 'ms-tag-group' : ''}`"
       :width="getTagWidth(tag)"
       :size="props.size"
       v-bind="attrs"
     >
       {{ getTagContent(tag) }}
+      <template v-if="props.showTable" #tooltipContent>
+        {{ props.isStringTag ? tag : tag[props.nameKey] }}
+      </template>
     </MsTag>
     <a-tooltip
       :disabled="!(props.tagList.length > props.showNum)"
@@ -114,9 +117,9 @@
   });
 
   function getTagContent(tag: { [x: string]: any }) {
-    let tagContent = props.isStringTag ? tag : tag[props.nameKey];
-    if (tagContent.length > 16) {
-      tagContent = characterLimit(tagContent, 9);
+    const tagContent = props.isStringTag ? tag : tag[props.nameKey];
+    if (props.showTable) {
+      return tagContent.length > 16 ? characterLimit(tagContent, 9) : tagContent;
     }
     return tagContent;
   }
diff --git a/frontend/src/components/pure/ms-tag/ms-tag.vue b/frontend/src/components/pure/ms-tag/ms-tag.vue
index 77c7ae830d..53f5bb06e1 100644
--- a/frontend/src/components/pure/ms-tag/ms-tag.vue
+++ b/frontend/src/components/pure/ms-tag/ms-tag.vue
@@ -18,7 +18,10 @@
       <div :class="`one-line-text min-w-[20px] ${props.maxWidth || '144px'}`">
         <slot></slot>
       </div>
-      <template #content>
+      <template v-if="$slots.tooltipContent" #content>
+        <slot name="tooltipContent"></slot>
+      </template>
+      <template v-else #content>
         <slot></slot>
       </template>
     </a-tooltip>