From d4ab918acf140dbf60cd872bf0f87fa734b38e98 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 3 Jan 2020 09:25:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?CHART-12259=20fix:=20=E5=8D=95=E5=80=BC?= =?UTF-8?q?=E7=B3=BB=E6=BB=91=E5=9D=97=E6=BB=91=E5=8A=A8=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E9=BC=A0=E6=A0=87=E4=BC=9A=E5=8F=91=E4=B8=A4=E6=AC=A1change?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 3 +++ src/widget/singleslider/singleslider.js | 1 - src/widget/singleslider/singleslider.label.js | 1 - src/widget/singleslider/singleslider.normal.js | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index 251859dd5f..1c0dec9911 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,7 @@ # 更新日志 +2.0(2020-1) +- 修复单值系滑块滑动松手后发两次EVENT_CHANGE的问题 + 2.0(2019-12) - 修复多层级单选下拉树主动设置container后搜索面板弹出问题 - bi.search_editor支持搜索中间含有空格的字符串 diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js index c3c8e2c6e7..88830da4c9 100644 --- a/src/widget/singleslider/singleslider.js +++ b/src/widget/singleslider/singleslider.js @@ -173,7 +173,6 @@ BI.SingleSlider = BI.inherit(BI.Single, { } widget.element.removeClass("dragging"); mouseMoveTracker.releaseMouseMoves(); - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); }, window); widget.element.on("mousedown", function (event) { if(!widget.isEnabled()) { diff --git a/src/widget/singleslider/singleslider.label.js b/src/widget/singleslider/singleslider.label.js index 034d22f141..ca0c421a8a 100644 --- a/src/widget/singleslider/singleslider.label.js +++ b/src/widget/singleslider/singleslider.label.js @@ -158,7 +158,6 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, { } widget.element.removeClass("dragging"); mouseMoveTracker.releaseMouseMoves(); - self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE); }, window); widget.element.on("mousedown", function (event) { if(!widget.isEnabled()) { diff --git a/src/widget/singleslider/singleslider.normal.js b/src/widget/singleslider/singleslider.normal.js index 347906fae3..ef4b23de8a 100644 --- a/src/widget/singleslider/singleslider.normal.js +++ b/src/widget/singleslider/singleslider.normal.js @@ -124,7 +124,6 @@ BI.SingleSliderNormal = BI.inherit(BI.Single, { } widget.element.removeClass("dragging"); mouseMoveTracker.releaseMouseMoves(); - self.fireEvent(BI.SingleSlider.EVENT_CHANGE); }, window); widget.element.on("mousedown", function (event) { if(!widget.isEnabled()) { From 311f65201e796f60b3f219865ffae797bc10259f Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 3 Jan 2020 10:08:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update:=20=E5=88=A4=E6=96=AD=E4=B8=8B?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E6=90=9C=E7=B4=A2=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multilayerselecttree/multilayerselecttree.combo.js | 2 +- src/widget/multilayersingletree/multilayersingletree.combo.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js index 410e4320c7..f844cb2f1c 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/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: [{ diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index b4218db006..319b9e5bf2 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/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, From 788bea484947423ea110289e1fd2840bd17436db Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 3 Jan 2020 10:08:45 +0800 Subject: [PATCH 3/3] revert --- changelog.md | 3 --- src/widget/singleslider/singleslider.js | 1 + src/widget/singleslider/singleslider.label.js | 1 + src/widget/singleslider/singleslider.normal.js | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index 1c0dec9911..251859dd5f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,4 @@ # 更新日志 -2.0(2020-1) -- 修复单值系滑块滑动松手后发两次EVENT_CHANGE的问题 - 2.0(2019-12) - 修复多层级单选下拉树主动设置container后搜索面板弹出问题 - bi.search_editor支持搜索中间含有空格的字符串 diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js index 88830da4c9..c3c8e2c6e7 100644 --- a/src/widget/singleslider/singleslider.js +++ b/src/widget/singleslider/singleslider.js @@ -173,6 +173,7 @@ BI.SingleSlider = BI.inherit(BI.Single, { } widget.element.removeClass("dragging"); mouseMoveTracker.releaseMouseMoves(); + self.fireEvent(BI.SingleSlider.EVENT_CHANGE); }, window); widget.element.on("mousedown", function (event) { if(!widget.isEnabled()) { diff --git a/src/widget/singleslider/singleslider.label.js b/src/widget/singleslider/singleslider.label.js index ca0c421a8a..034d22f141 100644 --- a/src/widget/singleslider/singleslider.label.js +++ b/src/widget/singleslider/singleslider.label.js @@ -158,6 +158,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, { } widget.element.removeClass("dragging"); mouseMoveTracker.releaseMouseMoves(); + self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE); }, window); widget.element.on("mousedown", function (event) { if(!widget.isEnabled()) { diff --git a/src/widget/singleslider/singleslider.normal.js b/src/widget/singleslider/singleslider.normal.js index ef4b23de8a..347906fae3 100644 --- a/src/widget/singleslider/singleslider.normal.js +++ b/src/widget/singleslider/singleslider.normal.js @@ -124,6 +124,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Single, { } widget.element.removeClass("dragging"); mouseMoveTracker.releaseMouseMoves(); + self.fireEvent(BI.SingleSlider.EVENT_CHANGE); }, window); widget.element.on("mousedown", function (event) { if(!widget.isEnabled()) {