Merge branch 'master-v32-xwx' into 'master'

杭州-资源视图-资源视图基本信息弹出框bug修改



See merge request !17

@@ -3084,13 +3084,13 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                             common.openWin(url, name, params,null,null,null,['80%', '80%']);
                             common.openWin(url, name, params,null,null,null,['80%', '80%']);
                         });
                         });
 
 
-                        //点击空白，关闭悬浮提示页
-                        $(document).on('click',function (event) {
-                            var _con = $('.layui-layer-tips');  // 设置目标区域
-                            if(!_con.is(event.target) && _con.has(event.target).length === 0){
-                                layer.close(detailTips);
-                            }
-                        })
+                        // //点击空白，关闭悬浮提示页
+                        // $(document).on('click',function (event) {
+                        //     var _con = $('.layui-layer-tips');  // 设置目标区域
+                        //     if(!_con.is(event.target) && _con.has(event.target).length === 0){
+                        //         layer.close(detailTips);
+                        //     }
+                        // })
                     },
                     },
                     yes:function (index) {
                     yes:function (index) {
                         layer.close(index);
                         layer.close(index);
@@ -3177,15 +3177,22 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 }
                 }
                 var $content = $(`#${targetId}`).clone();
                 var $content = $(`#${targetId}`).clone();
                 $content.find('[lay-tips]').removeAttr('lay-tips');
                 $content.find('[lay-tips]').removeAttr('lay-tips');
-
-                detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true});
+                // detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true});
+                //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --start
+                detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{
+                    id: 'base-info-tips',
+                    area:[w, 'auto'],
+                    time:0,
+                    tips: [direction],
+                    tipsMore: true,
+                    //添加遮罩层 默认透明度为0.3
+                    shade: [0.1, '#00000000'],
+                    //是否点击遮罩关闭
+                    shadeClose: true
+                });
+                //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --end
                 window.detailTips = detailTips;
                 window.detailTips = detailTips;
             });
             });
-            //xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --start
-            $(".detail_base_info").mouseleave(function () {
-                layer.close(detailTips);
-            })
-            //xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --end
         // ,function () {
         // ,function () {
         //         layer.close(detailTips);
         //         layer.close(detailTips);
         //     }
         //     }