调整弹出22类型窗体时出现界面错误问题和40控件类型的优化

xinyb_

2021-04-09 631e919dac10344daf7f8b4e0949d298dda28ea7

调整弹出22类型窗体时出现界面错误问题和40控件类型的优化

 WebRoot/js/hotkey.js

@@ -1123,6 +1123,9 @@
                shift: 1,
                shadeClose: true, //点击遮罩关闭层
                area: ['800px', '460px'],
                success:function(){
                    $('.layui-layer-iframe').find('iframe').contents().find('#scroller').css('overflow-x','hidden');
                },
                content: str       //'/app/67/0/cnzh/110502/1/index.jsp'
            });
        },
@@ -1162,6 +1165,9 @@
                content: str,      //'/app/67/0/cnzh/110502/1/index.jsp'
                end: function () {
                    closeLoading();
                },
                success:function(){
                    $('.layui-layer-iframe').find('iframe').contents().find('#scroller').css('overflow-x','hidden');
                }
            });
        },
@@ -1203,6 +1209,9 @@
                shift: 1,
                shadeClose: true, //点击遮罩关闭层
                area: ['540px', '425px'],
                success:function(){
                    $('.layui-layer-iframe').find('iframe').contents().find('#scroller').css('overflow-x','hidden');
                },
                content: str       //'/app/67/0/cnzh/110502/1/index.jsp'
            });
        },
@@ -1241,6 +1250,9 @@
                shift: 1,
                shadeClose: true, //点击遮罩关闭层
                area: ['300px', '150px'],
                success:function(){
                    $('.layui-layer-iframe').find('iframe').contents().find('#scroller').css('overflow-x','hidden');
                },
                content: str       //'/app/67/0/cnzh/110502/1/index.jsp'
            });
        },
@@ -1646,18 +1658,19 @@
            this.table42 = layui.table;
            this.isControl42();
        } else {
            var that=this;
            $("<link>").attr({
                rel: "stylesheet",
                type: "text/css",
                href: "/layui/css/layui.css"
            }).appendTo("head");
            $.getScript('/layui/layui.all.js', function () {
                if (typeof layui != 'undefined') {
                if (typeof layui == 'undefined') {
                    console.log('获取42控件插件层失败！');
                    return null;
                }
                this.table42 = layui.table;
                this.isControl42();
                that.table42 = layui.table;
                that.isControl42();
            })
        }
    }

 WebRoot/js/panel.js

@@ -173,12 +173,13 @@
                $(this.doc).css(style, v);
            },
            src : function(v){//40控件类型 -xin 2020-6-15 17:19:20
                if(v==null){
                if (v == null) {
                    return $(this.doc).attr('value');//$(this.doc)[0].src;
                }else{
                    if(!v.toLowerCase().startsWith('https:') && !v.toLowerCase().startsWith('http:')){
                        $(this.doc).attr('src','/getImage.do?type=1&uuid='+v);
                    }
                }
                if (!v.toLowerCase().startsWith('https:') && !v.toLowerCase().startsWith('http:')) {
                    $(this.doc).attr('src', '/getImage.do?type=1&uuid=' + v);
                } else {
                    $(this.doc).attr('src', v);
                }
            },
            attr : function(attr, v) {
@@ -2940,4 +2941,20 @@
    }catch(e){
        //options.content='加载信息失败【失败原因：'+e+'】';
    }
    //处理40控件浏览图片,遍历40控件
    $('.isViewer40').each(function(){
        var v = $(this).attr('value');
        if (v != null && v != '') {
            var viewers = new Viewer(this, {
                movable: false,
                navbar:false,
                url: $doc($(this).attr('id')).src(v),
                shown: function () {
                    $('.viewer-container').css('margin-top', '70');
                }
            });
        } else {
            $(this).attr('src','/images/help/fenlei_right.png');
        }
    })
})

 src/com/yc/service/panel/v2/TypeControl.java

@@ -468,10 +468,10 @@
                pHelper.linkJsFu = "\n<link rel=\"stylesheet\" type=\"text/css\" href=\"/general/Viewer/css/viewer.min.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/general/Viewer/css/viewer.min.css\")%>\">";
                pHelper.linkJsFu += "\n<script type=\"text/javascript\" src=\"/general/Viewer/js/viewer-jquery.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/general/Viewer/js/viewer-jquery.min.js\")%>\"></script>";
                pHelper.linkJsFu += "\n<script type=\"text/javascript\" src=\"/general/Viewer/js/viewer.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,\"/general/Viewer/js/viewer.min.js\")%>\"></script>";
                returnStr += "<div style=\"border: 1px solid #cccccc;\">"
                        + "<img id="+id+" src=\""+getJspValue(id)+"\" value=\""+getJspValue(id)+"\" alt=\""+DBHelper.getValue(sys, "fieldname")+"\""
                        + " src-source style=\"width:"+w+"px;height:"+h+"px;\"/></div>";
                returnStr+="<script>$doc('"+id+"').src($doc('"+id+"').src());$('#"+id+"').viewer({movable:false});</script>";
                returnStr += "<div style=\"border: 1px solid #99BBE8;border-radius: 5px;\">"
                        + "<img id="+id+" class=\"isViewer40\" src=\""+getJspValue(id)+"\" value=\""+getJspValue(id)+"\" alt=\""+DBHelper.getValue(sys, "fieldname")+"\""
                        + " src-source style=\"width:100%;height:"+h+"px;\"/></div>";
//                returnStr+="<script>$(function(){OpenImage40('"+id+"')})</script>";
                break;
            case 41:// 标签(label)
                String secc = "style=\"font-size: 16px;\"";