Pull request #2517: 无JIRA任务 chore： 去掉minHeight=50的限制

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

* commit '4447ed5a2551a1fc301e897122e81f6c028f9f79':
  chore： 去掉minHeight=50的限制

src/case/combo/bubblecombo/popup.bubble.js

@@ -11,7 +11,7 @@ BI.BubblePopupView = BI.inherit(BI.PopupView, {
             baseCls: config.baseCls + " bi-bubble-popup-view",
             minWidth: 70,
             maxWidth: 300,
-            minHeight: 50,
+            // minHeight: 50,
             showArrow: true,
         });
     }

src/core/3.ob.js

@@ -51,7 +51,9 @@
             if (BI.isFunction(this.props)) {
                 props = this.props(config);
             }
-            this.options = extend(this._defaultConfig(config), props, config);
+            var defaultProps = this._defaultConfig(config);
+            var modifiedDefaultProps = (config && config.type && BI.OB.configFunctions[config.type + ".props"]) ? BI.OB.configFunctions[config.type + ".props"](config, defaultProps) : null;
+            this.options = extend(defaultProps, props, modifiedDefaultProps, config);
         },
 
         _init: function () {

src/core/5.inject.js

@@ -91,7 +91,7 @@
         };
     };
 
-    var configFunctions = {};
+    var configFunctions = BI.OB.configFunctions = {};
     var runConfigFunction = function (type) {
         if (!type || !configFunctions[type]) {
             return false;

src/core/logic/logic.js

@@ -43,7 +43,6 @@ BI.LogicFactory = {
             case BI.Direction.Bottom:
             case BI.Direction.Custom:
                 return BI.LogicFactory.Type.Vertical;
-                break;
             case BI.Direction.Left:
             case BI.Direction.Right:
                 return BI.LogicFactory.Type.Horizontal;
@@ -53,6 +52,7 @@ BI.LogicFactory = {
     createLogicItemsByDirection: function (direction) {
         var layout;
         var items = Array.prototype.slice.call(arguments, 1);
+        items = BI.compact(items);
         items = BI.map(items, function (i, item) {
             if (BI.isWidget(item)) {
                 return {
@@ -78,4 +78,4 @@ BI.LogicFactory = {
         }
         return items;
     }
-};
+};

src/core/logic/logic.layout.js

@@ -19,7 +19,9 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, {
             lgap: 0,
             rgap: 0,
             tgap: 0,
-            bgap: 0
+            bgap: 0,
+            innerVgap: 0,
+            innerHgap: 0
         };
     },
 
@@ -41,6 +43,8 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, {
             rgap: o.rgap,
             tgap: o.tgap,
             bgap: o.bgap,
+            innerHgap: o.innerHgap,
+            innerVgap: o.innerVgap,
             items: o.items
         };
     }
@@ -68,7 +72,9 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
             lgap: 0,
             rgap: 0,
             tgap: 0,
-            bgap: 0
+            bgap: 0,
+            innerVgap: 0,
+            innerHgap: 0
         };
     },
 
@@ -90,6 +96,8 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
             rgap: o.rgap,
             tgap: o.tgap,
             bgap: o.bgap,
+            innerHgap: o.innerHgap,
+            innerVgap: o.innerVgap,
             items: o.items
         };
     }
@@ -163,7 +171,9 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
             lgap: 0,
             rgap: 0,
             tgap: 0,
-            bgap: 0
+            bgap: 0,
+            innerVgap: 0,
+            innerHgap: 0
         };
     },
 
@@ -190,6 +200,8 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
             rgap: o.rgap,
             tgap: o.tgap,
             bgap: o.bgap,
+            innerHgap: o.innerHgap,
+            innerVgap: o.innerVgap,
             items: o.items
         };
     }