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

* commit 'a461d9e4e48d206fe06f7cc55ad22d53a671fb98':
  无JIRA任务 popup生命周期
  BI-58377 fix: populate的时候视最大最小值状况刷新label
  DEC-11654 fix: IE11多层级单选下拉树展开后滚动卡

changelog.md

@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2019-12)
+- 修复多层级单选下拉树主动设置container后搜索面板弹出问题
 - bi.search_editor支持搜索中间含有空格的字符串
 - 修复了监听日期下拉框before_popup_view事件，调用setMinDate无效的问题
 - 修复了数值滑块逆向排列滑块后populate显示效果不对的问题

dist/utils.js

@@ -12362,6 +12362,7 @@ if (!_global.BI) {
         _purgeRef: function () {
             if (this.options.ref) {
                 this.options.ref.call(null);
+                this.options.ref = null;
             }
         },
 

src/base/combination/combo.js

@@ -518,6 +518,7 @@ BI.Combo = BI.inherit(BI.Widget, {
             .unbind("mousemove." + this.getName())
             .unbind("mouseleave." + this.getName());
         BI.Resizers.remove(this.getName());
+        this.popupView && this.popupView._destroy();
     }
 });
 BI.Combo.EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE";

src/base/combination/switcher.js

@@ -271,10 +271,6 @@ BI.Switcher = BI.inherit(BI.Widget, {
 
     empty: function () {
         this.popupView && this.popupView.empty();
-    },
-
-    destroy: function () {
-        BI.Switcher.superclass.destroy.apply(this, arguments);
     }
 });
 BI.Switcher.EVENT_EXPAND = "EVENT_EXPAND";

src/core/ob.js

@@ -81,6 +81,7 @@
         _purgeRef: function () {
             if (this.options.ref) {
                 this.options.ref.call(null);
+                this.options.ref = null;
             }
         },
 

src/core/widget.js

@@ -445,6 +445,7 @@
 
         __d: function () {
             this.beforeDestroy && this.beforeDestroy();
+            this.beforeDestroy = null;
             BI.each(this._children, function (i, widget) {
                 widget && widget._unMount && widget._unMount();
             });
@@ -452,6 +453,7 @@
             this._parent = null;
             this._isMounted = false;
             this.destroyed && this.destroyed();
+            this.destroyed = null;
         },
 
         _unMount: function () {

src/widget/intervalslider/intervalslider.js

@@ -527,7 +527,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
                 this.labelTwo.setValue(this.max);
                 this._setAllPosition(0, 100);
             }
-            this._resetLabelPosition();
+            this._resetLabelPosition(this.valueOne > this.valueTwo);
         }
     }
 });

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -64,6 +64,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         return {
             type: "bi.combo",
             container: o.container,
+            destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,
             ref: function (_ref) {
                 self.combo = _ref;
@@ -104,6 +105,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         return {
             el: {
                 type: "bi.multilayer_select_tree_trigger",
+                container: o.container,
                 allowInsertValue: o.allowInsertValue,
                 allowSearchValue: o.allowSearchValue,
                 allowEdit: o.allowEdit,
@@ -152,8 +154,14 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                     }
                 }]
             },
+            toggle: !o.allowEdit,
             hideChecker: function (e) {
-                return self.triggerBtn.element.find(e.target).length === 0;
+                // 新增传配置container后对应hideChecker的修改
+                // 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;
+
             },
             listeners: [{
                 eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,

src/widget/multilayerselecttree/multilayerselecttree.trigger.js

@@ -30,6 +30,12 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
                         ref: function () {
                             self.searcher = this;
                         },
+                        masker: BI.isNotNull(o.container) ? {
+                            offset: {},
+                            container: o.container
+                        } : {
+                            offset: {}
+                        },
                         isAutoSearch: false,
                         el: {
                             type: "bi.state_editor",

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -67,6 +67,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         return {
             type: "bi.combo",
             container: o.container,
+            destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,
             ref: function (_ref) {
                 self.combo = _ref;
@@ -107,6 +108,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         return {
             el: {
                 type: "bi.multilayer_single_tree_trigger",
+                container: o.container,
                 allowInsertValue: o.allowInsertValue,
                 allowSearchValue: o.allowSearchValue,
                 allowEdit: o.allowEdit,
@@ -155,8 +157,13 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                     }
                 }]
             },
+            toggle: !o.allowEdit,
             hideChecker: function (e) {
-                return self.triggerBtn.element.find(e.target).length === 0;
+                // 新增传配置container后对应hideChecker的修改
+                // 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
             },
             listeners: [{
                 eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,

src/widget/multilayersingletree/multilayersingletree.trigger.js

@@ -30,6 +30,12 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
                         ref: function () {
                             self.searcher = this;
                         },
+                        masker: BI.isNotNull(o.container) ? {
+                            offset: {},
+                            container: o.container
+                        } : {
+                            offset: {}
+                        },
                         isAutoSearch: false,
                         el: {
                             type: "bi.state_editor",