Merge remote-tracking branch 'origin/dev'

cmp-portal/css/common.css

@@ -1,8 +1,8 @@
@charset "utf-8";
/*reset*/
p,dl,dt,dd,ul,ol,li,a,em,div,span,th,td{margin:0;padding:0; word-break:break-all; font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
p,dl,dt,dd,ul,ol,li,a,em,div,span{margin:0;padding:0; word-break:break-all; font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
form,label,button,input,select,textarea{font-size:14px; font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
h1,h2,h3,h4,h5,h6{font-size:100%;margin:0;padding:0; font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
h1,h2,h3,h4,h5,h6{font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
html,body{height:100%; width:100%; margin:0;padding:0;font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
input{vertical-align:middle; outline:none;}
img{color:transparent;font-size:0;vertical-align:middle;-ms-interpolation-mode:bicubic;border:0;padding:0; margin:0;}
@@ -10,6 +10,7 @@ small{font-size:12px;}
ul,ol{list-style:none;}
button,input,select,textarea{font-size:100%;}
table{border-collapse:collapse;border-spacing:0;}
table>tbody>tr>td,table>tbody>tr>th{padding: 5px 10px;border: 1px solid #DDD;}
body{height:auto;position: relative;min-height: 100%;}
a{text-decoration:none;color:#666}

cmp-portal/js/articalIssue.js

@@ -36,30 +36,38 @@ $(function() {
				multiple: false
			}
		});
		uploaderFile.on('error', function(code) {
			if(code=="F_EXCEED_SIZE"){
				$.MsgBox.Alert('提示', '上传附件的大小不超过50M')
			}
		});
		var fileId;
		// 当有文件添加进来的时候
		uploaderFile.on('fileQueued', function(file) {
			fileId = file.id;
			var $li = $(
				'<li class="file_list ellipsisSty-2" data-id="'+file.id+'" data-size="'+file.size+'" data-name="'+file.name+'">'+
					file.name +
					'<div class="deleteThis"></div>'+
				'</li>'
			),
				$file = $li.find('li');
			var $list = $("#fileAttachList");
			$list.prepend($li);
			var $len = $("#fileAttachList").find("li").length;
			if($len>0 && $len<5){
				$("#upAttachPicker").addClass("upAtteched")
				$("#upAttachPicker>.webuploader-pick").text('继续上传')
			}
			if($len>=5){
				$("#upAttachPicker").hide()
			}
		});
		uploaderFile.on('uploadError', function(file, data) {
			$.MsgBox.Alert('提示', '该附件上传失败，请重试')
		});
		uploaderFile.on('uploadSuccess', function(file, data) {
			if(data.success) {
				var $li = $(
					'<li class="file_list ellipsisSty-2" data-id="'+file.id+'" data-size="'+file.size+'" data-name="'+file.name+'">'+
						file.name +
						'<div class="deleteThis"></div>'+
					'</li>'
				),
					$file = $li.find('li');
				var $list = $("#fileAttachList");
				$list.prepend($li);
				var $len = $("#fileAttachList").find("li").length;
				if($len>0 && $len<5){
					$("#upAttachPicker").addClass("upAtteched")
					$("#upAttachPicker>.webuploader-pick").text('继续上传')
				}
				if($len>=5){
					$("#upAttachPicker").hide()
				}
				uploaderFile.removeFile(fileId);
				$("#fileAttachList li:first-child").attr("data-url",data.data[0].uri);
			}

cmp-portal/js/articalModify.js

@@ -41,35 +41,42 @@ $(function() {
				multiple: false
			}
		});
		uploaderFile.on('error', function(code) {
			if(code=="F_EXCEED_SIZE"){
				$.MsgBox.Alert('提示', '上传附件的大小不超过50M')
			}
		});
		var fileId;
		// 当有文件添加进来的时候
		uploaderFile.on('fileQueued', function(file) {
			fileId = file.id;
			var $li = $(
				'<li class="file_list ellipsisSty-2" data-id="'+file.id+'" data-size="'+file.size+'" data-name="'+file.name+'">'+
					file.name +
					'<div class="deleteThis"></div>'+
				'</li>'
			),
				$file = $li.find('li');
			var $list = $("#fileAttachList");
			$list.prepend($li);
			var $len = $("#fileAttachList").find("li").length;
			if($len>0 && $len<5){
				$("#upAttachPicker").addClass("upAtteched")
				$("#upAttachPicker>.webuploader-pick").text('继续上传')
			}
			if($len>=5){
				$("#upAttachPicker").hide()
			}
		});
		uploaderFile.on('uploadError', function(file, data) {
			$.MsgBox.Alert('提示', '该附件上传失败，请重试')
		});
		uploaderFile.on('uploadSuccess', function(file, data) {
			if(data.success) {
				var $li = $(
					'<li class="file_list ellipsisSty-2" data-id="'+file.id+'" data-size="'+file.size+'" data-name="'+file.name+'">'+
						file.name +
						'<div class="deleteThis"></div>'+
					'</li>'
				),
					$file = $li.find('li');
				var $list = $("#fileAttachList");
				$list.prepend($li);
				var $len = $("#fileAttachList").find("li").length;
				if($len>0 && $len<5){
					$("#upAttachPicker").addClass("upAtteched")
					$("#upAttachPicker>.webuploader-pick").text('继续上传')
				}
				if($len>=5){
					$("#upAttachPicker").hide()
				}
				uploaderFile.removeFile(fileId);
				$("#fileAttachList li:first-child").attr("data-url",data.data[0].uri);
			}
		});
	//校验标题
	$("#newstitle").on({
		focus: function() {

cmp-portal/js/cmp-productIssue.js

@@ -116,7 +116,7 @@ $(document).ready(function() {
		accept: {
			title: 'Images',
			extensions: 'jpg,jpeg,png',
			mimeTypes: 'image/jpg,image/png'
			mimeTypes: 'image/jpg,image/png,image/jpeg'
		}
	});

cmp-portal/js/resourceIssue.js

@@ -113,7 +113,7 @@ $(document).ready(function() {
			accept: {
				title: 'Images',
				extensions: 'jpg,jpeg,png',
				mimeTypes: 'image/jpg,image/png'
				mimeTypes: 'image/jpg,image/png,image/jpeg'
			}
	
		});

css/common.css

@@ -2,7 +2,7 @@
/*reset*/
p,dl,dt,dd,ul,ol,li,a,em,div,span,th,td{margin:0;padding:0; word-break:break-all; font-family: PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif}
form,label,button,input,select,textarea{font-size:14px; font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif}
h1,h2,h3,h4,h5,h6{font-size:100%;margin:0;padding:0; font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
h1,h2,h3,h4,h5,h6{font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
html,body{height:100%; width:100%; margin:0;padding:0;font-family:PingFang SC,Arial,Microsoft Yahei,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
input{vertical-align:middle; outline:none;}
img{color:transparent;font-size:0;vertical-align:middle;-ms-interpolation-mode:bicubic;border:0;padding:0; margin:0;}
@@ -10,6 +10,7 @@ small{font-size:12px;}
ul,ol{list-style:none;}
button,input,select,textarea{font-size:100%;}
table{border-collapse:collapse;border-spacing:0;}
table>tbody>tr>td,table>tbody>tr>th{padding: 5px 10px;border: 1px solid #DDD;}
a,a:active,a:hover{outline:0;text-decoration:none;}
/* CSS Document */

js/articalPreview.js

@@ -139,7 +139,7 @@ $(function() {
						var itlist = '<li>'+
							'<span class="atach-name ellipsisSty">'+data.data[i].name+'</span>'+
							'<span class="atach-size">'+sizeTo(data.data[i].size)+'</span>'+
							'<a href="/data/article/file'+data.data[i].url+'?_dl='+data.data[i].name+'" class="atach-down">点击下载</a>'+
							'<a href="/data/article/file'+data.data[i].url+'" class="atach-down">点击下载</a>'+
						'</li>'
						$("#atachList").append(itlist);
					}

js/articalShow.js

@@ -59,7 +59,7 @@ $(document).ready(function() {
						var itlist = '<li>'+
							'<span class="atach-name ellipsisSty">'+data.data[i].name+'</span>'+
							'<span class="atach-size">'+sizeTo(data.data[i].size)+'</span>'+
							'<a href="/data/article/file'+data.data[i].url+'?_dl='+data.data[i].name+'" class="atach-down">点击下载</a>'+
							'<a href="/data/article/file'+data.data[i].url+'" class="atach-down">点击下载</a>'+
						'</li>'
						$("#atachList").append(itlist);
					}

js/articalShow2.js

@@ -58,7 +58,7 @@ $(document).ready(function() {
						var itlist = '<li>'+
							'<span class="atach-name ellipsisSty">'+data.data[i].name+'</span>'+
							'<span class="atach-size">'+sizeTo(data.data[i].size)+'</span>'+
							'<a href="/data/article/file'+data.data[i].url+'?_dl='+data.data[i].name+'" class="atach-down">点击下载</a>'+
							'<a href="/data/article/file'+data.data[i].url+'" class="atach-down">点击下载</a>'+
						'</li>'
						$("#atachList").append(itlist);
					}

js/discover.js

@@ -111,7 +111,7 @@ $(function() {
			accept: {
				title: 'Images',
				extensions: 'jpg,jpeg,png',
				mimeTypes: 'image/jpg,image/png'
				mimeTypes: 'image/jpg,image/jpeg,image/png'
			}
	
		});
@@ -156,8 +156,9 @@ $(function() {
			}, 1, 1);
		});
		uploader.onError = function(code) {
			console.log(code)
			$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过2M')
			if(code=="F_EXCEED_SIZE"){
				$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过2M')	
			}
		};
		uploader.on('uploadSuccess', function(file, data) {
			if(data.success) {

js/resourceIssue.js

@@ -118,7 +118,7 @@ $(document).ready(function() {
		accept: {
			title: 'Images',
			extensions: 'jpg,jpeg,png',
			mimeTypes: 'image/jpg,image/png'
			mimeTypes: 'image/jpg,image/png,image/jpeg'
		}
	});

js/ueditor/dialogs/image/image.css

@@ -316,6 +316,7 @@
#upload .filelist li {
    width: 113px;
    height: 113px;
    box-sizing:border-box;
    background: url(./images/bg.png);
    text-align: center;
    margin: 9px 0 0 9px;
@@ -327,6 +328,11 @@
    font-size: 12px;
}
#upload .filelist .move {
   border: 2px dashed green;
   opacity: 0.7
}
#upload .filelist li p.log {
    position: relative;
    top: -45px;

js/ueditor/dialogs/image/image.js

@@ -399,10 +399,41 @@
            });
            setState('pedding');
            $('.filelist').on('dragstart','li', function(ev){
            	$(this).addClass('move')
				ev.originalEvent.dataTransfer.setData("Text",ev.currentTarget.id);
            })
             $('.filelist').on('dragend','li', function(ev){
            	$('.filelist').find('li').removeClass('move')
            })
             $('.filelist').on('drop','li', function(ev){ 
             	var currendId = ev.currentTarget.id;
             	var moveId = ev.originalEvent.dataTransfer.getData("Text");
             	if(currendId == 'filePickerBlock' || moveId == 'filePickerBlock') {
             		return;
             	}
             	var arr = [];
             	var $s = $('.filelist').children();
             	for(var i = 0; i < $s.length-1; i++) {
             		arr.push($s[i].id)
             	}
             	var currendIndex = arr.indexOf(currendId);
             	var moveIndex = arr.indexOf(moveId)
             	var chang1 = $('#'+ currendId);
             	var chang2 = $('#'+ moveId);
             	if (moveIndex < currendIndex) {
             		chang2.insertAfter(chang1);
             	} 
             	if (moveIndex > currendIndex) {
             		chang2.insertBefore(chang1);
             	}
            })
             $('.filelist').on('dragover','li', function(ev){
             	ev.preventDefault()
            })
            // 当有文件添加进来时执行，负责view的创建
            function addFile(file) {
                var $li = $('<li id="' + file.id + '">' +
                var $li = $('<li id="' + file.id + '" draggable="true" style="cursor:move">' +
                        '<p class="title">' + file.name + '</p>' +
                        '<p class="imgWrap"></p>' +
                        '<p class="progress"><span></span></p>' +
@@ -721,6 +752,7 @@
                    var responseText = (ret._raw || ret),
                        json = utils.str2json(responseText);
                    if (json.state == 'SUCCESS') {
                    	json.index = file.id;
                        _this.imageList.push(json);
                        $file.append('<span class="success"></span>');
                    } else {
@@ -770,9 +802,21 @@
            this.$wrap.remove();
        },
        getInsertList: function () {
            var $s = $('.filelist').children();
            var arr = []
            for(var i = 0; i < $s.length-1; i++) {
             	arr.push($s[i].id)
             }
            this.imageList.forEach(function(item) {
            	item.index = arr.indexOf(item.index);
            })
            var i, data, list = [],
                align = getAlign(),
                prefix = editor.getOpt('imageUrlPrefix');
                this.imageList.sort(function(x, y) {
	                if(x.index <= y.index) return -1;
	                return 1;
            	});
            for (i = 0; i < this.imageList.length; i++) {
                data = this.imageList[i];
                list.push({

js/ueditor/ueditor.all.js

@@ -18966,12 +18966,12 @@ UE.plugins['video'] = function (){
                for (var r = 0; r < rowsNum; r++) {
                    html.push('<tr' + (r == 0 ? ' class="firstRow"':'') + '>');
                    for (var c = 0; c < colsNum; c++) {
                        html.push('<td width="' + tdWidth + '"  vAlign="' + opt.tdvalign + '" >' + (browser.ie && browser.version < 11 ? domUtils.fillChar : '<br/>') + '</td>')
                        html.push('<td style="border:1px solid #ccc;" width="' + tdWidth + '"  vAlign="' + opt.tdvalign + '" >' + (browser.ie && browser.version < 11 ? domUtils.fillChar : '<br/>') + '</td>')
                    }
                    html.push('</tr>')
                }
                //禁止指定table-width
                return '<table><tbody>' + html.join('') + '</tbody></table>'
                return '<table style="border-collapse:collapse;"><tbody>' + html.join('') + '</tbody></table>'
            }
            if (!opt) {
@@ -19826,13 +19826,21 @@ UE.plugins['video'] = function (){
            if (!table) return -1;
            return 0;
        },
        execCommand: function () {
            var table = getTableItemsByRange(this).table;
            utils.each(domUtils.getElementsByTagName(table,'td'),function(td){
                td.style.borderWidth = '1px';
                td.style.borderStyle = 'solid';
            })
        }
        execCommand: function () {
		    var table = getTableItemsByRange(this).table;
		    utils.each(domUtils.getElementsByTagName(table,'td'),function(td){
		        td.style.borderWidth = '1px';
		        td.style.borderStyle = 'solid';
		        td.style.borderColor = 'windowtext';
		    });
		    //增加下面一段
		    utils.each(domUtils.getElementsByTagName(table,'th'),function(th){
		        th.style.borderWidth = domUtils.getComputedStyle(th, "border-width");
		        th.style.borderStyle = 'solid';
		        th.style.borderColor = 'windowtext';
		    });
		}
    };
    function resetTdWidth(table, editor) {
        var tds = domUtils.getElementsByTagName(table,'td th');
@@ -20237,18 +20245,41 @@ UE.plugins['table'] = function () {
                    if (domUtils.findParentByTagName(me.selection.getStart(), 'caption', true)) {
                        div.innerHTML = div[browser.ie ? 'innerText' : 'textContent'];
                    }
                } else {
                    utils.each(tables, function (table) {
                        removeStyleSize(table, true);
                        domUtils.removeAttributes(table, ['style', 'border']);
                        utils.each(domUtils.getElementsByTagName(table, "td"), function (td) {
                            if (isEmptyBlock(td)) {
                                domUtils.fillNode(me.document, td);
                            }
                            removeStyleSize(td, true);
//                            domUtils.removeAttributes(td, ['style'])
                        });
                    });
                } else {
                	utils.each(tables, function (table) {                        
                        //粘贴进来的表格table定义属性
                        domUtils.setAttributes(table, {
                            style:'border-left:1px solid #666; border-top:1px solid #ccc;',
                        });                                            
                        
                        removeStyleSize(table, true);
                        domUtils.removeAttributes(table, ['style', 'border']);
                        //domUtils.removeAttributes(table, ['style']);//no remove table Style
                        utils.each(domUtils.getElementsByTagName(table, "td"), function (td) {
                            
                            //粘贴进来的表格td定义属性
                            domUtils.setAttributes(td, {
                                style:'border-bottom:1px solid #666; border-right:1px solid #ccc; padding:5px;',
                            });                        
                        
                            if (isEmptyBlock(td)) {
                                domUtils.fillNode(me.document, td);
                            }
                            removeStyleSize(td, true);
                            //domUtils.removeAttributes(td, ['style'])
                        });
                    });
//                  utils.each(tables, function (table) {
//                      removeStyleSize(table, true);
//                      domUtils.removeAttributes(table, ['style']); // ['style', 'border']
//                      utils.each(domUtils.getElementsByTagName(table, "td"), function (td) {
//                          if (isEmptyBlock(td)) {
//                              domUtils.fillNode(me.document, td);
//                          }
//                          removeStyleSize(td, true);
//                      });
//                  });
                }
                html.html = div.innerHTML;
            }
@@ -21908,6 +21939,7 @@ UE.plugins['tablesort'] = function () {
        execCommand: function (cmd) {
            var table = getTableItemsByRange(this).table;
            table.setAttribute("data-sort", cmd == "enablesort" ? "sortEnabled" : "sortDisabled");
            table.setAttribute("style", "border-collapse:collapse;");
            cmd == "enablesort" ? domUtils.addClass(table,"sortEnabled"):domUtils.removeClasses(table,"sortEnabled");
        }
    };
@@ -23830,7 +23862,6 @@ UE.plugin.register('autoupload', function (){
                if (json.state == 'SUCCESS' && json.url) {
                    successHandler(json);
                } else {
                	alert(1111);
                    errorHandler(json.state);
                }
            }catch(er){
@@ -25996,7 +26027,7 @@ UE.ui = baidu.editor.ui = {};
                '<div class="edui-box edui-icon"></div>' +
                '</div>' +
                '<div class="edui-box edui-splitborder"></div>' +
//              '<div class="edui-box edui-arrow" onclick="$$._onArrowClick();"></div>' +
                '<div class="edui-box edui-arrow" onclick="$$._onArrowClick();"></div>' +
                '</div></div></div>';
        },
        showPopup: function (){

js/ueditor/ueditor.config.js

@@ -40,7 +40,9 @@
            'insertorderedlist', 'insertunorderedlist', '|',
            'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|',
            'spechars', '|',
           	'superscript', 'subscript','|','link','simpleupload','insertimage'
           	'superscript', 'subscript','|','link','simpleupload','insertimage', '|', 
           	'removeformat','formatmatch', '|',
           	'inserttable', 'mergecells', 'splittocells'
        ]]
        
        /*, toolbars: [[
@@ -121,7 +123,7 @@
        //粘贴只保留标签，去除标签所有属性
        //,retainOnlyLabelPasted: false
        ,pasteplain:true  //是否默认为纯文本粘贴。false为不使用纯文本粘贴，true为使用纯文本粘贴
        ,pasteplain:false  //是否默认为纯文本粘贴。false为不使用纯文本粘贴，true为使用纯文本粘贴
        //纯文本粘贴模式下的过滤规则
        //'filterTxtRules' : function(){
        //    function transP(node){
@@ -332,7 +334,7 @@
        //tableDragable
        //表格是否可以拖拽
        //,tableDragable: true
          ,tableDragable: true
@@ -373,7 +375,7 @@
		,outputXssFilter: true
		// xss过滤白名单 名单来源: https://raw.githubusercontent.com/leizongmin/js-xss/master/lib/default.js
		,whitList: {
			/*a:      ['target', 'href', 'title', 'class', 'style'],
			a:      ['target', 'href', 'title', 'class', 'style'],
			abbr:   ['title', 'class', 'style'],
			address: ['class', 'style'],
			area:   ['shape', 'coords', 'href', 'alt'],
@@ -435,70 +437,7 @@
			tt:     [],
			u:      [],
			ul:     ['class', 'style'],
			video:  ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'class', 'style']*/
			a:      ['target', 'href', 'title', 'class', 'style'],
			abbr:   [],
			address: [],
			area:   [],
			article: [],
			aside:  [],
			audio:  [],
			b:      [],
			bdi:    [],
			bdo:    [],
			big:    [],
			blockquote: [],
			br:     [],
			caption: [],
			center: [],
			cite:   [],
			code:   [],
			col:    [],
			colgroup: [],
			dd:     [],
			del:    [],
			details: [],
			div:    [],
			dl:     [],
			dt:     [],
			em:     [],
			font:   [],
			footer: [],
			h1:     [],
			h2:     [],
			h3:     [],
			h4:     [],
			h5:     [],
			h6:     [],
			header: [],
			hr:     [],
			i:      [],
			img:    ['src', 'alt', 'title', 'width', 'height', 'id', '_src', 'loadingclass', 'class', 'data-latex'],
			ins:    [],
			li:     [],
			mark:   [],
			nav:    [],
			ol:     [],
			p:      ['style'],
			pre:    [],
			s:      [],
			section:[],
			small:  [],
			span:   [],
			sub:    [],
			sup:    [],
			strong: [],
			table:  [],
			tbody:  [],
			td:     [],
			tfoot:  [],
			th:     [],
			thead:  [],
			tr:     [],
			tt:     [],
			u:      [],
			ul:     [],
			video:  []
			video:  ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'class', 'style']
		}
    };