提交 3d0a1e1d 编写于 作者: 蔡祥熠

Merge branch 'fix/Process.attachment_notice_level' into 'wrdp'

Merge of fix/Process.attachment_notice_level 修改附件超过大小的提示等级 to wrdp

See merge request o2oa/o2oa!1861
...@@ -935,7 +935,7 @@ o2.widget.AttachmentController = o2.widget.ATTER = new Class({ ...@@ -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.addTooltip(msg);
if (layout.desktop.message) layout.desktop.message.addMessage(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){ }else if (size && file.size> size*1024*1024){
var msg = { var msg = {
"subject": o2.LP.widget.refuseUpload, "subject": o2.LP.widget.refuseUpload,
...@@ -943,7 +943,7 @@ o2.widget.AttachmentController = o2.widget.ATTER = new Class({ ...@@ -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.addTooltip(msg);
if (layout.desktop.message) layout.desktop.message.addMessage(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{ }else{
var formData = new FormData(); var formData = new FormData();
Object.each(obj, function(v, k){ Object.each(obj, function(v, k){
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册