From b8a51b78b8b95c7e9d34936135928d6f54e0b649 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 7 Apr 2021 00:54:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=A4=A7=E4=B8=80?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/platform/web/config.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/platform/web/config.js b/src/core/platform/web/config.js index c515a983e..1c5a93fe7 100644 --- a/src/core/platform/web/config.js +++ b/src/core/platform/web/config.js @@ -23,7 +23,7 @@ BI.prepares.push(function () { if (ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch) { return BI.extend({}, ob, {type: "bi.table_adapt"}); } - if (!isIE && supportFlex) { + if (supportFlex) { return BI.extend({}, ob, {type: "bi.flex_horizontal"}); } // // 解决使用inline_vertical_adapt的顺序问题 @@ -37,10 +37,10 @@ BI.prepares.push(function () { return BI.extend({}, ob, {type: "bi.table_adapt"}); }); BI.Plugin.configWidget("bi.center_adapt", function (ob) { - var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1); + var supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1); var isAdapt = !ob.horizontalAlign || ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch; if (!isAdapt || justOneItem) { - if (!isIE && supportFlex) { + if (supportFlex) { return BI.extend({}, ob, {type: "bi.flex_center_adapt"}); } return BI.extend({}, ob, {type: "bi.inline_center_adapt"}); @@ -48,10 +48,10 @@ BI.prepares.push(function () { return ob; }); BI.Plugin.configWidget("bi.vertical_adapt", function (ob) { - var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1); + var supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1); var isAdapt = ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch; if (!isAdapt || justOneItem) { - if (!isIE && supportFlex) { + if (supportFlex) { return BI.extend({}, ob, {type: "bi.flex_vertical_center_adapt"}); } return BI.extend({}, ob, {type: "bi.inline_vertical_adapt"}); @@ -68,7 +68,7 @@ BI.prepares.push(function () { return ob; }); BI.Plugin.configWidget("bi.horizontal_float", function (ob) { - if (!BI.isIE() && isSupportFlex()) { + if (isSupportFlex()) { return BI.extend({}, ob, {type: "bi.flex_horizontal_adapt"}); } return BI.extend({}, ob, {type: "bi.inline_horizontal_adapt"}); From 33ebcd5e1e769e98ae4521c3b4eb2619a9784228 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 7 Apr 2021 01:14:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=A4=A7=E4=B8=80?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js | 2 +- .../layout/flex/wrapper/flex.wrapper.horizontal.center.js | 2 +- .../wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js index c02c4ad3a..ae7612780 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js @@ -8,7 +8,7 @@ BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-f-s-c clearfix", + baseCls: "bi-f-s-c", horizontalAlign: BI.HorizontalAlign.Center, verticalAlign: BI.VerticalAlign.Middle, columnSize: [], diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js index 7af0c413d..fc8ef31a8 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js @@ -8,7 +8,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { props: function () { return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), { - baseCls: "bi-f-s-v-c clearfix", + baseCls: "bi-f-s-v-c", horizontalAlign: BI.HorizontalAlign.Center, verticalAlign: BI.VerticalAlign.Top, rowSize: [], diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js index dc6ff2a1c..0a461c74c 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js @@ -8,7 +8,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { props: function () { return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), { - baseCls: "bi-f-s-v-c clearfix", + baseCls: "bi-f-s-v-c", horizontalAlign: BI.HorizontalAlign.Left, verticalAlign: BI.VerticalAlign.Middle, columnSize: [],