Browse Source

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

* commit '788bea484947423ea110289e1fd2840bd17436db':
  revert
  update: 判断下是否在搜索状态
  CHART-12259 fix: 单值系滑块滑动放开鼠标会发两次change事件
es6
windy 5 years ago
parent
commit
b20497b883
  1. 2
      src/widget/multilayerselecttree/multilayerselecttree.combo.js
  2. 2
      src/widget/multilayersingletree/multilayersingletree.combo.js

2
src/widget/multilayerselecttree/multilayerselecttree.combo.js

@ -160,7 +160,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
// IE11下,popover(position: fixed)下放置下拉控件(position: fixed), 滚动的时候会异常卡顿
// 通过container参数将popup放置于popover之外解决此问题, 其他下拉控件由于元素少或者有分页,所以
// 卡顿不明显, 先在此做尝试, 并在FineUI特殊处理待解决文档中标记跟踪
return (o.container && self.trigger.getSearcher().getView().element.find(e.target).length > 0) ? false : self.triggerBtn.element.find(e.target).length === 0;
return (o.container && self.trigger.getSearcher().isSearching() && self.trigger.getSearcher().getView().element.find(e.target).length > 0) ? false : self.triggerBtn.element.find(e.target).length === 0;
},
listeners: [{

2
src/widget/multilayersingletree/multilayersingletree.combo.js

@ -163,7 +163,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
// IE11下,popover(position: fixed)下放置下拉控件(position: fixed), 滚动的时候会异常卡顿
// 通过container参数将popup放置于popover之外解决此问题, 其他下拉控件由于元素少或者有分页,所以
// 卡顿不明显, 先在此做尝试, 并在FineUI特殊处理待解决文档中标记跟踪
return (o.container && self.trigger.getSearcher().getView().element.find(e.target).length > 0) ? false : self.triggerBtn.element.find(e.target).length === 0
return (o.container && self.trigger.getSearcher().isSearching() && self.trigger.getSearcher().getView().element.find(e.target).length > 0) ? false : self.triggerBtn.element.find(e.target).length === 0
},
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,

Loading…
Cancel
Save