From 0b5f588e4a3b6d5890de878fbdf7c51c97ebebe5 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Thu, 4 Mar 2021 17:56:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?BI-82197=20fix:=E5=A2=9E=E5=8A=A0keyword?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/treeitem/item.icon.treeleaf.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/case/button/treeitem/item.icon.treeleaf.js b/src/case/button/treeitem/item.icon.treeleaf.js index f1623d47a1..92fd5e348a 100644 --- a/src/case/button/treeitem/item.icon.treeleaf.js +++ b/src/case/button/treeitem/item.icon.treeleaf.js @@ -36,7 +36,8 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, { hgap: o.hgap, text: o.text, value: o.value, - py: o.py + py: o.py, + keyword: o.keyword }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { From b3ffe3ffd471b2ec2d0c1fc11d3ab7b128f2bba8 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Fri, 5 Mar 2021 17:30:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?BI-81437=20fix:=E5=85=A8=E9=80=89=E5=90=8E?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E7=8E=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/searcher.multiselect.insert.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/widget/multiselect/trigger/searcher.multiselect.insert.js b/src/widget/multiselect/trigger/searcher.multiselect.insert.js index 0300fc8ee1..4ad2651262 100644 --- a/src/widget/multiselect/trigger/searcher.multiselect.insert.js +++ b/src/widget/multiselect/trigger/searcher.multiselect.insert.js @@ -55,6 +55,9 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { popup: BI.extend({ type: "bi.multi_select_search_insert_pane", + ref: function (_ref) { + self.searchPane = _ref; + }, valueFormatter: o.valueFormatter, keywordGetter: function () { return self.editor.getValue(); @@ -70,7 +73,19 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { listeners: [{ eventName: BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, action: function () { - self.fireEvent(BI.MultiSelectInsertSearcher.EVENT_ADD_ITEM); + var keyword = self.searcher.getKeyword(); + self.storeValue = self.getValue(); + if (!self.searcher.hasMatched()) { + if (self.storeValue.type === BI.Selection.Multi) { + BI.pushDistinct(self.storeValue.value, keyword); + } + self.searchPane.setVisible(false); + self.setValue(self.storeValue); + self.populate(); + if (self.storeValue.type === BI.Selection.Multi) { + self.fireEvent(BI.MultiSelectInsertSearcher.EVENT_ADD_ITEM); + } + } } }] }, o.popup), @@ -79,6 +94,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { masker: o.masker }); this.searcher.on(BI.Searcher.EVENT_START, function () { + self.searchPane.setVisible(true); self.fireEvent(BI.MultiSelectInsertSearcher.EVENT_START); }); this.searcher.on(BI.Searcher.EVENT_PAUSE, function () { From fb87b3fef865355f5f5de10871f730ce5bbaf30b Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Wed, 17 Mar 2021 17:02:42 +0800 Subject: [PATCH 3/7] =?UTF-8?q?BI-83103=20fix:=E5=8C=BA=E9=97=B4=E6=BB=91?= =?UTF-8?q?=E5=9D=97=E5=80=BC=E6=9C=80=E5=B0=8F=E5=80=BC=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC=EF=BC=8C=E6=95=B0=E5=80=BC=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E9=A2=A0=E5=80=92=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/intervalslider/intervalslider.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js index b7dc379b58..a4b99df81d 100644 --- a/src/widget/intervalslider/intervalslider.js +++ b/src/widget/intervalslider/intervalslider.js @@ -343,6 +343,12 @@ BI.IntervalSlider = BI.inherit(BI.Single, { _resetLabelPosition: function(needReverse) { this.labelOne.element.css({left: needReverse ? "100%" : "0%"}); this.labelTwo.element.css({left: needReverse ? "0%" : "100%"}); + // 掉转一次之后，再进行判断时，two在左边，one在右边，two>one时不再进行交换,所以要对两个控件也同步进行一个调转 + if (needReverse) { + var tmp = this.labelOne; + this.labelOne = this.labelTwo; + this.labelTwo = tmp; + } }, _setSliderOnePosition: function (percent) { From 15084649b9b7c41c1e69e562195fdd47b0aadfbb Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Wed, 17 Mar 2021 17:06:00 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20style:?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/searcher.multiselect.insert.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/widget/multiselect/trigger/searcher.multiselect.insert.js b/src/widget/multiselect/trigger/searcher.multiselect.insert.js index 4ad2651262..ffb152c812 100644 --- a/src/widget/multiselect/trigger/searcher.multiselect.insert.js +++ b/src/widget/multiselect/trigger/searcher.multiselect.insert.js @@ -55,9 +55,6 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { popup: BI.extend({ type: "bi.multi_select_search_insert_pane", - ref: function (_ref) { - self.searchPane = _ref; - }, valueFormatter: o.valueFormatter, keywordGetter: function () { return self.editor.getValue(); @@ -73,19 +70,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { listeners: [{ eventName: BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, action: function () { - var keyword = self.searcher.getKeyword(); - self.storeValue = self.getValue(); - if (!self.searcher.hasMatched()) { - if (self.storeValue.type === BI.Selection.Multi) { - BI.pushDistinct(self.storeValue.value, keyword); - } - self.searchPane.setVisible(false); - self.setValue(self.storeValue); - self.populate(); - if (self.storeValue.type === BI.Selection.Multi) { - self.fireEvent(BI.MultiSelectInsertSearcher.EVENT_ADD_ITEM); - } - } + self.fireEvent(BI.MultiSelectInsertSearcher.EVENT_ADD_ITEM); } }] }, o.popup), From ddb44aa9d53528727c869d563384d57d0cf79c98 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Wed, 17 Mar 2021 17:06:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20style:?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/trigger/searcher.multiselect.insert.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/widget/multiselect/trigger/searcher.multiselect.insert.js b/src/widget/multiselect/trigger/searcher.multiselect.insert.js index ffb152c812..0300fc8ee1 100644 --- a/src/widget/multiselect/trigger/searcher.multiselect.insert.js +++ b/src/widget/multiselect/trigger/searcher.multiselect.insert.js @@ -79,7 +79,6 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { masker: o.masker }); this.searcher.on(BI.Searcher.EVENT_START, function () { - self.searchPane.setVisible(true); self.fireEvent(BI.MultiSelectInsertSearcher.EVENT_START); }); this.searcher.on(BI.Searcher.EVENT_PAUSE, function () { From b78d686c93d96ed1b07411c348dede9050c10f8f Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Wed, 17 Mar 2021 18:29:22 +0800 Subject: [PATCH 6/7] =?UTF-8?q?BI-83103=20fix:=E5=8C=BA=E9=97=B4=E6=BB=91?= =?UTF-8?q?=E5=9D=97=E5=80=BC=E6=9C=80=E5=B0=8F=E5=80=BC=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC=EF=BC=8C=E6=95=B0=E5=80=BC=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E9=A2=A0=E5=80=92=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/intervalslider/intervalslider.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js index a4b99df81d..b7dc379b58 100644 --- a/src/widget/intervalslider/intervalslider.js +++ b/src/widget/intervalslider/intervalslider.js @@ -343,12 +343,6 @@ BI.IntervalSlider = BI.inherit(BI.Single, { _resetLabelPosition: function(needReverse) { this.labelOne.element.css({left: needReverse ? "100%" : "0%"}); this.labelTwo.element.css({left: needReverse ? "0%" : "100%"}); - // 掉转一次之后，再进行判断时，two在左边，one在右边，two>one时不再进行交换,所以要对两个控件也同步进行一个调转 - if (needReverse) { - var tmp = this.labelOne; - this.labelOne = this.labelTwo; - this.labelTwo = tmp; - } }, _setSliderOnePosition: function (percent) { From eeeac08086fcb85fbc5c4f737b6a6d2632214524 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Wed, 17 Mar 2021 18:49:43 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=09BI-83103=20fix:=E5=8C=BA=E9=97=B4?= =?UTF-8?q?=E6=BB=91=E5=9D=97=E5=80=BC=E6=9C=80=E5=B0=8F=E5=80=BC=E5=A4=A7?= =?UTF-8?q?=E4=BA=8E=E6=9C=80=E5=A4=A7=E5=80=BC=EF=BC=8C=E6=95=B0=E5=80=BC?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E9=A2=A0=E5=80=92=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/intervalslider/intervalslider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js index b7dc379b58..df8d0e796a 100644 --- a/src/widget/intervalslider/intervalslider.js +++ b/src/widget/intervalslider/intervalslider.js @@ -335,7 +335,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, { valueOne = BI.parseFloat(valueOne); valueTwo = BI.parseFloat(valueTwo); if((oldValueOne <= oldValueTwo && valueOne > valueTwo) || (oldValueOne >= oldValueTwo && valueOne < valueTwo)) { - var isSliderOneLeft = BI.parseFloat(this.sliderOne.element[0].style.left) < BI.parseFloat(this.sliderTwo.element[0].style.left); + var isSliderOneLeft = BI.parseFloat(this.labelOne.getValue()) < BI.parseFloat(this.labelTwo.getValue()); this._resetLabelPosition(!isSliderOneLeft); } },