Merge branch 'hotfix/preIcon_height' into 'master'

Merge of hotfix/preIcon_height 修复表单label组件隐藏后再显示前缀和后缀不可见的问题 to master

See merge request o2oa/o2oa!1205

(cherry picked from commit 93d5457a)

7a4db103 修复表单label组件隐藏后再显示前缀和后缀不可见的问题

o2web/source/x_component_process_Xform/Label.js

@@ -40,11 +40,12 @@ MWF.xApplication.process.Xform.Label = MWF.APPLabel =  new Class(
                 "height": "100%"
 			}, "text": text}).inject(this.node);
 
+            var height = (this.node.offsetParent === null) ? "20" : this.node.getSize().y;
             if (this.json.prefixIcon){
                 var node = new Element("div", {"styles": {
                     "float": "left",
                     "width": "20px",
-                    "height": ""+this.node.getSize().y+"px",
+                    "height": ""+height+"px",
                     "background": "url("+this.json.prefixIcon+") center center no-repeat"
                 }}).inject(tNode, "before");
             }
@@ -52,7 +53,7 @@ MWF.xApplication.process.Xform.Label = MWF.APPLabel =  new Class(
                 var node = new Element("div", {"styles": {
                     "float": "right",
                     "width": "20px",
-                    "height": ""+this.node.getSize().y+"px",
+                    "height": ""+height+"px",
                     "background": "url("+this.json.suffixIcon+") center center no-repeat"
                 }}).inject(tNode, "before");
             }