From 007d5b03b457cfb293d223ef069187a12f8d0781 Mon Sep 17 00:00:00 2001
From: ailoooong <ilong8@qq.com>
Date: Tue, 3 Sep 2024 10:31:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A8=E6=A0=BCtips=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collaboration/FeedbackHistroy.vue          |  7 ++++---
 .../collaboration/TableShowOverflowTips.vue    | 18 +++++++++++++++---
 src/views/todo/ApprovalTable.vue               |  7 +++++--
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/components/collaboration/FeedbackHistroy.vue b/src/components/collaboration/FeedbackHistroy.vue
index 219fe45..1c65f31 100644
--- a/src/components/collaboration/FeedbackHistroy.vue
+++ b/src/components/collaboration/FeedbackHistroy.vue
@@ -243,15 +243,15 @@ watch(
             {{ row.administrator ?? '-' }}
           </template>
           <template #td_description="{ row }">
-            <TableShowOverflowTips v-if="row.description" :content="row.description" :line="1" />
+            <TableShowOverflowTips v-if="row.description" :content="row.description" :line="1" wrapper=".histroy-table" />
             <template v-else>-</template>
           </template>
           <template #td_applyIdString="{ row }">
-            <TableShowOverflowTips v-if="row.applyIdString" :content="row.applyIdString" :line="1" />
+            <TableShowOverflowTips v-if="row.applyIdString" :content="row.applyIdString" :line="1" wrapper=".histroy-table" />
             <template v-else>-</template>
           </template>
           <template #td_comment="{ row }">
-            <TableShowOverflowTips v-if="row.comment" :content="row.comment" :line="1" />
+            <TableShowOverflowTips v-if="row.comment" :content="row.comment" :line="1" wrapper=".histroy-table" />
             <template v-else>-</template>
           </template>
           <template #td_applyStatus="{ row }">
@@ -289,6 +289,7 @@ watch(
   .histroy-table {
     border: 1px solid var(--o-color-control4);
     border-radius: 4px;
+    position: relative;
     &.total {
       :deep(.o-table-wrap) {
         height: 538px;
diff --git a/src/components/collaboration/TableShowOverflowTips.vue b/src/components/collaboration/TableShowOverflowTips.vue
index b156561..440577b 100644
--- a/src/components/collaboration/TableShowOverflowTips.vue
+++ b/src/components/collaboration/TableShowOverflowTips.vue
@@ -14,13 +14,19 @@ const props = defineProps({
       return 2;
     },
   },
+  wrapper: {
+    type: String,
+    default: () => {
+      return '';
+    },
+  },
 });
 
-const contentLen = computed(() => props.content.length > props.line * 11);
+const contentLen = computed(() => props.content.length > props.line * 10);
 </script>
 
 <template>
-  <OPopover v-if="contentLen" position="top" trigger="hover">
+  <OPopover v-if="contentLen" trigger="hover" :anchor="true" :wrapper="wrapper">
     <template #target>
       <div class="line-clamp">{{ content }}</div>
     </template>
@@ -28,15 +34,21 @@ const contentLen = computed(() => props.content.length > props.line * 11);
       {{ content }}
     </div>
   </OPopover>
-  <template v-else>{{ content }} </template>
+  <template v-else
+    ><div class="txt">{{ content }}</div>
+  </template>
 </template>
 
 <style lang="scss" scoped>
+.txt {
+  word-break: break-all;
+}
 .box {
   max-width: 184px;
   max-height: 154px;
   color: var(--o-color-info1);
   overflow: hidden auto;
+  word-break: break-all;
   @include scrollbar;
   @include tip1;
 }
diff --git a/src/views/todo/ApprovalTable.vue b/src/views/todo/ApprovalTable.vue
index de9a8e3..49fe4e1 100644
--- a/src/views/todo/ApprovalTable.vue
+++ b/src/views/todo/ApprovalTable.vue
@@ -238,14 +238,14 @@ const revoke = () => {
         {{ versionLatestStatusConvert(row.metricStatus) }}
       </template>
       <template #td_comment="{ row }">
-        <TableShowOverflowTips v-if="row.comment" :content="row.comment" />
+        <TableShowOverflowTips v-if="row.comment" :content="row.comment" :line="2" wrapper=".table-main" />
         <template v-else>-</template>
       </template>
       <template #td_administrator="{ row }">
         {{ row.administrator ?? '-' }}
       </template>
       <template #td_description="{ row }">
-        <TableShowOverflowTips v-if="row.description" :content="row.description" />
+        <TableShowOverflowTips v-if="row.description" :content="row.description" :line="2" wrapper=".table-main" />
       </template>
 
       <template #td_applyStatus="{ row }">
@@ -285,6 +285,9 @@ const revoke = () => {
 
 <style lang="scss" scoped>
 @import '@/assets/style/category/collaboration/index.scss';
+.table-main {
+  position: relative;
+}
 .th-maintainer {
   display: flex;
   align-items: center;
-- 
Gitee