提交 a524247c 编写于 作者: U unknown

修复附件权限控制和排序对话框在移动端显示异常的问题

上级 eeff614d
......@@ -720,10 +720,14 @@
"attachmentPermissionNode": {
"overflow": "hidden",
"width": "500px",
"padding": "0px 40px",
"padding": "0px 40px"
},
"attachmentPermissionNode_mobile": {
"overflow": "hidden",
"padding": "0px 10px"
},
"attachmentPermissionNamesNode": {
"overflow": "hidden",
"overflow": "hidden"
},
"attachmentPermissionNamesTitleNode": {
"font-size": "14px",
......@@ -747,7 +751,7 @@
"attachmentPermissionTitleNode": {
"font-size": "14px",
"color": "#666666",
"height": "26px",
"min-height": "26px",
"line-height": "26px"
},
"attachmentPermissionInputNode": {
......@@ -1152,10 +1156,13 @@
"height": "600px",
"padding": "10px 10px 5px 10px"
},
"attachmentOrderNode_mobile":{
"padding": "10px 0px 5px 0px"
},
"attachmentOrderInforNode": {
"padding": "10px 20px 5px 20px",
"height": "30px",
"line-height": "30px",
"padding": "15px 20px 10px 20px",
"min-height": "20px",
"line-height": "20px",
"color": "#666666"
},
"attachmentOrderAreaNode": {
......@@ -1164,6 +1171,11 @@
"height": "530px",
"overflow": "auto"
},
"attachmentOrderAreaNode_mobile": {
"padding": "10px 0px 5px 0px",
"background-color": "#ffffff",
"overflow": "auto"
},
"attachmentOrderItemNode": {
"min-height": "30px",
"overflow": "auto",
......@@ -1186,11 +1198,23 @@
"padding": "0px 5px",
"color": "#666666"
},
"attachmentOrderItemTextNode_mobile": {
"margin-left": "30px",
"margin-right": "60px",
"min-height": "30px",
"padding": "0px 5px",
"color": "#666666"
},
"attachmentOrderItemActionNode": {
"width": "130px",
"height": "30px",
"float": "right"
},
"attachmentOrderItemActionNode_mobile": {
"width": "60px",
"height": "30px",
"float": "right"
},
"attachmentOrderItemActionUpNode": {
"border": "1px solid #999999",
"border-radius": "3px",
......
......@@ -732,7 +732,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
var lp = MWF.xApplication.process.Xform.LP;
var css = this.module.form.css;
var node = new Element("div", { "styles": css.attachmentPermissionNode }).inject(this.node);
var node = new Element("div", { "styles": (layout.mobile ? css.attachmentPermissionNode_mobile : css.attachmentPermissionNode) }).inject(this.node);
var attNames = new Element("div", { "styles": css.attachmentPermissionNamesNode }).inject(node);
var attNamesTitle = new Element("div", { "styles": css.attachmentPermissionNamesTitleNode, "text": lp.attachmentPermissionInfo }).inject(attNames);
var attNamesArea = new Element("div", { "styles": css.attachmentPermissionNamesAreaNode }).inject(attNames);
......@@ -753,7 +753,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
title = new Element("div", { "styles": css.attachmentPermissionTitleNode, "text": lp.attachmentController }).inject(editArea);
var controllerInput = new Element("div", { "styles": css.attachmentPermissionInputNode }).inject(editArea);
var dlg = o2.DL.open(Object.merge({
var options = Object.merge({
"title": lp.attachmentPermission,
"style": this.module.form.json.dialogStyle || "user",
"isResize": false,
......@@ -773,7 +773,15 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
"action": function () { dlg.close(); }
}
]
}, (this.module.form.json.dialogOptions||{})));
}, (this.module.form.json.dialogOptions||{}));
if( layout.mobile ){
var size = $(document.body).getSize();
options.width = size.x;
options.height = size.y;
}
var dlg = o2.DL.open( options );
if (this.selectedAttachments.length === 1) {
var data = this.selectedAttachments[0].data;
......@@ -974,9 +982,9 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
var lp = MWF.xApplication.process.Xform.LP;
var css = this.module.form.css;
var node = new Element("div", { "styles": css.attachmentOrderNode });
var node = new Element("div", { "styles": (layout.mobile ? css.attachmentOrderNode_mobile : css.attachmentOrderNode) });
var infoNode = new Element("div", { "styles": css.attachmentOrderInforNode, "text": lp.attachmentOrderInfo }).inject(node);
var attrchmentsNode = new Element("div", { "styles": css.attachmentOrderAreaNode }).inject(node);
var attrchmentsNode = new Element("div", { "styles": (layout.mobile ? css.attachmentOrderAreaNode_mobile : css.attachmentOrderAreaNode) }).inject(node);
var iconUrl = "../x_component_File/$Main/icon.json";
var icons = null;
......@@ -993,8 +1001,8 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
var icon = new Element("div", { "styles": css.attachmentOrderItemIconNode }).inject(itemNode);
icon.setStyle("background-image", "url('" + iconFolderUrl + "')");
var actionArea = new Element("div", { "styles": css.attachmentOrderItemActionNode }).inject(itemNode);
var text = new Element("div", { "styles": css.attachmentOrderItemTextNode, "text": att.data.name }).inject(itemNode);
var actionArea = new Element("div", { "styles": (layout.mobile ? css.attachmentOrderItemActionNode_mobile : css.attachmentOrderItemActionNode) }).inject(itemNode);
var text = new Element("div", { "styles": (layout.mobile ? css.attachmentOrderItemTextNode_mobile : css.attachmentOrderItemTextNode), "text": att.data.name }).inject(itemNode);
var actionUp = new Element("div", { "styles": css.attachmentOrderItemActionUpNode, "text": lp.attachmentOrderUp }).inject(actionArea);
var actionDown = new Element("div", { "styles": css.attachmentOrderItemActionDownNode, "text": lp.attachmentOrderDown }).inject(actionArea);
......@@ -1086,7 +1094,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
}.bind(this));
var dlg = o2.DL.open(Object.merge({
var options = Object.merge({
"title": lp.attachmentOrderTitle,
"style": this.module.form.json.dialogStyle || "user",
"isResize": false,
......@@ -1130,7 +1138,15 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
});
dlg.setContentSize();
}
}, (this.module.form.json.dialogOptions||{})));
}, (this.module.form.json.dialogOptions||{}));
if( layout.mobile ){
var size = $(document.body).getSize();
options.width = size.x;
options.height = size.y;
}
var dlg = o2.DL.open( options );
}
},
sortAttachment: function (node) {
......@@ -2215,11 +2231,20 @@ MWF.xApplication.process.Xform.AttachmenPreview = new Class({
var zipViewNode = new Element("div",{"text":"loadding..."});
o2.load(["../o2_lib/jszip/jszip.min.js", "../o2_lib/jszip/jszip-utils.min.js"], function () {
this.app.getAttachmentUrl(this.att, function (url) {
var width, height;
if( layout.mobile ){
var size = $(document.body).getSize();
width = size.x+"px";
height = size.y+"px";
}else{
width = "660px";
height = "510px";
}
o2.require("MWF.widget.Tree", function(){
var dlg = o2.DL.open({
"title": _self.att.data.name,
"width": "660px",
"height": "510px",
"width": width,
"height": height,
"mask": true,
"content": zipViewNode,
"container": null,
......@@ -2404,10 +2429,19 @@ MWF.xApplication.process.Xform.AttachmenPreview = new Class({
}.bind(this));
}.bind(this));
var width, height;
if( layout.mobile ){
var size = $(document.body).getSize();
width = size.x+"px";
height = size.y+"px";
}else{
width = "960px";
height = "610px";
}
var dlg = o2.DL.open({
"title": this.att.data.name,
"width": "960px",
"height": "610px",
"width": width,
"height": height,
"mask": true,
"content": editorNode,
"container": null,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册