Browse Source

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

* commit '95767e23c743bfe589141b797d8eeff793db8b7d':
  BI-34242 popover不需要关心横向滚动
master
windy 6 years ago
parent
commit
97204ddfc3
  1. 1
      dist/base.js
  2. 1
      dist/bundle.ie.js
  3. 4
      dist/bundle.ie.min.js
  4. 1
      dist/bundle.js
  5. 16
      dist/bundle.min.js
  6. 25
      dist/demo.js
  7. 1
      dist/fineui.ie.js
  8. 4
      dist/fineui.ie.min.js
  9. 1
      dist/fineui.js
  10. 16
      dist/fineui.min.js
  11. 1
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 1
      src/base/layer/layer.popover.js

1
dist/base.js vendored

@ -5700,6 +5700,7 @@ BI.Popover = BI.inherit(BI.Widget, {
}, { }, {
el: o.logic.dynamic ? { el: o.logic.dynamic ? {
type: "bi.vertical", type: "bi.vertical",
scrolly: false,
cls: "popover-body", cls: "popover-body",
ref: function () { ref: function () {
self.body = this; self.body = this;

1
dist/bundle.ie.js vendored

@ -40735,6 +40735,7 @@ BI.Popover = BI.inherit(BI.Widget, {
}, { }, {
el: o.logic.dynamic ? { el: o.logic.dynamic ? {
type: "bi.vertical", type: "bi.vertical",
scrolly: false,
cls: "popover-body", cls: "popover-body",
ref: function () { ref: function () {
self.body = this; self.body = this;

4
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/bundle.js vendored

@ -41139,6 +41139,7 @@ BI.Popover = BI.inherit(BI.Widget, {
}, { }, {
el: o.logic.dynamic ? { el: o.logic.dynamic ? {
type: "bi.vertical", type: "bi.vertical",
scrolly: false,
cls: "popover-body", cls: "popover-body",
ref: function () { ref: function () {
self.body = this; self.body = this;

16
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

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, {

1
dist/fineui.ie.js vendored

@ -40977,6 +40977,7 @@ BI.Popover = BI.inherit(BI.Widget, {
}, { }, {
el: o.logic.dynamic ? { el: o.logic.dynamic ? {
type: "bi.vertical", type: "bi.vertical",
scrolly: false,
cls: "popover-body", cls: "popover-body",
ref: function () { ref: function () {
self.body = this; self.body = this;

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/fineui.js vendored

@ -41381,6 +41381,7 @@ BI.Popover = BI.inherit(BI.Widget, {
}, { }, {
el: o.logic.dynamic ? { el: o.logic.dynamic ? {
type: "bi.vertical", type: "bi.vertical",
scrolly: false,
cls: "popover-body", cls: "popover-body",
ref: function () { ref: function () {
self.body = this; self.body = this;

16
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/fineui_without_jquery_polyfill.js vendored

@ -29006,6 +29006,7 @@ BI.Popover = BI.inherit(BI.Widget, {
}, { }, {
el: o.logic.dynamic ? { el: o.logic.dynamic ? {
type: "bi.vertical", type: "bi.vertical",
scrolly: false,
cls: "popover-body", cls: "popover-body",
ref: function () { ref: function () {
self.body = this; self.body = this;

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

1
src/base/layer/layer.popover.js

@ -86,6 +86,7 @@ BI.Popover = BI.inherit(BI.Widget, {
}, { }, {
el: o.logic.dynamic ? { el: o.logic.dynamic ? {
type: "bi.vertical", type: "bi.vertical",
scrolly: false,
cls: "popover-body", cls: "popover-body",
ref: function () { ref: function () {
self.body = this; self.body = this;

Loading…
Cancel
Save