Merge pull request #138 in FUI/fineui from ~GUY/fineui:master to master

* commit 'e4a02f42f86c345254e13294cad3fbc8ffa17538':
  update
  tooltip是一行

bi/core.js

@@ -17386,7 +17386,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
     createLogic: function () {
         var layout, o = this.options;
         if (o.dynamic) {
-            layout = "bi.horizontal";
+            layout = "bi.vertical_adapt";
         } else {
             layout = "bi.htape";
         }
@@ -17612,13 +17612,13 @@ $(function () {
     BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
         if (isSupportFlex) {
             //有滚动条的情况下需要用到flex_wrapper_center布局
-            // if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
-            //     //不是IE用flex_wrapper_center布局
+                //不是IE用flex_wrapper_center布局
-            //     if (!BI.isIE()) {
+                if (!BI.isIE()) {
-            //         return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
-            //     }
+                }
-            //     return ob;
+                return ob;
-            // }
+            }
             return BI.extend(ob, {type: "bi.flex_vertical_center"});
         } else {
             return ob;

dist/bundle.js

@@ -23363,7 +23363,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
     createLogic: function () {
         var layout, o = this.options;
         if (o.dynamic) {
-            layout = "bi.horizontal";
+            layout = "bi.vertical_adapt";
         } else {
             layout = "bi.htape";
         }
@@ -28805,13 +28805,13 @@ $(function () {
     BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
         if (isSupportFlex) {
             //有滚动条的情况下需要用到flex_wrapper_center布局
-            // if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
-            //     //不是IE用flex_wrapper_center布局
+                //不是IE用flex_wrapper_center布局
-            //     if (!BI.isIE()) {
+                if (!BI.isIE()) {
-            //         return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
-            //     }
+                }
-            //     return ob;
+                return ob;
-            // }
+            }
             return BI.extend(ob, {type: "bi.flex_vertical_center"});
         } else {
             return ob;

dist/core.js

@@ -23312,7 +23312,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
     createLogic: function () {
         var layout, o = this.options;
         if (o.dynamic) {
-            layout = "bi.horizontal";
+            layout = "bi.vertical_adapt";
         } else {
             layout = "bi.htape";
         }
@@ -28754,13 +28754,13 @@ $(function () {
     BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
         if (isSupportFlex) {
             //有滚动条的情况下需要用到flex_wrapper_center布局
-            // if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
-            //     //不是IE用flex_wrapper_center布局
+                //不是IE用flex_wrapper_center布局
-            //     if (!BI.isIE()) {
+                if (!BI.isIE()) {
-            //         return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
-            //     }
+                }
-            //     return ob;
+                return ob;
-            // }
+            }
             return BI.extend(ob, {type: "bi.flex_vertical_center"});
         } else {
             return ob;

src/config.js

@@ -27,13 +27,13 @@ $(function () {
     BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
         if (isSupportFlex) {
             //有滚动条的情况下需要用到flex_wrapper_center布局
-            // if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
+            if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
-            //     //不是IE用flex_wrapper_center布局
+                //不是IE用flex_wrapper_center布局
-            //     if (!BI.isIE()) {
+                if (!BI.isIE()) {
-            //         return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
+                    return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
-            //     }
+                }
-            //     return ob;
+                return ob;
-            // }
+            }
             return BI.extend(ob, {type: "bi.flex_vertical_center"});
         } else {
             return ob;

src/core/logic/logic.layout.js

@@ -79,7 +79,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
     createLogic: function () {
         var layout, o = this.options;
         if (o.dynamic) {
-            layout = "bi.horizontal";
+            layout = "bi.vertical_adapt";
         } else {
             layout = "bi.htape";
         }