Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

update

master
guy 4 years ago
parent
4774ade27d
commit
9b7224ca2e
10 changed files with 52 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/core/platform/web/config.js
  2. 4
      src/core/wrapper/layout/adapt/adapt.leftrightvertical.js
  3. 4
      src/core/wrapper/layout/flex/flex.horizontal.js
  4. 4
      src/core/wrapper/layout/flex/flex.vertical.js
  5. 4
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  6. 4
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
  7. 15
      src/less/core/wrapper/flex.horizontal.less
  8. 15
      src/less/core/wrapper/flex.vertical.less
  9. 13
      src/less/core/wrapper/flex.wrapper.horizontal.less
  10. 13
      src/less/core/wrapper/flex.wrapper.vertical.less

22
src/core/platform/web/config.js
Unescape View File

@ -26,14 +26,14 @@ BI.prepares.push(function () {
if (!isIE && supportFlex) { if (!isIE && supportFlex) {
return BI.extend({}, ob, {type: "bi.flex_horizontal"}); return BI.extend({}, ob, {type: "bi.flex_horizontal"});
} }
// 解决使用inline_vertical_adapt的顺序问题 // // 解决使用inline_vertical_adapt的顺序问题
// 从右往左放置时，为了兼容，我们统一采用从右到左的放置方式 // // 从右往左放置时，为了兼容，我们统一采用从右到左的放置方式
if (ob.horizontalAlign === BI.HorizontalAlign.Right) { // if (ob.horizontalAlign === BI.HorizontalAlign.Right) {
return BI.extend({verticalAlign: BI.VerticalAlign.Top}, ob, { // return BI.extend({verticalAlign: BI.VerticalAlign.Top}, ob, {
type: "bi.inline_vertical_adapt", // type: "bi.inline_vertical_adapt",
items: ob.items && ob.items.reverse() // items: ob.items && ob.items.reverse()
}); // });
} // }
return BI.extend({}, ob, {type: "bi.table_adapt"}); return BI.extend({}, ob, {type: "bi.table_adapt"});
}); });
BI.Plugin.configWidget("bi.center_adapt", function (ob) { BI.Plugin.configWidget("bi.center_adapt", function (ob) {
@ -43,9 +43,6 @@ BI.prepares.push(function () {
if (!isIE && supportFlex) { if (!isIE && supportFlex) {
return BI.extend({}, ob, {type: "bi.flex_center_adapt"}); return BI.extend({}, ob, {type: "bi.flex_center_adapt"});
} }
if (ob.horizontalAlign === BI.HorizontalAlign.Right) {
return BI.extend({}, ob, {type: "bi.inline_center_adapt", items: ob.items && ob.items.reverse()});
}
return BI.extend({}, ob, {type: "bi.inline_center_adapt"}); return BI.extend({}, ob, {type: "bi.inline_center_adapt"});
} }
return ob; return ob;
@ -57,9 +54,6 @@ BI.prepares.push(function () {
if (!isIE && supportFlex) { if (!isIE && supportFlex) {
return BI.extend({}, ob, {type: "bi.flex_vertical_center_adapt"}); return BI.extend({}, ob, {type: "bi.flex_vertical_center_adapt"});
} }
if (ob.horizontalAlign === BI.HorizontalAlign.Right) {
return BI.extend({}, ob, {type: "bi.inline_vertical_adapt", items: ob.items && ob.items.reverse()});
}
return BI.extend({}, ob, {type: "bi.inline_vertical_adapt"}); return BI.extend({}, ob, {type: "bi.inline_vertical_adapt"});
} }
return ob; return ob;

4
src/core/wrapper/layout/adapt/adapt.leftrightvertical.js
Unescape View File

@ -163,7 +163,7 @@ BI.RightVerticalAdaptLayout = BI.inherit(BI.Layout, {
self.layout = _ref; self.layout = _ref;
}, },
horizontalAlign: BI.HorizontalAlign.Right, horizontalAlign: BI.HorizontalAlign.Right,
items: o.items.reverse(), items: o.items,
hgap: o.hgap, hgap: o.hgap,
lgap: o.lgap, lgap: o.lgap,
rgap: o.rgap, rgap: o.rgap,
@ -186,7 +186,7 @@ BI.RightVerticalAdaptLayout = BI.inherit(BI.Layout, {
}, },
populate: function (items) { populate: function (items) {
this.layout.populate(items.reverse()); this.layout.populate(items);
} }
}); });
BI.shortcut("bi.right_vertical_adapt", BI.RightVerticalAdaptLayout); BI.shortcut("bi.right_vertical_adapt", BI.RightVerticalAdaptLayout);

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

@ -54,12 +54,12 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
} }
if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) { if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
w.element.css({ w.element.css({
"margin-left": ((o.horizontalAlign === BI.HorizontalAlign.Right ? o.hgap : (i === 0 ? o.hgap : 0)) + o.lgap + (item.lgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit "margin-left": ((i === 0 ? o.hgap : 0) + o.lgap + (item.lgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit
}); });
} }
if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) { if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
w.element.css({ w.element.css({
"margin-right": ((o.horizontalAlign === BI.HorizontalAlign.Right ? (i === 0 ? o.hgap : 0) : o.hgap) + o.rgap + (item.rgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit "margin-right": (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit
}); });
} }
if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) { if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {

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

@ -48,7 +48,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
} }
if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) { if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
w.element.css({ w.element.css({
"margin-top": ((o.verticalAlign === BI.VerticalAlign.Bottom ? o.vgap : (i === 0 ? o.vgap : 0)) + o.tgap + (item.tgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit "margin-top": ((i === 0 ? o.vgap : 0) + o.tgap + (item.tgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
}); });
} }
if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) { if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
@ -63,7 +63,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
} }
if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) { if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
w.element.css({ w.element.css({
"margin-bottom": ((o.verticalAlign === BI.VerticalAlign.Bottom ? (i === 0 ? o.vgap : 0) : o.vgap) + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit "margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
}); });
} }
return w; return w;

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

@ -55,12 +55,12 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
} }
if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) { if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
w.element.css({ w.element.css({
"margin-left": ((o.horizontalAlign === BI.HorizontalAlign.Right ? o.hgap : (i === 0 ? o.hgap : 0)) + o.lgap + (item.lgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit "margin-left": ((i === 0 ? o.hgap : 0) + o.lgap + (item.lgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit
}); });
} }
if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) { if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
w.element.css({ w.element.css({
"margin-right": ((o.horizontalAlign === BI.HorizontalAlign.Right ? (i === 0 ? o.hgap : 0) : o.hgap) + o.rgap + (item.rgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit "margin-right": (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0)) / BI.pixRatio + BI.pixUnit
}); });
} }
if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) { if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {

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

@ -50,7 +50,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
} }
if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) { if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
w.element.css({ w.element.css({
"margin-top": ((o.verticalAlign === BI.VerticalAlign.Bottom ? o.vgap : (i === 0 ? o.vgap : 0)) + o.tgap + (item.tgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit "margin-top": ((i === 0 ? o.vgap : 0) + o.tgap + (item.tgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
}); });
} }
if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) { if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
@ -65,7 +65,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
} }
if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) { if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
w.element.css({ w.element.css({
"margin-bottom": ((o.verticalAlign === BI.VerticalAlign.Bottom ? (i === 0 ? o.vgap : 0) : o.vgap) + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit "margin-bottom": (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0)) / BI.pixRatio + BI.pixUnit
}); });
} }
return w; return w;

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

@ -105,18 +105,21 @@
-webkit-justify-content: center; -webkit-justify-content: center;
-moz-justify-content: center; -moz-justify-content: center;
-ms-justify-content: center; -ms-justify-content: center;
-o-justify-content: center;
-ms-flex-pack: center; -ms-flex-pack: center;
-o-justify-content: center;
justify-content: center; justify-content: center;
} }
&.h-right { &.h-right {
/* 09版 */
-webkit-box-pack: flex-end;
/* 12版 */ /* 12版 */
-webkit-flex-direction: row-reverse; -webkit-justify-content: flex-end;
-moz-flex-direction: row-reverse; -moz-justify-content: flex-end;
-ms-flex-direction: row-reverse; -ms-justify-content: flex-end;
-o-flex-direction: row-reverse; -ms-flex-pack: end;
flex-direction: row-reverse; -o-justify-content: flex-end;
justify-content: flex-end;
} }
> .shrink-none { > .shrink-none {

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

@ -104,18 +104,21 @@
-webkit-justify-content: center; -webkit-justify-content: center;
-moz-justify-content: center; -moz-justify-content: center;
-ms-justify-content: center; -ms-justify-content: center;
-o-justify-content: center;
-ms-flex-pack: center; -ms-flex-pack: center;
-o-justify-content: center;
justify-content: center; justify-content: center;
} }
&.v-bottom { &.v-bottom {
/* 09版 */
-webkit-box-pack: flex-end;
/* 12版 */ /* 12版 */
-webkit-flex-direction: column-reverse; -webkit-justify-content: flex-end;
-moz-flex-direction: column-reverse; -moz-justify-content: flex-end;
-ms-flex-direction: column-reverse; -ms-justify-content: flex-end;
-o-flex-direction: column-reverse; -ms-flex-pack: end;
flex-direction: column-reverse; -o-justify-content: flex-end;
justify-content: flex-end;
} }
> .shrink-none { > .shrink-none {

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

@ -118,12 +118,15 @@
} }
&.h-right { &.h-right {
/* 09版 */
-webkit-box-pack: flex-end;
/* 12版 */ /* 12版 */
-webkit-flex-direction: row-reverse; -webkit-justify-content: flex-end;
-moz-flex-direction: row-reverse; -moz-justify-content: flex-end;
-ms-flex-direction: row-reverse; -ms-justify-content: flex-end;
-o-flex-direction: row-reverse; -ms-flex-pack: end;
flex-direction: row-reverse; -o-justify-content: flex-end;
justify-content: flex-end;
} }
> .shrink-none { > .shrink-none {

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

@ -118,12 +118,15 @@
} }
&.v-bottom { &.v-bottom {
/* 09版 */
-webkit-box-pack: flex-end;
/* 12版 */ /* 12版 */
-webkit-flex-direction: column-reverse; -webkit-justify-content: flex-end;
-moz-flex-direction: column-reverse; -moz-justify-content: flex-end;
-ms-flex-direction: column-reverse; -ms-justify-content: flex-end;
-o-flex-direction: column-reverse; -ms-flex-pack: end;
flex-direction: column-reverse; -o-justify-content: flex-end;
justify-content: flex-end;
} }
> .shrink-none { > .shrink-none {

Write Preview
Loading…
Cancel
Save