Merge branch 'master' of http://122.114.176.216:7070/r/CustomForm-publish

quchenming

2018-03-27 f8942f65fe8ffe06599485e18468cd328e6cce20

Merge branch 'master' of http://122.114.176.216:7070/r/CustomForm-publish

 publish/js/customMin/customS_min.js

@@ -1453,7 +1453,7 @@
            fileSingleSizeLimit: 20 * 1024 * 1024,    // 50 M
            accept: {// 只允许选择图片文件格式
                title: 'File',
                extensions: 'zip,rar,xls,xlsx,doc,docx,ppt,pptx,rtf',
                extensions: 'zip,rar,mp3,mp4,xls,xlsx,doc,docx,ppt,pptx,rtf',
                mimeTypes: ''
            },

@@ -1471,7 +1471,7 @@
        });
        uploader.on('error', function (type) {
            if (type == "Q_TYPE_DENIED") {
                customBase.alert("myModal", "请上传zip,rar,xls,xlsx,doc,docx,ppt,pptx,rtf格式文件", "");
                customBase.alert("myModal", "请上传zip,rar,mp3,mp4,xls,xlsx,doc,docx,ppt,pptx,rtf格式文件", "");
            }
        });
        // 当有文件添加进来的时候
@@ -6896,16 +6896,26 @@

                    }
                    for (i in value) {
                        var $li = $(
                            '<div class="">' +
                            // '<div class="info"><a href="' + value[i].path + '" >' + value[i].oldName + '</a></div>' +
                            // '<div class="info info-box"><div class="info_box">' + value[i].oldName +
                            // '<span class="x_box" style="display:none;">×</span>' +
                            // '<img class="img_box" style="display:none;" src="' + value[i].path + '">' +

                            '<div><a href="' + value[i].path + '" >' + value[i].oldName + '</a></div>' +
                            '</div>'
                        );
                        var fileDir = value[i].path;
                        var suffix = fileDir.substr(fileDir.lastIndexOf(".")+1);
                        if(suffix == "mp4"){
                            var $li = $(
                                '<div class="">' +
                                '<div><a href="' + value[i].path + '" target="_blank">' + value[i].oldName + ' </a></div>' +
                                '</div>'
                            );
                        }else{
                            var $li = $(
                                '<div class="">' +
                                // '<div class="info"><a href="' + value[i].path + '" >' + value[i].oldName + '</a></div>' +
                                // '<div class="info info-box"><div class="info_box">' + value[i].oldName +
                                // '<span class="x_box" style="display:none;">×</span>' +
                                // '<img class="img_box" style="display:none;" src="' + value[i].path + '">' +
    
                                '<div><a href="' + value[i].path + '" >' + value[i].oldName + '</a></div>' +
                                '</div>'
                            );
                        }
                        $li.appendTo($list);
                    };
                }
@@ -9538,7 +9548,11 @@
    if (code != "") {
        var dataObj = {};
        dataObj.tenantIDForMaster = 1;
        dataObj.code = code;
         if(_.isString(code)){
            dataObj.code = code;
        }else{
            dataObj.code = JSON.stringify(code);
        }
        dataObj.callbackId = callbackId;
        //console.log(dataObj);
        let customlocalStorage = window.localStorage.getItem("bussinessSystem");