Browse Source

Merge pull request #126353 in DEC/fineui from release/11.0 to bugfix/11.0

* commit '9cf8350a7639e40b0412687415e2c66b70fe3e6c':
  BI-110891 fix:同步fineui
  无JIRA任务 同步
research/test
superman 2 years ago
parent
commit
bb480495b6
  1. 4
      src/base/1.pane.js
  2. 2
      src/widget/downlist/item.downlistgroup.js

4
src/base/1.pane.js

@ -40,10 +40,10 @@ BI.Pane = BI.inherit(BI.Widget, {
loading: function () { loading: function () {
var self = this, o = this.options; var self = this, o = this.options;
var loadingAnimation = BI.Providers.getProvider("bi.provider.system").getLoading({ var loadingAnimation = BI.createWidget(BI.Providers.getProvider("bi.provider.system").getLoading({
loadingSize: o.loadingSize, loadingSize: o.loadingSize,
context: this context: this
}); }));
// pane在同步方式下由items决定tipText的显示与否 // pane在同步方式下由items决定tipText的显示与否
// loading的异步情况下由loaded后对面板的populate的时机决定 // loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false); this.setTipVisible(false);

2
src/widget/downlist/item.downlistgroup.js

@ -29,6 +29,8 @@ BI.DownListGroupItem = BI.inherit(BI.BasicButton, {
cls: o.iconCls1, cls: o.iconCls1,
width: 36, width: 36,
height: o.height, height: o.height,
iconHeight: o.iconHeight,
iconWidth: 36,
disableSelected: true, disableSelected: true,
selected: this._digest(o.value) selected: this._digest(o.value)
}); });

Loading…
Cancel
Save