Skip to content

o2oa
o2oa

fuyue82 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 a8a2ae7b 编写于 作者: NoSubject's avatar NoSubject
浏览文件
操作

修复门户页面设计dom列表无法滚动的问题

上级 1955c29e
隐藏空白更改
内联 并排
Showing with 63 addition and 36 deletion
o2web/source/x_component_portal_PageDesigner/Main.js
浏览文件 @ a8a2ae7b
......@@ -23,7 +23,6 @@ MWF.xApplication.portal.PageDesigner.Main = new Class({
"processData": null
},
onQueryLoad: function(){
debugger;
this.shortcut = true;
if (this.status){
this.options.id = this.status.id;
......@@ -217,12 +216,12 @@ MWF.xApplication.portal.PageDesigner.Main = new Class({
"V": {"x": 0, "y": 0},
"H": {"x": 0, "y": 0}
});
MWF.require("MWF.widget.ScrollBar", function(){
new MWF.widget.ScrollBar(this.propertyDomScrollArea, {
"style":"default", "where": "before", "distance": 30, "friction": 4, "indent": false, "axis": {"x": false, "y": true}
});
}.bind(this));
}
MWF.require("MWF.widget.ScrollBar", function(){
new MWF.widget.ScrollBar(this.propertyDomScrollArea, {
"style":"default", "where": "before", "distance": 30, "friction": 4, "indent": false, "axis": {"x": false, "y": true}
});
}.bind(this));
},
initOptions: function(){
this.toolsData = null;
......
o2web/source/x_component_process_Xform/Documenteditor.js
浏览文件 @ a8a2ae7b
......@@ -1562,42 +1562,70 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
_switchReadOrEditInline: function(){
if (this.editMode){
this._readFiletext();
if (this.allowEdit){
if (!layout.mobile) {
var button = this.sideToolbar.childrenButton[0];
button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdoc_mobile : MWF.xApplication.process.Xform.LP.editdoc);
button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc.png");
//this.getFullWidthFlagNode().dispose();
}
button = this.toolbar.childrenButton[0];
button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdoc_mobile : MWF.xApplication.process.Xform.LP.editdoc);
button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc.png");
//this.getFullWidthFlagNode().dispose();
// if (!layout.mobile)this.sideToolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdoc);
// this.toolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdoc);
}
// if (this.allowEdit){
// if (!layout.mobile) {
// var button = this.sideToolbar.childrenButton[0];
// button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdoc_mobile : MWF.xApplication.process.Xform.LP.editdoc);
// button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc.png");
// //this.getFullWidthFlagNode().dispose();
// }
// button = this.toolbar.childrenButton[0];
// button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdoc_mobile : MWF.xApplication.process.Xform.LP.editdoc);
// button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc.png");
// //this.getFullWidthFlagNode().dispose();
//
//
// // if (!layout.mobile)this.sideToolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdoc);
// // this.toolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdoc);
// }
this.editMode = false;
//this.form.saveFormData();
}else{
this._editFiletext("inline");
if (this.loadFileTextEditFun) this.layout_filetext.removeEvent("click", this.loadFileTextEditFun);
if (this.allowEdit){
if (!layout.mobile) {
var button = this.sideToolbar.childrenButton[0];
button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdocCompleted_mobile : MWF.xApplication.process.Xform.LP.editdocCompleted);
button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc_completed.png");
//this.toolbar.node.inject(this.getFullWidthFlagNode());
}
button = this.toolbar.childrenButton[0];
button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdocCompleted_mobile : MWF.xApplication.process.Xform.LP.editdocCompleted);
button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc_completed.png");
//this.toolbar.node.inject(this.getFullWidthFlagNode());
// if (!layout.mobile) this.sideToolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdocCompleted);
// this.toolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdocCompleted);
}
// if (this.allowEdit){
// if (!layout.mobile) {
// var button = this.sideToolbar.childrenButton[0];
// button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdocCompleted_mobile : MWF.xApplication.process.Xform.LP.editdocCompleted);
// button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc_completed.png");
// //this.toolbar.node.inject(this.getFullWidthFlagNode());
// }
// button = this.toolbar.childrenButton[0];
// button.setText((layout.mobile) ? MWF.xApplication.process.Xform.LP.editdocCompleted_mobile : MWF.xApplication.process.Xform.LP.editdocCompleted);
// button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/editdoc_completed.png");
// //this.toolbar.node.inject(this.getFullWidthFlagNode());
// // if (!layout.mobile) this.sideToolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdocCompleted);
// // this.toolbar.childrenButton[0].setText(MWF.xApplication.process.Xform.LP.editdocCompleted);
// }
this.editMode = true;
}
this._switchButtonText();
},
_switchButtonText: function(){
var text = (layout.mobile) ? MWF.xApplication.process.Xform.LP.editdoc_mobile : MWF.xApplication.process.Xform.LP.editdoc;
var img = "editdoc.png";
if (this.editMode){
text = (layout.mobile) ? MWF.xApplication.process.Xform.LP.editdocCompleted_mobile : MWF.xApplication.process.Xform.LP.editdocCompleted;
img = "editdoc_completed.png";
}
if (!layout.mobile && this.sideToolbar && this.sideToolbar.childrenButton[0]) {
var button = this.sideToolbar.childrenButton[0];
button.setText(text);
button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/"+img);
}
if (this.toolbar && this.toolbar.childrenButton[0]){
button = this.toolbar.childrenButton[0];
button.setText(text);
button.picNode.getElement("img").set("src", "../x_component_process_Xform/$Form/default/icon/"+img);
}
},
editFiletext: function(){
if (!this.editMode && this.allowEdit){
this._editFiletext("inline");
if (this.loadFileTextEditFun) this.layout_filetext.removeEvent("click", this.loadFileTextEditFun);
this.editMode = true;
//this._switchButtonText();
}
},
// getFullWidthFlagNode: function(){
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或