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

优化布局

master
guy 4 years ago
parent
ce55d0e9cc
commit
31552ce4f5
1 changed files with 19 additions and 19 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. 38
      src/core/platform/web/config.js

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

@ -25,13 +25,13 @@ BI.prepares.push(function () {
// 在这种情况下，也可以通过flex支持该布局 // 在这种情况下，也可以通过flex支持该布局
if (supportFlex) { if (supportFlex) {
// IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况 // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) { // if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) {
return BI.extend({}, ob, { return BI.extend({}, ob, {
type: "bi.flex_horizontal", type: "bi.flex_horizontal",
horizontalAlign: !justOneItem && ob.horizontalAlign === BI.HorizontalAlign.Center horizontalAlign: !justOneItem && ob.horizontalAlign === BI.HorizontalAlign.Center
? BI.HorizontalAlign.Left : ob.horizontalAlign ? BI.HorizontalAlign.Left : ob.horizontalAlign
}); });
} // }
} }
return BI.extend({}, ob, {type: "bi.table_adapt"}); return BI.extend({}, ob, {type: "bi.table_adapt"});
} }
@ -57,9 +57,9 @@ BI.prepares.push(function () {
if (!isAdapt || justOneItem) { if (!isAdapt || justOneItem) {
if (supportFlex) { if (supportFlex) {
// IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况 // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
if (!isIE || (ob.scrollable !== true && ob.scrollx !== true && ob.scrolly !== true)) { // if (!isIE || (ob.scrollable !== true && ob.scrollx !== true && ob.scrolly !== true)) {
return BI.extend({}, ob, {type: "bi.flex_center_adapt"}); return BI.extend({}, ob, {type: "bi.flex_center_adapt"});
} // }
} }
return BI.extend({}, ob, {type: "bi.inline_center_adapt"}); return BI.extend({}, ob, {type: "bi.inline_center_adapt"});
} }
@ -71,9 +71,9 @@ BI.prepares.push(function () {
if (!isAdapt || justOneItem) { if (!isAdapt || justOneItem) {
if (supportFlex) { if (supportFlex) {
// IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况 // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) { // if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) {
return BI.extend({}, ob, {type: "bi.flex_vertical_adapt"}); return BI.extend({}, ob, {type: "bi.flex_vertical_adapt"});
} // }
} }
return BI.extend({}, ob, {type: "bi.inline_vertical_adapt"}); return BI.extend({}, ob, {type: "bi.inline_vertical_adapt"});
} }
@ -91,18 +91,18 @@ BI.prepares.push(function () {
BI.Plugin.configWidget("bi.horizontal_float", function (ob) { BI.Plugin.configWidget("bi.horizontal_float", function (ob) {
if (isSupportFlex()) { if (isSupportFlex()) {
// IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况 // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
if (!BI.isIE() || (ob.scrollable !== true && ob.scrollx !== true)) { // if (!BI.isIE() || (ob.scrollable !== true && ob.scrollx !== true)) {
return BI.extend({}, ob, {type: "bi.flex_horizontal_adapt"}); return BI.extend({}, ob, {type: "bi.flex_horizontal_adapt"});
} // }
} }
return BI.extend({}, ob, {type: "bi.inline_horizontal_adapt"}); return BI.extend({}, ob, {type: "bi.inline_horizontal_adapt"});
}); });
BI.Plugin.configWidget("bi.left_right_vertical_adapt", function (ob) { BI.Plugin.configWidget("bi.left_right_vertical_adapt", function (ob) {
if (isSupportFlex()) { if (isSupportFlex()) {
// IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况 // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
if (!BI.isIE() || (ob.scrollable !== true && ob.scrolly !== true)) { // if (!BI.isIE() || (ob.scrollable !== true && ob.scrolly !== true)) {
return BI.extend({}, ob, {type: "bi.flex_left_right_vertical_adapt"}); return BI.extend({}, ob, {type: "bi.flex_left_right_vertical_adapt"});
} // }
} }
return ob; return ob;
}); });

Write Preview
Loading…
Cancel
Save