Merge remote-tracking branch 'origin/master'

3 years ago · 1b69dfb712
37 changed files with 216 additions and 132 deletions
--- a/dist/2.0/fineui.css
+++ b/dist/2.0/fineui.css
--- a/dist/2.0/fineui.ie.min.js
+++ b/dist/2.0/fineui.ie.min.js
--- a/dist/2.0/fineui.ie.min.js.map
+++ b/dist/2.0/fineui.ie.min.js.map
--- a/dist/2.0/fineui.js
+++ b/dist/2.0/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-7 09:10:33 */
+/*! time: 2021-4-7 21:20:22 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -17610,7 +17610,8 @@ BI.shortcut("bi.horizontal_auto", BI.HorizontalAutoLayout);
 /**
 * 浮动的水平居中布局
 */
-BI.FloatHorizontalLayout = BI.inherit(BI.Layout);
+BI.FloatHorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal_float", BI.FloatHorizontalLayout);


@ -17957,12 +17958,15 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -18222,12 +18226,15 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" || o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -18440,12 +18447,15 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -18607,12 +18617,15 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" && o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -19804,7 +19817,8 @@ BI.shortcut("bi.grid", BI.GridLayout);
 * @class BI.HorizontalLayout
 * @extends BI.Layout
 */
-BI.HorizontalLayout = BI.inherit(BI.Layout);
+BI.HorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal", BI.HorizontalLayout);


@ -19868,7 +19882,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
            if (o.columnSize[i] === "fill") {
                w.element.css("min-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
-            if (o.horizontalAlign === BI.HorizontalAlign.Stretch) {
+            if (o.horizontalAlign === BI.HorizontalAlign.Stretch || !(o.scrollable === true || o.scrollx === true)) {
                w.element.css("max-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
        }
--- a/dist/2.0/fineui.js.map
+++ b/dist/2.0/fineui.js.map
--- a/dist/2.0/fineui.min.css
+++ b/dist/2.0/fineui.min.css
--- a/dist/2.0/fineui.min.js
+++ b/dist/2.0/fineui.min.js
--- a/dist/2.0/fineui.min.js.map
+++ b/dist/2.0/fineui.min.js.map
--- a/dist/2.0/fineui_without_normalize.css
+++ b/dist/2.0/fineui_without_normalize.css
--- a/dist/2.0/fineui_without_normalize.min.css
+++ b/dist/2.0/fineui_without_normalize.min.css
--- a/dist/core.css
+++ b/dist/core.css
--- a/dist/core.js
+++ b/dist/core.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-7 09:10:33 */
+/*! time: 2021-4-7 21:20:22 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -17610,7 +17610,8 @@ BI.shortcut("bi.horizontal_auto", BI.HorizontalAutoLayout);
 /**
 * 浮动的水平居中布局
 */
-BI.FloatHorizontalLayout = BI.inherit(BI.Layout);
+BI.FloatHorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal_float", BI.FloatHorizontalLayout);


@ -17957,12 +17958,15 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -18222,12 +18226,15 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" || o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -18440,12 +18447,15 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -18607,12 +18617,15 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" && o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -19804,7 +19817,8 @@ BI.shortcut("bi.grid", BI.GridLayout);
 * @class BI.HorizontalLayout
 * @extends BI.Layout
 */
-BI.HorizontalLayout = BI.inherit(BI.Layout);
+BI.HorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal", BI.HorizontalLayout);


@ -19868,7 +19882,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
            if (o.columnSize[i] === "fill") {
                w.element.css("min-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
-            if (o.horizontalAlign === BI.HorizontalAlign.Stretch) {
+            if (o.horizontalAlign === BI.HorizontalAlign.Stretch || !(o.scrollable === true || o.scrollx === true)) {
                w.element.css("max-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
        }
--- a/dist/core.js.map
+++ b/dist/core.js.map
--- a/dist/demo.css
+++ b/dist/demo.css
--- a/dist/demo.js
+++ b/dist/demo.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-7 09:10:33 */
+/*! time: 2021-4-7 21:20:22 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -17610,7 +17610,8 @@ BI.shortcut("bi.horizontal_auto", BI.HorizontalAutoLayout);
 /**
 * 浮动的水平居中布局
 */
-BI.FloatHorizontalLayout = BI.inherit(BI.Layout);
+BI.FloatHorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal_float", BI.FloatHorizontalLayout);


@ -17957,12 +17958,15 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -18222,12 +18226,15 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" || o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -18440,12 +18447,15 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -18607,12 +18617,15 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" && o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -19804,7 +19817,8 @@ BI.shortcut("bi.grid", BI.GridLayout);
 * @class BI.HorizontalLayout
 * @extends BI.Layout
 */
-BI.HorizontalLayout = BI.inherit(BI.Layout);
+BI.HorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal", BI.HorizontalLayout);


@ -19868,7 +19882,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
            if (o.columnSize[i] === "fill") {
                w.element.css("min-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
-            if (o.horizontalAlign === BI.HorizontalAlign.Stretch) {
+            if (o.horizontalAlign === BI.HorizontalAlign.Stretch || !(o.scrollable === true || o.scrollx === true)) {
                w.element.css("max-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
        }
--- a/dist/demo.js.map
+++ b/dist/demo.js.map
--- a/dist/fineui.css
+++ b/dist/fineui.css
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.ie.min.js.map
+++ b/dist/fineui.ie.min.js.map
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-7 09:10:33 */
+/*! time: 2021-4-7 21:20:22 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -17610,7 +17610,8 @@ BI.shortcut("bi.horizontal_auto", BI.HorizontalAutoLayout);
 /**
 * 浮动的水平居中布局
 */
-BI.FloatHorizontalLayout = BI.inherit(BI.Layout);
+BI.FloatHorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal_float", BI.FloatHorizontalLayout);


@ -17957,12 +17958,15 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -18222,12 +18226,15 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" || o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -18440,12 +18447,15 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -18607,12 +18617,15 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" && o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -19804,7 +19817,8 @@ BI.shortcut("bi.grid", BI.GridLayout);
 * @class BI.HorizontalLayout
 * @extends BI.Layout
 */
-BI.HorizontalLayout = BI.inherit(BI.Layout);
+BI.HorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal", BI.HorizontalLayout);


@ -19868,7 +19882,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
            if (o.columnSize[i] === "fill") {
                w.element.css("min-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
-            if (o.horizontalAlign === BI.HorizontalAlign.Stretch) {
+            if (o.horizontalAlign === BI.HorizontalAlign.Stretch || !(o.scrollable === true || o.scrollx === true)) {
                w.element.css("max-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
        }
--- a/dist/fineui.js.map
+++ b/dist/fineui.js.map
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui.min.js.map
+++ b/dist/fineui.min.js.map
--- a/dist/fineui.proxy.css
+++ b/dist/fineui.proxy.css
--- a/dist/fineui.proxy.js
+++ b/dist/fineui.proxy.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-7 09:10:33 */
+/*! time: 2021-4-7 21:20:22 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -15071,7 +15071,8 @@ BI.shortcut("bi.horizontal_auto", BI.HorizontalAutoLayout);
 /**
 * 浮动的水平居中布局
 */
-BI.FloatHorizontalLayout = BI.inherit(BI.Layout);
+BI.FloatHorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal_float", BI.FloatHorizontalLayout);


@ -15418,12 +15419,15 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -15683,12 +15687,15 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" || o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -15901,12 +15908,15 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -16068,12 +16078,15 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" && o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -17265,7 +17278,8 @@ BI.shortcut("bi.grid", BI.GridLayout);
 * @class BI.HorizontalLayout
 * @extends BI.Layout
 */
-BI.HorizontalLayout = BI.inherit(BI.Layout);
+BI.HorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal", BI.HorizontalLayout);


@ -17329,7 +17343,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
            if (o.columnSize[i] === "fill") {
                w.element.css("min-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
-            if (o.horizontalAlign === BI.HorizontalAlign.Stretch) {
+            if (o.horizontalAlign === BI.HorizontalAlign.Stretch || !(o.scrollable === true || o.scrollx === true)) {
                w.element.css("max-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
        }
--- a/dist/fineui.proxy.js.map
+++ b/dist/fineui.proxy.js.map
--- a/dist/fineui.proxy.min.css
+++ b/dist/fineui.proxy.min.css
--- a/dist/fineui.proxy.min.js
+++ b/dist/fineui.proxy.min.js
--- a/dist/fineui.proxy.min.js.map
+++ b/dist/fineui.proxy.min.js.map
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-7 09:10:33 */
+/*! time: 2021-4-7 21:20:22 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -14681,7 +14681,8 @@ BI.shortcut("bi.horizontal_auto", BI.HorizontalAutoLayout);
 /**
 * 浮动的水平居中布局
 */
-BI.FloatHorizontalLayout = BI.inherit(BI.Layout);
+BI.FloatHorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal_float", BI.FloatHorizontalLayout);


@ -15028,12 +15029,15 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -15293,12 +15297,15 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" || o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -15511,12 +15518,15 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.columnSize[i] !== "auto") {
-            if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.columnSize[i] === "fill" || o.columnSize[i] === "") {
+            if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) {
+                if (o.scrollable === true || o.scrollx === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.columnSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.columnSize[i] === "fill") {
@ -15678,12 +15688,15 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
        w.element.css({
            position: "relative"
        });
-        if (o.rowSize[i] !== "auto") {
-            if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" && o.rowSize[i] === ""))) {
-                w.element.addClass("f-s-n");
+        if (o.rowSize[i] === "fill" || o.rowSize[i] === "") {
+            if (o.verticalAlign !== BI.VerticalAlign.Stretch) {
+                if (o.scrollable === true || o.scrolly === true) {
+                    w.element.addClass("f-s-n");
+                }
            }
        }
        if (o.rowSize[i] > 0) {
+            w.element.addClass("f-s-n");
            w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)));
        }
        if (o.rowSize[i] === "fill") {
@ -16875,7 +16888,8 @@ BI.shortcut("bi.grid", BI.GridLayout);
 * @class BI.HorizontalLayout
 * @extends BI.Layout
 */
-BI.HorizontalLayout = BI.inherit(BI.Layout);
+BI.HorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal", BI.HorizontalLayout);


@ -16939,7 +16953,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
            if (o.columnSize[i] === "fill") {
                w.element.css("min-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
-            if (o.horizontalAlign === BI.HorizontalAlign.Stretch) {
+            if (o.horizontalAlign === BI.HorizontalAlign.Stretch || !(o.scrollable === true || o.scrollx === true)) {
                w.element.css("max-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
            }
        }
--- a/dist/fineui_without_jquery_polyfill.js.map
+++ b/dist/fineui_without_jquery_polyfill.js.map
--- a/dist/font.css
+++ b/dist/font.css
--- a/dist/resource.css
+++ b/dist/resource.css
--- a/dist/utils.js
+++ b/dist/utils.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-7 09:10:33 */
+/*! time: 2021-4-7 21:20:22 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20210407091204",
+  "version": "2.0.20210407212204",
  "description": "fineui",
  "main": "dist/fineui.min.js",
  "types": "dist/lib/index.d.ts",