Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.min.js
#	dist/demo.js
#	dist/fineui.min.js
es6
windy 7 years ago
parent
commit
19002eec6c
  1. 3
      dist/bundle.js
  2. 3
      dist/widget.js
  3. 3
      src/widget/previewtable/previewtable.js

3
dist/bundle.js vendored

@ -101036,12 +101036,12 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
}) })
}); });
this.table.on(BI.Table.EVENT_TABLE_AFTER_INIT, function () { this.table.on(BI.Table.EVENT_TABLE_AFTER_INIT, function () {
self._adjustColumns();
self.fireEvent(BI.Table.EVENT_TABLE_AFTER_INIT, arguments); self.fireEvent(BI.Table.EVENT_TABLE_AFTER_INIT, arguments);
}); });
this.table.on(BI.Table.EVENT_TABLE_RESIZE, function () { this.table.on(BI.Table.EVENT_TABLE_RESIZE, function () {
self._adjustColumns(); self._adjustColumns();
}); });
this._adjustColumns();
}, },
// 是否有自适应调节的列,即列宽为"" // 是否有自适应调节的列,即列宽为""
@ -101180,6 +101180,7 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
populate: function (items, header) { populate: function (items, header) {
this.table.populate(items, header); this.table.populate(items, header);
this._adjustColumns();
} }
}); });
BI.PreviewTable.EVENT_CHANGE = "PreviewTable.EVENT_CHANGE"; BI.PreviewTable.EVENT_CHANGE = "PreviewTable.EVENT_CHANGE";

3
dist/widget.js vendored

@ -14526,12 +14526,12 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
}) })
}); });
this.table.on(BI.Table.EVENT_TABLE_AFTER_INIT, function () { this.table.on(BI.Table.EVENT_TABLE_AFTER_INIT, function () {
self._adjustColumns();
self.fireEvent(BI.Table.EVENT_TABLE_AFTER_INIT, arguments); self.fireEvent(BI.Table.EVENT_TABLE_AFTER_INIT, arguments);
}); });
this.table.on(BI.Table.EVENT_TABLE_RESIZE, function () { this.table.on(BI.Table.EVENT_TABLE_RESIZE, function () {
self._adjustColumns(); self._adjustColumns();
}); });
this._adjustColumns();
}, },
// 是否有自适应调节的列,即列宽为"" // 是否有自适应调节的列,即列宽为""
@ -14670,6 +14670,7 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
populate: function (items, header) { populate: function (items, header) {
this.table.populate(items, header); this.table.populate(items, header);
this._adjustColumns();
} }
}); });
BI.PreviewTable.EVENT_CHANGE = "PreviewTable.EVENT_CHANGE"; BI.PreviewTable.EVENT_CHANGE = "PreviewTable.EVENT_CHANGE";

3
src/widget/previewtable/previewtable.js

@ -54,12 +54,12 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
}) })
}); });
this.table.on(BI.Table.EVENT_TABLE_AFTER_INIT, function () { this.table.on(BI.Table.EVENT_TABLE_AFTER_INIT, function () {
self._adjustColumns();
self.fireEvent(BI.Table.EVENT_TABLE_AFTER_INIT, arguments); self.fireEvent(BI.Table.EVENT_TABLE_AFTER_INIT, arguments);
}); });
this.table.on(BI.Table.EVENT_TABLE_RESIZE, function () { this.table.on(BI.Table.EVENT_TABLE_RESIZE, function () {
self._adjustColumns(); self._adjustColumns();
}); });
this._adjustColumns();
}, },
// 是否有自适应调节的列,即列宽为"" // 是否有自适应调节的列,即列宽为""
@ -198,6 +198,7 @@ BI.PreviewTable = BI.inherit(BI.Widget, {
populate: function (items, header) { populate: function (items, header) {
this.table.populate(items, header); this.table.populate(items, header);
this._adjustColumns();
} }
}); });
BI.PreviewTable.EVENT_CHANGE = "PreviewTable.EVENT_CHANGE"; BI.PreviewTable.EVENT_CHANGE = "PreviewTable.EVENT_CHANGE";

Loading…
Cancel
Save