Pull request #2071: 无JIRA任务 bugfix

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

* commit '4a4f036c2544705dc422c78d52826d88f7ea38d7':
  bugfix

src/core/platform/web/config.js

@@ -29,9 +29,11 @@ BI.prepares.push(function () {
     });
     BI.Plugin.configWidget("bi.inline", function (ob) {
         // 当列宽既需要自动列宽又需要自适应列宽时，inline布局也处理不了了，降级table处理吧
-        var hasAutoAndFillColumnSize;
+        var hasAutoAndFillColumnSize = false;
+        if (ob.columnSize && ob.columnSize.length > 0) {
             if (ob.columnSize && ob.columnSize.indexOf("") >= 0 && ob.columnSize.indexOf("fill") >= 0) {
                 hasAutoAndFillColumnSize = true;
+            }
         } else {
             var hasAuto = false, hasFill = false;
             BI.each(ob.items, function (i, item) {
@@ -121,7 +123,7 @@ BI.prepares.push(function () {
             // 宽度不受限，要用table布局
             return BI.extend({
                 horizontalAlign: BI.HorizontalAlign.Stretch,
-                verticalAlign: BI.VerticalAlign.Stretch,
+                verticalAlign: BI.VerticalAlign.Stretch
             }, ob, {type: "bi.table_adapt"});
         }
         return BI.extend({}, ob, {type: "bi.horizontal_float_fill"});