Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -30,12 +30,12 @@
                     </div>
                     </div>
 
 
                     <span v-else>
                     <span v-else>
-                         <el-tooltip placement="top">
-                            <template #content>
+                         <el-tooltip placement="top" :disabled="scope.row.isShowTooltip == undefined || scope.row.isShowTooltip == false">
+                            <template #content >
                                 <div v-html="getTextContent(scope.row[item.prop])">
                                 <div v-html="getTextContent(scope.row[item.prop])">
                                 </div>
                                 </div>
                             </template>
                             </template>
-                            <div style="overflow: hidden;	text-overflow: ellipsis;display: -webkit-box;	-webkit-line-clamp: 2;	-webkit-box-orient: vertical;">
+                            <div class="text-overflow-line2" @mouseenter="tableColMouseenter($event,scope.row)">
                                 {{scope.row[item.prop]}}
                                 {{scope.row[item.prop]}}
                             </div>
                             </div>
                         </el-tooltip>
                         </el-tooltip>

@@ -277,6 +277,26 @@ export default {
 
 
             emit('handleSelectAll',selection)
             emit('handleSelectAll',selection)
         }
         }
+
+        /**
+         * 表格组件，超过2行展示tooltip
+         * @param e
+         * @param item
+         */
+        const tableColMouseenter = (e, item) => {
+            const ev = e.target;
+            var height = $(ev).scroll().height()
+            console.log(height);
+            // 超过2行
+            if (height > 45) {
+                // 实际高度 > 可视高度  文字溢出
+                item.isShowTooltip = true;
+            } else {
+                // 否则为不溢出
+                item.isShowTooltip = false;
+            }
+        }
+
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
             //callback();
             //callback();
@@ -305,7 +325,8 @@ export default {
             prePage,
             prePage,
             nextPage,
             nextPage,
             getWidth,
             getWidth,
-            getTextContent
+            getTextContent,
+            tableColMouseenter
         }
         }
     }
     }
 }
 }