Browse Source

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

* commit '6f01a0fab5130ffa4144acd12a4e9494f5ec3dbb':
  update
  BI-34242 气泡弹窗默认direction为bottom,left
es6
windy 6 years ago
parent
commit
c62ce2a339
  1. 2
      dist/base.css
  2. 2
      dist/bundle.css
  3. 2
      dist/bundle.ie.js
  4. 4
      dist/bundle.ie.min.js
  5. 2
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 4
      dist/bundle.min.js
  8. 2
      dist/case.js
  9. 25
      dist/demo.js
  10. 2
      dist/fineui.css
  11. 2
      dist/fineui.ie.js
  12. 4
      dist/fineui.ie.min.js
  13. 2
      dist/fineui.js
  14. 2
      dist/fineui.min.css
  15. 4
      dist/fineui.min.js
  16. 2
      dist/fineui_without_jquery_polyfill.js
  17. 2
      dist/utils.min.js
  18. 2
      src/case/combo/bubblecombo/combo.bubble.js
  19. 2
      src/css/base/combo/popup.css
  20. 2
      src/less/base/combo/popup.bubble.bar.less

2
dist/base.css vendored

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

2
dist/bundle.css vendored

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

2
dist/bundle.ie.js vendored

@ -52292,7 +52292,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
baseCls: "bi-bubble-combo", baseCls: "bi-bubble-combo",
trigger: "click", trigger: "click",
toggle: true, 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, isDefaultInit: false,
destroyWhenHide: false, destroyWhenHide: false,
isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustHeight: true, // 是否需要高度调整

4
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.js vendored

@ -52696,7 +52696,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
baseCls: "bi-bubble-combo", baseCls: "bi-bubble-combo",
trigger: "click", trigger: "click",
toggle: true, 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, isDefaultInit: false,
destroyWhenHide: false, destroyWhenHide: false,
isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustHeight: true, // 是否需要高度调整

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/case.js vendored

@ -3786,7 +3786,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
baseCls: "bi-bubble-combo", baseCls: "bi-bubble-combo",
trigger: "click", trigger: "click",
toggle: true, 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, isDefaultInit: false,
destroyWhenHide: false, destroyWhenHide: false,
isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustHeight: true, // 是否需要高度调整

25
dist/demo.js vendored

@ -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. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

2
dist/fineui.css vendored

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

2
dist/fineui.ie.js vendored

@ -52534,7 +52534,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
baseCls: "bi-bubble-combo", baseCls: "bi-bubble-combo",
trigger: "click", trigger: "click",
toggle: true, 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, isDefaultInit: false,
destroyWhenHide: false, destroyWhenHide: false,
isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustHeight: true, // 是否需要高度调整

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored

@ -52938,7 +52938,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
baseCls: "bi-bubble-combo", baseCls: "bi-bubble-combo",
trigger: "click", trigger: "click",
toggle: true, 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, isDefaultInit: false,
destroyWhenHide: false, destroyWhenHide: false,
isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustHeight: true, // 是否需要高度调整

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui_without_jquery_polyfill.js vendored

@ -35972,7 +35972,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
baseCls: "bi-bubble-combo", baseCls: "bi-bubble-combo",
trigger: "click", trigger: "click",
toggle: true, 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, isDefaultInit: false,
destroyWhenHide: false, destroyWhenHide: false,
isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustHeight: true, // 是否需要高度调整

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

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

@ -13,7 +13,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
baseCls: "bi-bubble-combo", baseCls: "bi-bubble-combo",
trigger: "click", trigger: "click",
toggle: true, 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, isDefaultInit: false,
destroyWhenHide: false, destroyWhenHide: false,
isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustHeight: true, // 是否需要高度调整

2
src/css/base/combo/popup.css

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

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

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