Просмотр исходного кода

Merge branch 'fix/Process.mobile_selector_height_execption' into 'develop'

Merge of fix/[流程管理]修复移动端提交界面选人框高度有时候不正确的问题 to develop

See merge request o2oa/o2oa!456
蔡祥熠 5 лет назад
Родитель
Сommit
03a83da197

+ 3 - 3
o2web/source/x_component_Selector/MultipleSelector.js

@@ -223,7 +223,7 @@ MWF.xApplication.Selector.MultipleSelector = new Class({
         });
         this.node = new Element("div", {"styles": this.css.containerNodeMobile});
         this.node.setStyle("z-index", this.options.zIndex.toInt()+1);
-        this.node.setStyle("height", ( document.body.getSize().y ) + "px");
+        this.node.setStyle("height", ( $(document.body).getSize().y ) + "px");
         this.titleNode = new Element("div", {
             "styles": this.css.titleNodeMobile
         }).inject(this.node);
@@ -255,7 +255,7 @@ MWF.xApplication.Selector.MultipleSelector = new Class({
             "styles": this.css.contentNode
         }).inject(this.node);
 
-        var size = document.body.getSize();
+        var size = $(document.body).getSize();
         //var height = size.y-40;
         var height = size.y;
         this.contentNode.setStyle("height", ""+height+"px");
@@ -263,7 +263,7 @@ MWF.xApplication.Selector.MultipleSelector = new Class({
 
         this.loadContent();
 
-        this.node.inject(document.body);
+        this.node.inject($(document.body));
         this.node.setStyles({
             "top": "0px",
             "left": "0px"

+ 3 - 3
o2web/source/x_component_Selector/Person.js

@@ -85,7 +85,7 @@ MWF.xApplication.Selector.Person = new Class({
 
         this.node = new Element("div", {"styles": this.css.containerNodeMobile});
         this.node.setStyle("z-index", this.options.zIndex.toInt()+1);
-        this.node.setStyle("height", ( document.body.getSize().y ) + "px");
+        this.node.setStyle("height", ( $(document.body).getSize().y ) + "px");
         this.titleNode = new Element("div", {
             "styles": this.css.titleNodeMobile
         }).inject(this.node);
@@ -108,7 +108,7 @@ MWF.xApplication.Selector.Person = new Class({
             "styles": this.css.contentNode
         }).inject(this.node);
 
-        var size = document.body.getSize();
+        var size = $(document.body).getSize();
         var height = size.y-40;
         //var height = size.y;
         this.contentNode.setStyle("height", ""+height+"px");
@@ -116,7 +116,7 @@ MWF.xApplication.Selector.Person = new Class({
 
         this.loadContent();
 
-        this.node.inject(document.body);
+        this.node.inject($(document.body));
         this.node.setStyles({
             "top": "0px",
             "left": "0px"

+ 2 - 1
o2web/source/x_component_process_Work/Processor.js

@@ -1586,7 +1586,8 @@ if( MWF.xApplication.process.Xform && MWF.xApplication.process.Xform.Form ){
                 setTimeout( function(){ //如果有输入法界面,这个时候页面的计算不对,所以等100毫秒
                     var options = this.getOptions();
                     if(options){
-                        this.selector = new MWF.O2Selector(this.container, options);
+                        //this.selector = new MWF.O2Selector(this.container, options);
+                        this.selector = new MWF.O2Selector($(document.body), options);
                     }
                 }.bind(this), 100 )
             }else{