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

Merge branch 'fix/Selector.selector_height' into 'wrdp'

Merge of fix/Selector.selector_height 修复提交选人框可能看不到底框的问题 to wrdp

See merge request o2oa/o2oa!1853
蔡祥熠 5 лет назад
Родитель
Сommit
631e685f15

+ 1 - 1
o2web/source/x_component_Selector/$Selector/blue_flat/css.wcss

@@ -120,7 +120,7 @@
 	},
   "contentNode_embedded": {
 	"overflow": "hidden",
-	"padding" : "5px 0px 0px 0px"
+	"padding" : "4px 0px 0px 0px"
   },
 	"selectNode": {
 		//"width": "200px",

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

@@ -1516,6 +1516,8 @@ MWF.xApplication.Selector.Person = new Class({
     },
     setSize : function(){
 
+        debugger;
+
         if( !this.options.width && !this.options.height )return;
 
         var getOffsetX = function(node){
@@ -1611,7 +1613,7 @@ MWF.xApplication.Selector.Person = new Class({
                 nodeHeight = this.options.height.toInt();
             }
 
-            nodeHeight = nodeHeight - getOffsetY( this.contentNode );
+            nodeHeight = nodeHeight - getOffsetY( this.contentNode ) - 1;
             if( this.titleNode ){
                 nodeHeight = nodeHeight - getOffsetY( this.titleNode ) - this.titleNode.getStyle("height").toInt();
             }