From a8a2ae7bf19db832543f61d56d26ecd3b30003e1 Mon Sep 17 00:00:00 2001 From: huqi Date: Mon, 1 Nov 2021 14:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=A8=E6=88=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=AE=BE=E8=AE=A1dom=E5=88=97=E8=A1=A8=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=BB=9A=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../x_component_portal_PageDesigner/Main.js | 11 ++- .../Documenteditor.js | 88 ++++++++++++------- 2 files changed, 63 insertions(+), 36 deletions(-) diff --git a/o2web/source/x_component_portal_PageDesigner/Main.js b/o2web/source/x_component_portal_PageDesigner/Main.js index 33f3676325..eff98564ec 100644 --- a/o2web/source/x_component_portal_PageDesigner/Main.js +++ b/o2web/source/x_component_portal_PageDesigner/Main.js @@ -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; diff --git a/o2web/source/x_component_process_Xform/Documenteditor.js b/o2web/source/x_component_process_Xform/Documenteditor.js index d5d3b7e318..4fed11f155 100644 --- a/o2web/source/x_component_process_Xform/Documenteditor.js +++ b/o2web/source/x_component_process_Xform/Documenteditor.js @@ -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(){ -- GitLab