Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!1864

o2web/source/o2_core/o2/widget/AttachmentController.js

@@ -935,7 +935,7 @@ o2.widget.AttachmentController = o2.widget.ATTER  = new Class({
                                 };
                                 if (layout.desktop.message) layout.desktop.message.addTooltip(msg);
                                 if (layout.desktop.message) layout.desktop.message.addMessage(msg);
-                                if (o2 && o2.xDesktop && o2.xDesktop.notice) o2.xDesktop.notice("error", {"x": "right", "y": "top"}, "文件：“"+file.name+"”不符合允许上传类型", this.node);
+                                if (o2 && o2.xDesktop && o2.xDesktop.notice) o2.xDesktop.notice("info", {"x": "right", "y": "top"}, "文件：“"+file.name+"”不符合允许上传类型", this.node);
                             }else if (size && file.size> size*1024*1024){
                                 var msg = {
                                     "subject": o2.LP.widget.refuseUpload,
@@ -943,7 +943,7 @@ o2.widget.AttachmentController = o2.widget.ATTER  = new Class({
                                 };
                                 if (layout.desktop.message) layout.desktop.message.addTooltip(msg);
                                 if (layout.desktop.message) layout.desktop.message.addMessage(msg);
-                                if (o2 && o2.xDesktop && o2.xDesktop.notice) o2.xDesktop.notice("error", {"x": "right", "y": "top"}, "文件：“"+file.name+"”超出允许的大小，（仅允许上传小于"+size+"M的文件）", this.node);
+                                if (o2 && o2.xDesktop && o2.xDesktop.notice) o2.xDesktop.notice("info", {"x": "right", "y": "top"}, "文件：“"+file.name+"”超出允许的大小，（仅允许上传小于"+size+"M的文件）", this.node);
                             }else{
                                 var formData = new FormData();
                                 Object.each(obj, function(v, k){