Merge branch 'master-v32-lushangqing' into 'master'

资源视图中表格单元格溢出时tip跳到左上角



See merge request !339

@@ -637,7 +637,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     field: 'alarmNo', title: '告警编号', align: 'center', width: 140, sort: true,
                     field: 'alarmNo', title: '告警编号', align: 'center', width: 140, sort: true,
                 }
                 }
                 , {
                 , {
-                    field: 'resName', title: '资源名称', width: 250, sort: true,
+                    field: 'resName', title: '资源名称', width: 230, sort: true,
                     templet:`
                     templet:`
                     <div>
                     <div>
                         <div style="display: flex;align-items: center;">
                         <div style="display: flex;align-items: center;">

@@ -1718,9 +1718,24 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             $('table tr').hover(function (obj) {
             $('table tr').hover(function (obj) {
                 $(obj.currentTarget).find('.reslist-view-topo').removeClass('hide');
                 $(obj.currentTarget).find('.reslist-view-topo').removeClass('hide');
                 $(obj.currentTarget).find('.reslist-assets-details').removeClass('hide');
                 $(obj.currentTarget).find('.reslist-assets-details').removeClass('hide');
+                // Start 资源视图中的资源名称在表格中溢出时给最大宽度限制-更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6
+                var w=$(obj.currentTarget).find('#res-div span').innerWidth();
+                var spanMaxW=parseInt($(obj.currentTarget).find('#res-div span').css('max-width'));
+                //-20是一个图标的宽度，若要增加图标，这里的20需要增加
+                var maxW=(w-20)+'px';
+                if(w+15>=spanMaxW){
+                    $(obj.currentTarget).find('#res-div span').css('max-width',maxW)
+                }
             }, function (obj) {
             }, function (obj) {
                 $(obj.currentTarget).find('.reslist-view-topo').addClass('hide');
                 $(obj.currentTarget).find('.reslist-view-topo').addClass('hide');
                 $(obj.currentTarget).find('.reslist-assets-details').addClass('hide');
                 $(obj.currentTarget).find('.reslist-assets-details').addClass('hide');
+                var w=$(obj.currentTarget).find('#res-div span').innerWidth();
+                var spanMaxW=parseInt($(obj.currentTarget).find('#res-div span').css('max-width'));
+                var maxW=(w+20)+'px';
+                if(w+15>=spanMaxW){
+                    $(obj.currentTarget).find('#res-div span').css('max-width',maxW)
+                }
+                //End LSQ 2022/1/6
             })
             })
 
 
             // 加入/移出收藏夹
             // 加入/移出收藏夹

@@ -595,8 +595,13 @@
 
 
 <!--资源名称-->
 <!--资源名称-->
 <script type="text/html" id="resindex_resName">
 <script type="text/html" id="resindex_resName">
-    <div>
-        <span lay-tips="{{ d.resName }}" style="float: left;width: 180px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;" data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminname="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" data-manageIp="{{d.manageIp}}" data-collProtocol="{{d.collProtocol}}"  data-provider="{{d.provider}}" data-state="{{d.state}}" class="layui-table-link">{{ d.resName }}</span>
+    <!-- 更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6-->
+    <div id="res-div">
+        {{# var w=$("[lay-id='resListTable'] table thead th[data-field='resName']").data('minwidth');
+            var maxW=(w-45)+'px';
+            var styleW="float: left;max-width: "+maxW+";overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;";
+        }}
+        <span lay-tips="{{ d.resName }}" style="{{styleW}}" data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminname="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" data-manageIp="{{d.manageIp}}" data-collProtocol="{{d.collProtocol}}"  data-provider="{{d.provider}}" data-state="{{d.state}}" class="layui-table-link">{{ d.resName }}</span>
         {{# if (d.favId == null) { }}
         {{# if (d.favId == null) { }}
         <a class="layui-icon layui-icon-rate hide" data-favid="{{d.favId}}" data-id="{{d.resId}}" lay-tips="加入收藏夹" style="font-size: 14px"></a>
         <a class="layui-icon layui-icon-rate hide" data-favid="{{d.favId}}" data-id="{{d.resId}}" lay-tips="加入收藏夹" style="font-size: 14px"></a>
         {{# } else { }}
         {{# } else { }}