Pull request #2070: 无JIRA任务 bugfix

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

* commit 'b9af9d388375a2432db00df5b92a76113fc4fac6':
  update
  update
  add

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

@@ -40,7 +40,17 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
                 ((columnSize * 100).toFixed(1) + "%")
                 : (columnSize + (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap);
         }
-        if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
+        function 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/layout.td.js

@@ -122,7 +122,17 @@ BI.TdLayout = BI.inherit(BI.Layout, {
                     ((columnSize * 100).toFixed(1) + "%")
                     : (columnSize + (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap);
             }
-            if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
+            function hasFill() {
+                if (o.columnSize.length > 0) {
+                    return o.columnSize.indexOf("fill") >= 0;
+                }
+                return BI.some(arr, function (i, item) {
+                    if (item.width === "fill") {
+                        return true;
+                    }
+                });
+            }
+            if ((BI.isNull(columnSize) || columnSize === "") && hasFill()) {
                 width = 2;
             }
             var td = BI._lazyCreateWidget({