From 6a8ac759502f03f185a98ea588b008e431d6b481 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 4 Mar 2022 17:29:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feature:=20scrollable=E6=94=AF=E6=8C=81xy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index b2debf370..34990244a 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -62,11 +62,24 @@ BI.Layout = BI.inherit(BI.Widget, { _init4Scroll: function () { switch (this.options.scrollable) { case true: + case "xy": this.element.css("overflow", "auto"); break; case false: this.element.css("overflow", "hidden"); break; + case "x": + this.element.css({ + "overflow-x": "auto", + "overflow-y": "hidden" + }); + break; + case "y": + this.element.css({ + "overflow-x": "hidden", + "overflow-y": "auto" + }); + break; default : break; } From ae1ec228f9a320900911b0d71c189dcb17a4c886 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 4 Mar 2022 17:31:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feature:=20scrollable=E6=94=AF=E6=8C=81xy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index 34990244a..32d4ce70e 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -64,22 +64,22 @@ BI.Layout = BI.inherit(BI.Widget, { case true: case "xy": this.element.css("overflow", "auto"); - break; + return; case false: this.element.css("overflow", "hidden"); - break; + return; case "x": this.element.css({ "overflow-x": "auto", "overflow-y": "hidden" }); - break; + return; case "y": this.element.css({ "overflow-x": "hidden", "overflow-y": "auto" }); - break; + return; default : break; } From d01c4aad25beada828435514d8e0bb1d794fb672 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 4 Mar 2022 17:32:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature:=20scrollable=E6=94=AF=E6=8C=81xy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index 32d4ce70e..c77145b73 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -88,6 +88,7 @@ BI.Layout = BI.inherit(BI.Widget, { "overflow-x": "auto", "overflow-y": "hidden" }); + return; } if (this.options.scrolly) { this.element.css({