Browse Source

Pull request #2323: 无JIRA任务 update

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

* commit 'fa271d8a45bc2c44e21830890f32b09dd6da23c9':
  update
es6
guy 3 years ago
parent
commit
cca23b4c31
  1. 4
      src/core/platform/web/config.js

4
src/core/platform/web/config.js

@ -162,7 +162,7 @@ BI.prepares.push(function () {
}); });
BI.Plugin.configWidget("bi.flex_horizontal", function (ob) { BI.Plugin.configWidget("bi.flex_horizontal", function (ob) {
if (ob.scrollable === true || ob.scrollx !== false) { if (ob.scrollable === true || ob.scrollx !== false) {
if (ob.hgap > 0 || ob.rgap > 0) {// flex中最后一个margin-right不生效 if (ob.hgap > 0 || ob.lgap > 0 || ob.rgap > 0) {
if (BI.Providers.getProvider("bi.provider.system").getResponsiveMode()) { if (BI.Providers.getProvider("bi.provider.system").getResponsiveMode()) {
return BI.extend({}, ob, {type: "bi.responsive_flex_scrollable_horizontal"}); return BI.extend({}, ob, {type: "bi.responsive_flex_scrollable_horizontal"});
} }
@ -175,7 +175,7 @@ BI.prepares.push(function () {
}); });
BI.Plugin.configWidget("bi.flex_vertical", function (ob) { BI.Plugin.configWidget("bi.flex_vertical", function (ob) {
if (ob.scrollable === true || ob.scrollx === true) { if (ob.scrollable === true || ob.scrollx === true) {
if (ob.hgap > 0 || ob.rgap > 0) {// flex中最后一个margin-right不生效 if (ob.hgap > 0 || ob.lgap > 0 || ob.rgap > 0) {
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"}); return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical"});
} }
} }

Loading…
Cancel
Save