Browse Source

Pull request #1719: BI-76510 && BI-76647 IEpopup闪一下 && combo内部resize不收起popup

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '017319edcc3d63b8a1becd0c6b83fdcedb7e010a':
  BI-76510 && BI-76647  IEpopup闪一下 && combo内部resize不收起popup
es6
windy 4 years ago
parent
commit
558a7961b5
  1. 8
      src/base/combination/combo.js
  2. 4
      src/base/layer/layer.popover.js

8
src/base/combination/combo.js

@ -85,9 +85,10 @@
] ]
})))); }))));
o.isDefaultInit && (this._assertPopupView()); o.isDefaultInit && (this._assertPopupView());
BI.Resizers.add(this.getName(), BI.bind(function () { BI.Resizers.add(this.getName(), BI.bind(function (e) {
// 如果resize对象是combo的子元素,则不应该收起,或交由hideChecker去处理
if (this.isViewVisible()) { if (this.isViewVisible()) {
this._hideView(); BI.isNotNull(e) ? this._hideIf(e) : this._hideView();
} }
}, this)); }, this));
}, },
@ -351,7 +352,8 @@
var self = this; var self = this;
this._assertPopupViewRender(); this._assertPopupViewRender();
this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW);
// popupVisible是为了获取其宽高, 放到可视范围之外以防止在IE下闪一下
this.popupView.css({left: -999999999, top: -99999999});
this.popupView.visible(); this.popupView.visible();
BI.each(needHideWhenAnotherComboOpen, function (i, combo) { BI.each(needHideWhenAnotherComboOpen, function (i, combo) {
if (i !== self.getName()) { if (i !== self.getName()) {

4
src/base/layer/layer.popover.js

@ -45,7 +45,9 @@ BI.Popover = BI.inherit(BI.Widget, {
top: BI.clamp(self.startY, 0, H - self.element.height()) + "px", top: BI.clamp(self.startY, 0, H - self.element.height()) + "px",
}); });
// BI-12134 没有什么特别好的方法 // BI-12134 没有什么特别好的方法
BI.Resizers._resize(); BI.Resizers._resize({
target: self.element[0],
});
}, function () { }, function () {
self.tracker.releaseMouseMoves(); self.tracker.releaseMouseMoves();
}, _global); }, _global);

Loading…
Cancel
Save