From f81feff31ec48681c71a3248134359e1ec68b654 Mon Sep 17 00:00:00 2001 From: windy Date: Tue, 18 Oct 2022 17:08:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=8D=95?= =?UTF-8?q?=E9=80=89=E4=B8=8B=E6=8B=89=E5=80=BC0=E9=80=89=E4=B8=ADtrigger?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/singleselect/trigger/searcher.singleselect.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget/singleselect/trigger/searcher.singleselect.js b/src/widget/singleselect/trigger/searcher.singleselect.js index a5674b8f1..3ba7c78e4 100644 --- a/src/widget/singleselect/trigger/searcher.singleselect.js +++ b/src/widget/singleselect/trigger/searcher.singleselect.js @@ -128,7 +128,7 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, { if (BI.isUndefined(v)) { this.editor.setState(BI.Selection.None); } else { - v = v || ""; + v = BI.isNull(v) ? "" : v; this.editor.setState(o.valueFormatter(v + "") || (v + "")); } }, From accde7ee707d0ee1b8ed1bf3f4125a94a2b83005 Mon Sep 17 00:00:00 2001 From: windy Date: Thu, 27 Oct 2022 17:15:11 +0800 Subject: [PATCH 2/9] =?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/core/platform/web/detectElementResize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/platform/web/detectElementResize.js b/src/core/platform/web/detectElementResize.js index 357e938a7..3183a57c4 100644 --- a/src/core/platform/web/detectElementResize.js +++ b/src/core/platform/web/detectElementResize.js @@ -553,7 +553,7 @@ var ResizeObserver = window.ResizeObserver || ResizeObserverPolyfill.ResizeObser if (!element.__resizeObserver__) { var resizeObserver = new ResizeObserver(function () { element.__resizeListeners__.forEach(function (listener) { - listener(); + BI.$(element).is(":visible") && listener(); }); }); resizeObserver.observe(element); From 37a7c0078430465945cddbe0b3f39d63b25c9a74 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 27 Oct 2022 17:46:15 +0800 Subject: [PATCH 3/9] auto upgrade version to 2.0.20221027174605 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b86f38463..012eb232f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221027160615", + "version": "2.0.20221027174605", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 3f8202499a966ffd3988fbe65f94071d10d411a6 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 28 Oct 2022 13:59:57 +0800 Subject: [PATCH 4/9] =?UTF-8?q?KERNEL-13158:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/collection/collection.js | 36 +++++++++++++++++++++++++++-- src/base/grid/grid.js | 38 ++++++++++++++++++++++++++++--- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/src/base/collection/collection.js b/src/base/collection/collection.js index d7f83a0f5..8d26825d5 100644 --- a/src/base/collection/collection.js +++ b/src/base/collection/collection.js @@ -280,12 +280,44 @@ BI.CollectionView = BI.inherit(BI.Widget, { } }, + _isOverflowX: function () { + var o = this.options; + // 兼容一下 + var scrollable = o.scrollable, scrollx = o.scrollx; + if (o.overflowX === false) { + return false; + } + if (scrollx) { + return true; + } + if (scrollable === true || scrollable === "x") { + return true; + } + return false; + }, + + _isOverflowY: function () { + var o = this.options; + // 兼容一下 + var scrollable = o.scrollable, scrolly = o.scrolly; + if (o.overflowX === false) { + return false; + } + if (scrolly) { + return true; + } + if (scrollable === true || scrollable === "x") { + return true; + } + return false; + }, + _getMaxScrollLeft: function () { - return Math.max(0, this._width - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0)); + return Math.max(0, this._width - this.options.width + (this._isOverflowX() ? BI.DOM.getScrollWidth() : 0)); }, _getMaxScrollTop: function () { - return Math.max(0, this._height - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0)); + return Math.max(0, this._height - this.options.height + (this._isOverflowY() ? BI.DOM.getScrollWidth() : 0)); }, _populate: function (items) { diff --git a/src/base/grid/grid.js b/src/base/grid/grid.js index d1385e4a1..f37201f73 100644 --- a/src/base/grid/grid.js +++ b/src/base/grid/grid.js @@ -96,7 +96,7 @@ BI.GridView = BI.inherit(BI.Widget, { this.element.scrollLeft(o.scrollLeft); } }, - + destroyed: function () { BI.each(this.renderedCells, function(i, cell) { cell.el._destroy(); @@ -262,12 +262,44 @@ BI.GridView = BI.inherit(BI.Widget, { } }, + _isOverflowX: function () { + var o = this.options; + // 兼容一下 + var scrollable = o.scrollable, scrollx = o.scrollx; + if (o.overflowX === false) { + return false; + } + if (scrollx) { + return true; + } + if (scrollable === true || scrollable === "x") { + return true; + } + return false; + }, + + _isOverflowY: function () { + var o = this.options; + // 兼容一下 + var scrollable = o.scrollable, scrolly = o.scrolly; + if (o.overflowX === false) { + return false; + } + if (scrolly) { + return true; + } + if (scrollable === true || scrollable === "x") { + return true; + } + return false; + }, + _getMaxScrollLeft: function () { - return Math.max(0, this._getContainerWidth() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0)); + return Math.max(0, this._getContainerWidth() - this.options.width + (this._isOverflowX() ? BI.DOM.getScrollWidth() : 0)); }, _getMaxScrollTop: function () { - return Math.max(0, this._getContainerHeight() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0)); + return Math.max(0, this._getContainerHeight() - this.options.height + (this._isOverflowY() ? BI.DOM.getScrollWidth() : 0)); }, _getContainerWidth: function () { From 35e914d9c36931b28d9094e0ae8e6d9124ea8558 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 28 Oct 2022 14:10:00 +0800 Subject: [PATCH 5/9] update --- server.js | 2 +- src/base/collection/collection.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index a9fd0cede..5e080f9d4 100644 --- a/server.js +++ b/server.js @@ -9,5 +9,5 @@ const port = 3000; app.use(express.static("./")); app.listen(port, function() { console.log("server start"); - open('http://localhost:' + port + '/index.html'); + open('http://localhost:' + port + '/examples/useContext.html'); }); diff --git a/src/base/collection/collection.js b/src/base/collection/collection.js index 8d26825d5..f45437627 100644 --- a/src/base/collection/collection.js +++ b/src/base/collection/collection.js @@ -290,7 +290,7 @@ BI.CollectionView = BI.inherit(BI.Widget, { if (scrollx) { return true; } - if (scrollable === true || scrollable === "x") { + if (scrollable === true || scrollable === "xy" || scrollable === "x") { return true; } return false; @@ -306,7 +306,7 @@ BI.CollectionView = BI.inherit(BI.Widget, { if (scrolly) { return true; } - if (scrollable === true || scrollable === "x") { + if (scrollable === true || scrollable === "xy" || scrollable === "y") { return true; } return false; From fbc43231b8a44e5e3383feb4fb5adbd1342187b9 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 28 Oct 2022 14:10:22 +0800 Subject: [PATCH 6/9] update --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 5e080f9d4..a9fd0cede 100644 --- a/server.js +++ b/server.js @@ -9,5 +9,5 @@ const port = 3000; app.use(express.static("./")); app.listen(port, function() { console.log("server start"); - open('http://localhost:' + port + '/examples/useContext.html'); + open('http://localhost:' + port + '/index.html'); }); From 12d2fc5d5443b0b828c6e3a4ca3a2af3bdf7bce2 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 28 Oct 2022 14:11:10 +0800 Subject: [PATCH 7/9] update --- src/base/grid/grid.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/grid/grid.js b/src/base/grid/grid.js index f37201f73..944a82d4a 100644 --- a/src/base/grid/grid.js +++ b/src/base/grid/grid.js @@ -272,7 +272,7 @@ BI.GridView = BI.inherit(BI.Widget, { if (scrollx) { return true; } - if (scrollable === true || scrollable === "x") { + if (scrollable === true || scrollable === "xy" || scrollable === "x") { return true; } return false; @@ -288,7 +288,7 @@ BI.GridView = BI.inherit(BI.Widget, { if (scrolly) { return true; } - if (scrollable === true || scrollable === "x") { + if (scrollable === true || scrollable === "xy" || scrollable === "y") { return true; } return false; From 19053e204d025700437d4b14b9c45f5c34f2717d Mon Sep 17 00:00:00 2001 From: data Date: Fri, 28 Oct 2022 14:35:12 +0800 Subject: [PATCH 8/9] auto upgrade version to 2.0.20221028143506 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 012eb232f..9c559b39c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221027174605", + "version": "2.0.20221028143506", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From f873cb43c286d0c24080583e2e7839de5f99f07d Mon Sep 17 00:00:00 2001 From: data Date: Fri, 28 Oct 2022 14:56:02 +0800 Subject: [PATCH 9/9] auto upgrade version to 2.0.20221028145548 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c559b39c..4ba289f11 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221028143506", + "version": "2.0.20221028145548", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",