caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Pull request #1767: 无JIAR任务 bugfix 

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'fad6851b71cc587afe32e96df75370d793fc6404':
  bugfix
  bugfix
es6
guy 4 years ago
parent
1cd661ae3b fad6851b71
commit
0ede3149dc
14 changed files with 80 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/core/wrapper/layout/flex/flex.center.js
  2. 3
      src/core/wrapper/layout/flex/flex.horizontal.center.js
  3. 6
      src/core/wrapper/layout/flex/flex.horizontal.js
  4. 3
      src/core/wrapper/layout/flex/flex.vertical.center.js
  5. 6
      src/core/wrapper/layout/flex/flex.vertical.js
  6. 2
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js
  7. 3
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js
  8. 6
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  9. 3
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js
  10. 6
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
  11. 15
      src/less/core/wrapper/flex.horizontal.less
  12. 15
      src/less/core/wrapper/flex.vertical.less
  13. 15
      src/less/core/wrapper/flex.wrapper.horizontal.less
  14. 15
      src/less/core/wrapper/flex.wrapper.vertical.less

2
src/core/wrapper/layout/flex/flex.center.js
Unescape View File

@ -28,6 +28,8 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
horizontalAlign: o.horizontalAlign,
verticalAlign: o.verticalAlign,
columnSize: o.columnSize,
rowSize: o.rowSize,
scrollx: o.scrollx,
scrolly: o.scrolly,
scrollable: o.scrollable,

3
src/core/wrapper/layout/flex/flex.horizontal.center.js
Unescape View File

@ -28,6 +28,7 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
},
horizontalAlign: BI.HorizontalAlign.Center,
verticalAlign: o.verticalAlign,
columnSize: o.columnSize,
rowSize: o.rowSize,
scrollx: o.scrollx,
scrolly: o.scrolly,
@ -53,4 +54,4 @@ BI.FlexHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_horizontal_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);
BI.shortcut("bi.flex_horizontal_center_adapt", BI.FlexHorizontalCenter);

6
src/core/wrapper/layout/flex/flex.horizontal.js
Unescape View File

@ -35,15 +35,13 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
position: "relative"
});
if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "auto") {
w.element.css({
"flex-shrink": "0"
});
w.element.addClass("shrink-none");
}
if (o.columnSize[i] > 0) {
w.element.width(o.columnSize[i] <= 1 ? (o.columnSize[i] * 100 + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit));
}
if (o.columnSize[i] === "fill") {
w.element.css("flex", "1");
w.element.addClass("fill");
}
if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
w.element.css({

3
src/core/wrapper/layout/flex/flex.vertical.center.js
Unescape View File

@ -30,6 +30,7 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
rowSize: o.rowSize,
scrollx: o.scrollx,
scrolly: o.scrolly,
scrollable: o.scrollable,
@ -54,4 +55,4 @@ BI.FlexVerticalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_vertical_adapt", BI.FlexVerticalCenter);
BI.shortcut("bi.flex_vertical_center_adapt", BI.FlexVerticalCenter);
BI.shortcut("bi.flex_vertical_center_adapt", BI.FlexVerticalCenter);

6
src/core/wrapper/layout/flex/flex.vertical.js
Unescape View File

@ -34,15 +34,13 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
position: "relative"
});
if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "auto") {
w.element.css({
"flex-shrink": "0"
});
w.element.addClass("shrink-none");
}
if (o.rowSize[i] > 0) {
w.element.height(o.rowSize[i] <= 1 ? (o.rowSize[i] * 100 + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit));
}
if (o.rowSize[i] === "fill") {
w.element.css("flex", "1");
w.element.addClass("fill");
}
if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
w.element.css({

2
src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js
Unescape View File

@ -31,6 +31,8 @@ BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
},
horizontalAlign: o.horizontalAlign,
verticalAlign: o.verticalAlign,
columnSize: o.columnSize,
rowSize: o.rowSize,
scrollx: o.scrollx,
scrolly: o.scrolly,
scrollable: o.scrollable,

3
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js
Unescape View File

@ -30,6 +30,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
},
horizontalAlign: BI.HorizontalAlign.Center,
verticalAlign: o.verticalAlign,
columnSize: o.columnSize,
rowSize: o.rowSize,
scrollx: o.scrollx,
scrolly: o.scrolly,
@ -51,4 +52,4 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);

6
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
Unescape View File

@ -36,15 +36,13 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
position: "relative"
});
if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "auto") {
w.element.css({
"flex-shrink": "0"
});
w.element.addClass("shrink-none");
}
if (o.columnSize[i] > 0) {
w.element.width(o.columnSize[i] <= 1 ? (o.columnSize[i] * 100 + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit));
}
if (o.columnSize[i] === "fill") {
w.element.css("flex", "1");
w.element.addClass("fill");
}
if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
w.element.css({

3
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js
Unescape View File

@ -31,6 +31,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: o.horizontalAlign,
columnSize: o.columnSize,
rowSize: o.rowSize,
scrollx: o.scrollx,
scrolly: o.scrolly,
scrollable: o.scrollable,
@ -51,4 +52,4 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
}
});
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);

6
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
Unescape View File

@ -36,15 +36,13 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
position: "relative"
});
if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "auto") {
w.element.css({
"flex-shrink": "0"
});
w.element.addClass("shrink-none");
}
if (o.rowSize[i] > 0) {
w.element.height(o.rowSize[i] <= 1 ? (o.rowSize[i] * 100 + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit));
}
if (o.rowSize[i] === "fill") {
w.element.css("flex", "1");
w.element.addClass("fill");
}
if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
w.element.css({

15
src/less/core/wrapper/flex.horizontal.less
Unescape View File

@ -156,4 +156,19 @@
justify-content: flex-end;
}
}
> .shrink-none {
-webkit-flex-shrink: 0;
-moz-flex-shrink: 0;
-ms-flex-shrink: 0;
flex-shrink: 0;
}
> .fill {
-webkit-box-flex: 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
}
}

15
src/less/core/wrapper/flex.vertical.less
Unescape View File

@ -155,4 +155,19 @@
justify-content: flex-end;
}
}
> .shrink-none {
-webkit-flex-shrink: 0;
-moz-flex-shrink: 0;
-ms-flex-shrink: 0;
flex-shrink: 0;
}
> .fill {
-webkit-box-flex: 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
}
}

15
src/less/core/wrapper/flex.wrapper.horizontal.less
Unescape View File

@ -163,5 +163,20 @@
justify-content: flex-end;
}
}
> .shrink-none {
-webkit-flex-shrink: 0;
-moz-flex-shrink: 0;
-ms-flex-shrink: 0;
flex-shrink: 0;
}
> .fill {
-webkit-box-flex: 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
}
}
}

15
src/less/core/wrapper/flex.wrapper.vertical.less
Unescape View File

@ -163,5 +163,20 @@
justify-content: flex-end;
}
}
> .shrink-none {
-webkit-flex-shrink: 0;
-moz-flex-shrink: 0;
-ms-flex-shrink: 0;
flex-shrink: 0;
}
> .fill {
-webkit-box-flex: 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
}
}
}

Write Preview
Loading…
Cancel
Save