Merge branch 'cherry-pick-b5857f61' into 'develop_java8'

版式文件编辑器全屏操作条位置调整

See merge request o2oa/o2oa!3293

o2web/source/x_component_process_Xform/$Form/default/doc.wcss

@@ -235,14 +235,9 @@
         "border": "1px solid #ffffff",
     },
     "fullScreen": {
-        "top": "0px",
-        "left": "0px",
-        "width": "100%",
-        "min-height": "100%",
-        "z-index": "20000"
+        "min-height": "100%"
     },
     "returnScreen": {
-        "position": "static",
         "top": "",
         "left": "",
         "width": "",

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -1110,7 +1110,7 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
                 this.toolbarNode.setStyles({
                     "position": "absolute",
                     "width": ""+x+"px",
-                    "z-index": 50000,
+                    "z-index": 200,
                     "top": paddingTop+"px",
                     "left": ""+p.x+"px"
                 });
@@ -1762,7 +1762,8 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
             //     "position": styles.position,
             //     "overflow": styles.overflow
             // });
-            // this.node.setStyles(this.css.returnScreen);
+            //this.node.setStyles(this.css.returnScreen);
+            this.node.setStyle("min-height", "");
             this.fireEvent("returnScreen");
             bt.setText(MWF.xApplication.process.Xform.LP.fullScreen);
 
@@ -1790,7 +1791,8 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
             //     "position": "relative",
             //     "overflow": "auto"
             // });
-            this.node.setStyles(this.css.fullScreen);
+            //this.node.setStyles(this.css.fullScreen);
+            this.node.setStyle("min-height", "100%");
             this.fireEvent("fullScreen");
 
             // this.fullScreenScrollNode = this.node.getOffsetParent().getFirst().getParentSrcollNode();