From e3f8e33ef90afcfe5abd1f455122a20e5e7d50c0 Mon Sep 17 00:00:00 2001 From: windy Date: Thu, 27 Oct 2022 16:26:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?BI-116192=20=E5=8A=A8=E6=80=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E5=8F=AF=E8=A7=81=E7=8A=B6=E6=80=81=E4=B8=8B?= =?UTF-8?q?resize=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/list/listview.js | 3 +++ src/base/list/virtualgrouplist.js | 4 +++- src/base/list/virtuallist.js | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/base/list/listview.js b/src/base/list/listview.js index 7028132bc..c998281b9 100644 --- a/src/base/list/listview.js +++ b/src/base/list/listview.js @@ -55,6 +55,9 @@ BI.ListView = BI.inherit(BI.Widget, { var lastWidth = this.element.width(), lastHeight = this.element.height(); BI.ResizeDetector.addResizeListener(this, function () { + if (!self.element.is(":visible")) { + return; + } var width = self.element.width(), height = self.element.height(); if (width !== lastWidth || height !== lastHeight) { diff --git a/src/base/list/virtualgrouplist.js b/src/base/list/virtualgrouplist.js index 34b11e800..2db1e0765 100644 --- a/src/base/list/virtualgrouplist.js +++ b/src/base/list/virtualgrouplist.js @@ -74,7 +74,9 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, { } }); BI.ResizeDetector.addResizeListener(this, function () { - self._calculateBlocksToRender(); + if (self.element.is(":visible")) { + self._calculateBlocksToRender(); + } }); }, diff --git a/src/base/list/virtuallist.js b/src/base/list/virtuallist.js index 2715008cb..011d53344 100644 --- a/src/base/list/virtuallist.js +++ b/src/base/list/virtuallist.js @@ -61,7 +61,9 @@ BI.VirtualList = BI.inherit(BI.Widget, { self._calculateBlocksToRender(); }); BI.ResizeDetector.addResizeListener(this, function () { - self._calculateBlocksToRender(); + if (self.element.is(":visible")) { + self._calculateBlocksToRender(); + } }); }, From a1b83bc5f79509a4020b5b3b7016cabfdd22deb2 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 31 Oct 2022 13:56:49 +0800 Subject: [PATCH 2/6] auto upgrade version to 2.0.20221031135635 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 614ce7c63..3070b532e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221031101438", + "version": "2.0.20221031135635", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From c5c5f066d16a9997f4ba4aba336efcbe5f406c1d Mon Sep 17 00:00:00 2001 From: data Date: Mon, 31 Oct 2022 19:06:12 +0800 Subject: [PATCH 3/6] auto upgrade version to 2.0.20221031190602 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3070b532e..9b298d2fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221031135635", + "version": "2.0.20221031190602", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 06dc1b29848ba059c64f35949c65d42a66f0bdb0 Mon Sep 17 00:00:00 2001 From: "Aries.lsy" <”Aries.lsy@fanruan.com“> Date: Mon, 31 Oct 2022 20:04:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?REPORT-82014=20fix:=E8=A1=A5=E9=BD=90AFTER?= =?UTF-8?q?=5FHIDEVIEW=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combo/searchtextvaluecombo/combo.searchtextvalue.js | 2 ++ src/component/treevaluechooser/combo.treevaluechooser.js | 6 ++++++ src/widget/multitree/multi.tree.combo.js | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js index 63f73944a..baa653207 100644 --- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js @@ -91,6 +91,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, action: function () { self.trigger.stopEditing(); + self.fireEvent(BI.SearchTextValueCombo.EVENT_AFTER_HIDEVIEW); } }, { eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, @@ -148,4 +149,5 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { }); BI.SearchTextValueCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; +BI.SearchTextValueCombo.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW" BI.shortcut("bi.search_text_value_combo", BI.SearchTextValueCombo); diff --git a/src/component/treevaluechooser/combo.treevaluechooser.js b/src/component/treevaluechooser/combo.treevaluechooser.js index 7b42f3d74..2c0709d67 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.js @@ -73,6 +73,11 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { action: function () { self.fireEvent(BI.TreeValueChooserCombo.EVENT_BEFORE_POPUPVIEW); } + }, { + eventName: BI.MultiTreeCombo.EVENT_AFTER_HIDEVIEW, + action: function () { + self.fireEvent(BI.TreeValueChooserCombo.EVENT_AFTER_HIDEVIEW); + } }] }); }, @@ -128,4 +133,5 @@ BI.TreeValueChooserCombo.EVENT_BLUR = "EVENT_BLUR"; BI.TreeValueChooserCombo.EVENT_STOP = "EVENT_STOP"; BI.TreeValueChooserCombo.EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM"; BI.TreeValueChooserCombo.EVENT_SEARCHING = "EVENT_SEARCHING"; +BI.TreeValueChooserCombo.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW"; BI.shortcut("bi.tree_value_chooser_combo", BI.TreeValueChooserCombo); diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index d48e8d6db..9853784d5 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -212,6 +212,9 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { clear = false; change = false; }); + this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () { + self.fireEvent(BI.MultiTreeCombo.EVENT_AFTER_HIDEVIEW); + }); var triggerBtn = BI.createWidget({ type: "bi.trigger_icon_button", @@ -367,5 +370,6 @@ BI.MultiTreeCombo.EVENT_SEARCHING = "EVENT_SEARCHING"; BI.MultiTreeCombo.EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM"; BI.MultiTreeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.MultiTreeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; +BI.MultiTreeCombo.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW"; BI.shortcut("bi.multi_tree_combo", BI.MultiTreeCombo); From 3e79f1a2d74b5fd974e8319a1f69c94c2f2b6a4f Mon Sep 17 00:00:00 2001 From: data Date: Mon, 31 Oct 2022 22:16:21 +0800 Subject: [PATCH 5/6] auto upgrade version to 2.0.20221031221611 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9b298d2fe..167553999 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221031190602", + "version": "2.0.20221031221611", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From f7fe05da3f56c3a7c58b028b6fde4c06fa660632 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 1 Nov 2022 10:05:33 +0800 Subject: [PATCH 6/6] auto upgrade version to 2.0.20221101100519 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 167553999..d8d1135eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221031221611", + "version": "2.0.20221101100519", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",