Pull request #2048: 无JIRA任务 bugfix

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '746adb533d06e309c135e2ae69231d3d214688e5':
  bugfix
  bugfix

src/core/wrapper/layout/float/float.absolute.horizontal.js

@@ -39,12 +39,15 @@ BI.FloatAbsoluteHorizontalLayout = BI.inherit(BI.Layout, {
     },
 
     _formatItems: function (items) {
+        if (this.options.horizontalAlign !== BI.HorizontalAlign.Center) {
+            return items;
+        }
         return BI.map(items, function (i, item) {
-            if(!item || BI.isEmptyObject(item)){
+            if (!item || BI.isEmptyObject(item)) {
                 return item;
             }
             var el = BI.stripEL(item);
-            if(BI.isWidget(el)){
+            if (BI.isWidget(el)) {
                 el.element.addClass("bi-abs-c-x-item");
             } else {
                 el.cls = (el.cls || "") + "bi-abs-c-x-item";

src/core/wrapper/layout/float/float.absolute.leftrightvertical.js

@@ -41,10 +41,12 @@ BI.FloatAbsoluteLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
         var rightItems = o.items.right || [];
         leftItems = BI.map(leftItems, function (i, item) {
             var el = BI.stripEL(item);
-            if(BI.isWidget(el)){
-                el.element.addClass("bi-abs-c-y-item");
-            } else {
-                el.cls = (el.cls || "") + "bi-abs-c-y-item";
+            if (o.verticalAlign === BI.VerticalAlign.Middle) {
+                if (BI.isWidget(el)) {
+                    el.element.addClass("bi-abs-c-y-item");
+                } else {
+                    el.cls = (el.cls || "") + "bi-abs-c-y-item";
+                }
             }
             var json = {
                 el: el,
@@ -66,10 +68,12 @@ BI.FloatAbsoluteLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
         });
         rightItems = BI.map(rightItems, function (i, item) {
             var el = BI.stripEL(item);
-            if(BI.isWidget(el)){
-                el.element.addClass("bi-abs-c-y-item");
-            } else {
-                el.cls = (el.cls || "") + "bi-abs-c-y-item";
+            if (o.verticalAlign === BI.VerticalAlign.Middle) {
+                if (BI.isWidget(el)) {
+                    el.element.addClass("bi-abs-c-y-item");
+                } else {
+                    el.cls = (el.cls || "") + "bi-abs-c-y-item";
+                }
             }
             var json = {
                 el: el,
@@ -116,7 +120,7 @@ BI.FloatAbsoluteRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
             items: [],
             lgap: 0,
             rgap: 0,
-            hgap: 0,
+            hgap: 0
         });
     },
     render: function () {
@@ -140,12 +144,15 @@ BI.FloatAbsoluteRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
     },
 
     _formatItems: function (items) {
+        if (this.options.verticalAlign !== BI.VerticalAlign.Middle) {
+            return items;
+        }
         return BI.map(items, function (i, item) {
-            if(!item || BI.isEmptyObject(item)){
+            if (!item || BI.isEmptyObject(item)) {
                 return item;
             }
             var el = BI.stripEL(item);
-            if(BI.isWidget(el)){
+            if (BI.isWidget(el)) {
                 el.element.addClass("bi-abs-c-y-item");
             } else {
                 el.cls = (el.cls || "") + "bi-abs-c-y-item";

src/core/wrapper/layout/float/float.absolute.vertical.js

@@ -39,12 +39,15 @@ BI.FloatAbsoluteVerticalLayout = BI.inherit(BI.Layout, {
     },
 
     _formatItems: function (items) {
+        if (this.options.verticalAlign !== BI.VerticalAlign.Middle) {
+            return items;
+        }
         return BI.map(items, function (i, item) {
-            if(!item || BI.isEmptyObject(item)){
+            if (!item || BI.isEmptyObject(item)) {
                 return item;
             }
             var el = BI.stripEL(item);
-            if(BI.isWidget(el)){
+            if (BI.isWidget(el)) {
                 el.element.addClass("bi-abs-c-y-item");
             } else {
                 el.cls = (el.cls || "") + "bi-abs-c-y-item";