Forráskód Böngészése

Merge branch 'fix/script_decomenteditor' into 'develop'

Merge of fix/script_decomenteditor to develop 脚本编辑器和版式文件bug修改

See merge request o2oa/o2oa!694
胡起 5 éve
szülő
commit
05806e03ec

+ 1 - 1
o2web/source/x_component_portal_PageDesigner/Script.js

@@ -857,7 +857,7 @@ MWF.xApplication.portal.PageDesigner.Script.Item = new Class({
                     this.change();
                 }.bind(this));
                 this.jsEditor.addEditorEvent("blur", function() {
-                    this.fireEvent("blur");
+                    this.change();
                 }.bind(this));
 
                 // this.editor.on("change", function() {

+ 1 - 1
o2web/source/x_component_process_Xform/Documenteditor.js

@@ -747,7 +747,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
                 this.toolbarNode.setStyles({
                     "position": "absolute",
                     "width": ""+x+"px",
-                    "z-index": 20000,
+                    "z-index": 200,
                     "top": paddingTop+"px",
                     "left": ""+p.x+"px"
                 });