Pull request #1982: 无JIRA任务 bugfix

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

* commit '2e1ef22a84be85dd44f3490bbd30f8b4221a0eca':
  add

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

@@ -7,6 +7,8 @@ BI.AbsoluteHorizontalLayout = BI.inherit(BI.Layout, {
     props: function () {
         return BI.extend(BI.AbsoluteHorizontalLayout.superclass.props.apply(this, arguments), {
             baseCls: "bi-abs-h-a",
+            horizontalAlign: BI.HorizontalAlign.Center,
+            rowSize: [],
             hgap: 0,
             lgap: 0,
             rgap: 0,
@@ -17,26 +19,26 @@ BI.AbsoluteHorizontalLayout = BI.inherit(BI.Layout, {
     },
 
     render: function () {
+        var self = this, o = this.options;
         BI.AbsoluteHorizontalLayout.superclass.render.apply(this, arguments);
-        this.populate(this.options.items);
+        return {
+            type: "bi.vtape",
+            horizontalAlign: o.horizontalAlign,
+            rowSize: o.rowSize,
+            items: o.items,
+            scrollx: o.scrollx,
+            scrolly: o.scrolly,
+            scrollable: o.scrollable,
+            ref: function (_ref) {
+                self.layout = _ref;
             },
-
+            hgap: o.hgap,
-    _addElement: function (i, item) {
+            vgap: o.vgap,
-        var o = this.options;
+            lgap: o.lgap,
-        var w = BI.AbsoluteHorizontalLayout.superclass._addElement.apply(this, arguments);
+            rgap: o.rgap,
-        w.element.css({
+            tgap: o.tgap,
-            position: "absolute",
+            bgap: o.bgap
-            left: (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit,
+        };
-            right: (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit,
-            margin: "auto"
-        });
-        if (o.vgap + o.tgap + (item.vgap || 0) + (item.tgap || 0) !== 0) {
-            w.element.css("top", (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit);
-        }
-        if (o.vgap + o.bgap + (item.vgap || 0) + (item.bgap || 0) !== 0) {
-            w.element.css("bottom", (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit);
-        }
-        return w;
     },
 
     resize: function () {
@@ -44,8 +46,7 @@ BI.AbsoluteHorizontalLayout = BI.inherit(BI.Layout, {
     },
 
     populate: function (items) {
-        BI.AbsoluteHorizontalLayout.superclass.populate.apply(this, arguments);
+        this.layout.populate.apply(this, arguments);
-        this._mount();
     }
 });
 BI.shortcut("bi.absolute_horizontal_adapt", BI.AbsoluteHorizontalLayout);

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

@@ -7,6 +7,8 @@ BI.AbsoluteVerticalLayout = BI.inherit(BI.Layout, {
     props: function () {
         return BI.extend(BI.AbsoluteVerticalLayout.superclass.props.apply(this, arguments), {
             baseCls: "bi-abs-v-a",
+            verticalAlign: BI.VerticalAlign.Middle,
+            columnSize: [],
             hgap: 0,
             lgap: 0,
             rgap: 0,
@@ -17,28 +19,26 @@ BI.AbsoluteVerticalLayout = BI.inherit(BI.Layout, {
     },
 
     render: function () {
+        var self = this, o = this.options;
         BI.AbsoluteVerticalLayout.superclass.render.apply(this, arguments);
-        this.populate(this.options.items);
+        return {
+            type: "bi.htape",
+            verticalAlign: o.verticalAlign,
+            columnSize: o.columnSize,
+            items: o.items,
+            scrollx: o.scrollx,
+            scrolly: o.scrolly,
+            scrollable: o.scrollable,
+            ref: function (_ref) {
+                self.layout = _ref;
             },
-
+            hgap: o.hgap,
-    _addElement: function (i, item) {
+            vgap: o.vgap,
-        var o = this.options;
+            lgap: o.lgap,
-        var w = BI.AbsoluteVerticalLayout.superclass._addElement.apply(this, arguments);
+            rgap: o.rgap,
-        w.element.css({
+            tgap: o.tgap,
-            position: "absolute",
+            bgap: o.bgap
-            left: item.lgap / BI.pixRatio + BI.pixUnit,
+        };
-            right: item.rgap / BI.pixRatio + BI.pixUnit,
-            top: (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit,
-            bottom: (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit,
-            margin: "auto"
-        });
-        if (o.hgap + o.lgap + (item.hgap || 0) + (item.lgap || 0) !== 0) {
-            w.element.css("left", (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit);
-        }
-        if (o.hgap + o.rgap + (item.hgap || 0) + (item.rgap || 0) !== 0) {
-            w.element.css("right", (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit);
-        }
-        return w;
     },
 
     resize: function () {
@@ -46,8 +46,7 @@ BI.AbsoluteVerticalLayout = BI.inherit(BI.Layout, {
     },
 
     populate: function (items) {
-        BI.AbsoluteVerticalLayout.superclass.populate.apply(this, arguments);
+        this.layout.populate.apply(this, arguments);
-        this._mount();
     }
 });
 BI.shortcut("bi.absolute_vertical_adapt", BI.AbsoluteVerticalLayout);