Browse Source

Merge pull request #15977 in DEC/fineui from master to feature/x

* commit 'eb8612b8f3a91bff1755c9892c2051e62247ce9c':
  无JIRA 更新一下BI.broadcasts.remove 的写法. 因为on方法return了一个remove方法. 所以不能把fn作为predicate
  无JIRA 自动填充布局,flex fill 特性的补充
es6
superman 3 years ago
parent
commit
5daf331c07
  1. 4
      src/core/controller/controller.broadcast.js
  2. 1
      src/core/wrapper/layout/flex/flex.horizontal.js
  3. 1
      src/core/wrapper/layout/flex/flex.vertical.js

4
src/core/controller/controller.broadcast.js

@ -30,7 +30,9 @@ BI.BroadcastController = BI.inherit(BI.Controller, {
remove: function (name, fn) { remove: function (name, fn) {
var self = this; var self = this;
if (fn) { if (fn) {
BI.remove(this._broadcasts[name], fn); BI.remove(this._broadcasts[name], function (index, cb) {
return fn === cb;
});
if (this._broadcasts[name].length === 0) { if (this._broadcasts[name].length === 0) {
delete this._broadcasts[name]; delete this._broadcasts[name];
} }

1
src/core/wrapper/layout/flex/flex.horizontal.js

@ -81,6 +81,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
} }
if (columnSize === "fill") { if (columnSize === "fill") {
w.element.addClass("f-f"); w.element.addClass("f-f");
w.element.css({ minWidth: 0 });
} }
w.element.addClass("c-e"); w.element.addClass("c-e");
if (i === 0) { if (i === 0) {

1
src/core/wrapper/layout/flex/flex.vertical.js

@ -80,6 +80,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
} }
if (rowSize === "fill") { if (rowSize === "fill") {
w.element.addClass("f-f"); w.element.addClass("f-f");
w.element.css({ minHeight: 0 });
} }
w.element.addClass("c-e"); w.element.addClass("c-e");
if (i === 0) { if (i === 0) {

Loading…
Cancel
Save