Browse Source

Pull request #1465: 无JIRA任务 bugfix

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

* commit '25c8138f0c2760a5e1f1a2fdfa530cb24556b7c0':
  bugfix
es6
guy 4 years ago
parent
commit
349b7d4990
  1. 6
      src/core/platform/web/config.js
  2. 2
      src/core/wrapper/layout/adapt/adapt.table.js

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

@ -18,10 +18,10 @@ BI.prepares.push(function () {
if (isLessIE8) { if (isLessIE8) {
return ob; return ob;
} }
if (IE || !supportFlex || (ob.items && ob.items.length > 1)) { if (!IE && supportFlex) {
return BI.extend(ob, {type: "bi.table_adapt"}); return BI.extend(ob, {type: "bi.flex_horizontal"});
} }
return BI.extend(ob, {type: "bi.flex_horizontal"}); return BI.extend(ob, {type: "bi.table_adapt"});
}); });
BI.Plugin.configWidget("bi.center_adapt", function (ob) { BI.Plugin.configWidget("bi.center_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1); var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);

2
src/core/wrapper/layout/adapt/adapt.table.js

@ -6,7 +6,7 @@
BI.TableAdaptLayout = BI.inherit(BI.Layout, { BI.TableAdaptLayout = BI.inherit(BI.Layout, {
props: function () { props: function () {
return BI.extend(BI.TableAdaptLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.TableAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-table-center-adapt-layout", baseCls: "bi-table-adapt-layout",
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,

Loading…
Cancel
Save