Browse Source

Merge pull request #18563 in DEC/fineui from master to feature/x

* commit '171125f4cb642ab2efa54c9a41985e074adec7f6':
  feature: 布局
  feature: 布局
  feature: 布局
es6
superman 3 years ago
parent
commit
1c14ae457f
  1. 1
      src/core/wrapper/layout/flex/flex.horizontal.js
  2. 1
      src/core/wrapper/layout/flex/flex.vertical.js
  3. 1
      src/less/core/wrapper/flex.horizontal.less
  4. 1
      src/less/core/wrapper/flex.vertical.less
  5. 1
      src/less/core/wrapper/flex.wrapper.horizontal.less
  6. 1
      src/less/core/wrapper/flex.wrapper.vertical.less

1
src/core/wrapper/layout/flex/flex.horizontal.js

@ -81,7 +81,6 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
} }
if (columnSize === "fill") { if (columnSize === "fill") {
w.element.addClass("f-f"); w.element.addClass("f-f");
w.element.css({ minWidth: 0 });
} }
w.element.addClass("c-e"); w.element.addClass("c-e");
if (i === 0) { if (i === 0) {

1
src/core/wrapper/layout/flex/flex.vertical.js

@ -80,7 +80,6 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
} }
if (rowSize === "fill") { if (rowSize === "fill") {
w.element.addClass("f-f"); w.element.addClass("f-f");
w.element.css({ minHeight: 0 });
} }
w.element.addClass("c-e"); w.element.addClass("c-e");
if (i === 0) { if (i === 0) {

1
src/less/core/wrapper/flex.horizontal.less

@ -169,6 +169,7 @@
} }
> .f-f { > .f-f {
min-width: 0;
-webkit-flex-grow: 1; -webkit-flex-grow: 1;
-moz-flex-grow: 1; -moz-flex-grow: 1;
-ms-flex-grow: 1; -ms-flex-grow: 1;

1
src/less/core/wrapper/flex.vertical.less

@ -168,6 +168,7 @@
} }
> .f-f { > .f-f {
min-height: 0;
-webkit-flex-grow: 1; -webkit-flex-grow: 1;
-moz-flex-grow: 1; -moz-flex-grow: 1;
-ms-flex-grow: 1; -ms-flex-grow: 1;

1
src/less/core/wrapper/flex.wrapper.horizontal.less

@ -265,6 +265,7 @@
} }
> .f-f { > .f-f {
min-width: 0;
-webkit-flex-grow: 1; -webkit-flex-grow: 1;
-moz-flex-grow: 1; -moz-flex-grow: 1;
-ms-flex-grow: 1; -ms-flex-grow: 1;

1
src/less/core/wrapper/flex.wrapper.vertical.less

@ -259,6 +259,7 @@
} }
> .f-f { > .f-f {
min-height: 0;
-webkit-flex-grow: 1; -webkit-flex-grow: 1;
-moz-flex-grow: 1; -moz-flex-grow: 1;
-ms-flex-grow: 1; -ms-flex-grow: 1;

Loading…
Cancel
Save