Pull request #2100: 无JIRA任务 inline布局可以用在virtualgroup中

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

* commit '3038599fb8ff154de7d81f0f8660cb1ad3071f97':
  整理代码
  整理代码
  整理代码
  inline布局可以用在virtualgroup中

src/core/wrapper/layout/adapt/adapt.leftrightvertical.js

@@ -80,16 +80,6 @@ BI.LeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
         this.right.stroke(this.options.items.right);
     },
 
-    update: function (opt) {
-        this.left.update({
-            items: opt.items.left
-        });
-        this.right.update({
-            items: opt.items.right
-        });
-        return true;
-    },
-
     addItem: function () {
         // do nothing
         throw new Error("不能添加子组件");
@@ -143,10 +133,6 @@ BI.LeftVerticalAdaptLayout = BI.inherit(BI.Layout, {
         this.layout.resize();
     },
 
-    update: function (opt) {
-        return this.layout.update(opt);
-    },
-
     addItem: function () {
         // do nothing
         throw new Error("不能添加子组件");

src/core/wrapper/layout/adapt/adapt.table.js

@@ -24,13 +24,25 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
         this.$table = BI.Widget._renderEngine.createElement("<div>").css({
             position: "relative",
             display: "table",
-            width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
+            width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch || this._hasFill()) ? "100%" : "auto",
             height: (o.verticalAlign !== BI.VerticalAlign.Top) ? "100%" : "auto",
             "white-space": "nowrap"
         });
         this.populate(this.options.items);
     },
 
+    _hasFill: function () {
+        var o = this.options;
+        if (o.columnSize.length > 0) {
+            return o.columnSize.indexOf("fill") >= 0;
+        }
+        return BI.some(o.items, function (i, item) {
+            if (item.width === "fill") {
+                return true;
+            }
+        });
+    },
+
     _addElement: function (i, item) {
         var o = this.options;
         var td, width = "";
@@ -40,17 +52,7 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
                 ((columnSize * 100).toFixed(1) + "%")
                 : (columnSize + (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap);
         }
-        function hasFill() {
+        if ((BI.isNull(columnSize) || columnSize === "") && this._hasFill()) {
-            if (o.columnSize.length > 0) {
-                return o.columnSize.indexOf("fill") >= 0;
-            }
-            return BI.some(o.items, function (i, item) {
-                if (item.width === "fill") {
-                    return true;
-                }
-            });
-        }
-        if ((BI.isNull(columnSize) || columnSize === "") && hasFill()) {
             width = 2;
         }
         if (!this.hasWidget(this._getChildName(i))) {

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

@@ -76,7 +76,7 @@ BI.FloatHorizontalFillLayout = BI.inherit(BI.Layout, {
             }
             var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
                 bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
-            if (BI.isNull(item.height)) {
+            if (o.verticalAlign === BI.VerticalAlign.Stretch && BI.isNull(item.height)) {
                 w.element.css({
                     height: "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")"
                 });

src/core/wrapper/layout/layout.inline.js

@@ -77,7 +77,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
             }
         }
         this._handleGap(w, item, i);
-        if (o.verticalAlign === BI.VerticalAlign.Stretch) {
+        if (o.verticalAlign === BI.VerticalAlign.Stretch && BI.isNull(item.height)) {
             var top = o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0),
                 bottom = o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0);
             w.element.css("height", "calc(100% - " + ((top + bottom) / BI.pixRatio + BI.pixUnit) + ")");