Merge pull request #764 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '6f01a0fab5130ffa4144acd12a4e9494f5ec3dbb':
  update
  BI-34242 气泡弹窗默认direction为bottom,left

dist/base.css

@@ -563,7 +563,7 @@
   border-color: #3685f2;
 }
 .bi-bubble-bar-popup-view .bar-popup-container {
-  max-height: 656px;
+  max-height: 456px;
 }
 
 /*************BI.SearchEditor******************/

dist/bundle.css

@@ -2535,7 +2535,7 @@ textarea {
   border-color: #3685f2;
 }
 .bi-bubble-bar-popup-view .bar-popup-container {
-  max-height: 656px;
+  max-height: 456px;
 }
 
 /*************BI.SearchEditor******************/

dist/bundle.ie.js

@@ -52292,7 +52292,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             baseCls: "bi-bubble-combo",
             trigger: "click",
             toggle: true,
-            direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
+            direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
             isDefaultInit: false,
             destroyWhenHide: false,
             isNeedAdjustHeight: true, // 是否需要高度调整

dist/bundle.js

@@ -52696,7 +52696,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             baseCls: "bi-bubble-combo",
             trigger: "click",
             toggle: true,
-            direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
+            direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
             isDefaultInit: false,
             destroyWhenHide: false,
             isNeedAdjustHeight: true, // 是否需要高度调整

dist/case.js

@@ -3786,7 +3786,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             baseCls: "bi-bubble-combo",
             trigger: "click",
             toggle: true,
-            direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
+            direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
             isDefaultInit: false,
             destroyWhenHide: false,
             isNeedAdjustHeight: true, // 是否需要高度调整

dist/demo.js

@@ -6126,7 +6126,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
         };
     }
 });
-BI.shortcut("demo.htape", Demo.HtapeLayout);/**
+BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-absolute"
+    },
+    render: function () {
+        return {
+            type: "bi.inline_vertical_adapt",
+            items: [{
+                type: "bi.label",
+                text: "绝对布局",
+                cls: "layout-bg1",
+                width: 300,
+                height: 200
+            }, {
+                type: "bi.label",
+                text: "绝对布局",
+                cls: "layout-bg1",
+                width: 300,
+                height: 100
+            }]
+        };
+    }
+});
+BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
  * Created by User on 2017/3/22.
  */
 Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

dist/fineui.css

@@ -2535,7 +2535,7 @@ textarea {
   border-color: #3685f2;
 }
 .bi-bubble-bar-popup-view .bar-popup-container {
-  max-height: 656px;
+  max-height: 456px;
 }
 
 /*************BI.SearchEditor******************/

dist/fineui.ie.js

@@ -52534,7 +52534,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             baseCls: "bi-bubble-combo",
             trigger: "click",
             toggle: true,
-            direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
+            direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
             isDefaultInit: false,
             destroyWhenHide: false,
             isNeedAdjustHeight: true, // 是否需要高度调整

dist/fineui.js

@@ -52938,7 +52938,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             baseCls: "bi-bubble-combo",
             trigger: "click",
             toggle: true,
-            direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
+            direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
             isDefaultInit: false,
             destroyWhenHide: false,
             isNeedAdjustHeight: true, // 是否需要高度调整

dist/fineui_without_jquery_polyfill.js

@@ -35972,7 +35972,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             baseCls: "bi-bubble-combo",
             trigger: "click",
             toggle: true,
-            direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
+            direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
             isDefaultInit: false,
             destroyWhenHide: false,
             isNeedAdjustHeight: true, // 是否需要高度调整

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

@@ -13,7 +13,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             baseCls: "bi-bubble-combo",
             trigger: "click",
             toggle: true,
-            direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
+            direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
             isDefaultInit: false,
             destroyWhenHide: false,
             isNeedAdjustHeight: true, // 是否需要高度调整

src/css/base/combo/popup.css

@@ -1,4 +1,4 @@
 .bi-bubble-bar-popup-view .bar-popup-container {
-  max-height: 656px;
+  max-height: 456px;
 }
 

src/less/base/combo/popup.bubble.bar.less

@@ -1,5 +1,5 @@
 .bi-bubble-bar-popup-view {
   & .bar-popup-container{
-    max-height: 656px;
+    max-height: 456px;
   }
 }