调整40图片控件类型加载

xinyb_

2021-04-13 2810482d475d796d90c9be4bfa7d37cfbd45e781

调整40图片控件类型加载

 WebRoot/js/panel.js

@@ -174,13 +174,13 @@
            },
            src : function(v){//40控件类型 -xin 2020-6-15 17:19:20
                if (v == null) {
                    return $(this.doc).attr('value');//$(this.doc)[0].src;
                    return $(this.doc).data('value');//$(this.doc)[0].src;
                }
                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);
                }
                // 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) {
                $(this.doc).attr(attr, v);
@@ -2943,37 +2943,53 @@
    }
    //处理40控件浏览图片,遍历40控件
    $('.isViewer40').each(function(){
        var v = $(this).attr('value');
        var path ='/images/help/fenlei_right.png';
        var that = this;
        var v = $(this).data('value');
        var path = '/images/help/fenlei_right.png';
        if (v != null && v != '') {
            if (v.toLowerCase().startsWith('https:') && v.toLowerCase().startsWith('http:')) {
                $(that).append('<li style="width:auto;display: inline-block; margin: 1%;">' +
                    '<img src="' + v + '" alt="" style="width: 100%;height: 150px"/></li>');
                new Viewer(that, {
                    title: false,
                    // url: 'src',
                    shown: function () {
                        $('.viewer-container').css('margin-top', '70');
                    }
                });
                return;
            }
            var type = 9;
            type = (v.split(';') != null ? (v.split(';').length > 2 ? 19 : type) : type);
            var data = {
                unid: v,
                controltype: 9,
                controltype: type,
                fieldid: this.id,
                formid: formId,
                doccode:$("#doccode").val(),
                headflag:0
                doccode: $("#doccode").val(),
                headflag: 0
            }
            var that = this;
            $.post('/attachment/getAttachmentList.do', {'pant': JSON.stringify(data)}, function (d) {
                if (d != null && d[0]!=null) {
                    var data = d[0];
                    path = data.domain + "/uploads/attachment/" + data.dbid + "/" + data.formid + "/" + data.unid + "@p@" + data.seq +"."+ data.orgFileType;
                    $(that).attr('src', path);
                    var viewers = new Viewer(that, {
                        movable: false,
                        navbar: false,
                        url: path,//$doc($(that).attr('id')).src(v),
            $.post('/attachment/getAttachmentList.do', {'pant': JSON.stringify(data)}, function (data) {
                if (data != null) {
                    var width = 'auto';
                    width = (data.length > 1 ? '150px' : width);
                    for (var i = 0; i < data.length; i++) {
                        path = data[i].domain + "/uploads/attachment/" + data[i].dbid + "/" + data[i].formid + "/" + data[i].unid + "@p@" + data[i].seq + "." + data[i].orgFileType;
                        $(that).append('<li style="width:' + width + ';display: inline-block; margin: 1%;"><img src="' + path + '" alt="" style="width: 100%;height: 150px"/></li>');
                    }
                    new Viewer(that, {
                        title: false,
                        // url: 'src',
                        shown: function () {
                            $('.viewer-container').css('margin-top', '70');
                        }
                    });
                }else{
                    $(that).attr('src', path);
                } else {
                    $(that).append('<li><img src="' + path + '" alt="" style="width: 100%;height: 150px"/></li>');
                }
            });
        } else {
            $(this).attr('src', path);
            $(that).append('<li><img src="' + path + '" alt="" style="width: 100%;height: 150px"/></li>');
        }
    })
})

 WebRoot/style/commons.css

@@ -756,3 +756,7 @@
}
/*---end---重新调整面板上滚动条问题------*/

.isViewer40{
    margin-bottom: 0px!important;
    text-align: center;
}

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

@@ -469,8 +469,10 @@
                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 #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>";
                        + "<ul id=\""+id+"\" class=\"isViewer40\" data-value=\""+getJspValue(id)+"\">" +
                        "</ul></div>" ;
//                        "<img id="+id+" src=\""+getJspValue(id)+"\" value=\""+getJspValue(id)+"\" alt=\""+DBHelper.getValue(sys, "fieldname")+"\""
//                        + " src-source style=\"width:100%;height:150px;\"/>";
//                returnStr+="<script>$(function(){OpenImage40('"+id+"')})</script>";
                break;
            case 41:// 标签(label)