Browse Source

Pull request #1997: 无JIRA任务 bugfix

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

* commit 'd199eec9f1f1cf0d86bd7c585b97c8160bf04147':
  bugfix
es6
guy 3 years ago
parent
commit
6c43b9b749
  1. 9
      src/core/wrapper/layout/adapt/adapt.table.js

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

@ -34,15 +34,10 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) { _addElement: function (i, item) {
var o = this.options; var o = this.options;
var td, width = ""; var td, width = "";
var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? null : item.width; var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
if (o.columnSize.length > 0) {
if (item.width >= 1 && o.columnSize[i] >= 1 && o.columnSize[i] !== item.width) {
columnSize = null;
}
}
if (columnSize > 0) { if (columnSize > 0) {
width = columnSize < 1 ? width = columnSize < 1 ?
((columnSize * 100).toFixed(1) + "%") ((columnSize * 100).toFixed(1) + "%")
: (columnSize + (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap); : (columnSize + (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap);
} }
if (!this.hasWidget(this._getChildName(i))) { if (!this.hasWidget(this._getChildName(i))) {

Loading…
Cancel
Save