Browse Source

Pull request #2211: DEC-20873 fix: BI.Pane loading中创建的Layer的name加个后缀

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

* commit '7e2bb11fb5734a1d4e3fd25503dcee2b6505a574':
  DEC-20873 fix: BI.Pane loading中创建的Layer的name加个后缀
es6
Dailer 3 years ago
parent
commit
a035146182
  1. 8
      src/base/1.pane.js

8
src/base/1.pane.js

@ -69,15 +69,15 @@ BI.Pane = BI.inherit(BI.Widget, {
// loading的异步情况下由loaded后对面板的populate的时机决定 // loading的异步情况下由loaded后对面板的populate的时机决定
this.setTipVisible(false); this.setTipVisible(false);
if (o.overlap === true) { if (o.overlap === true) {
if (!BI.Layers.has(this.getName())) { if (!BI.Layers.has(this.getName() + "-loading")) {
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
cls: "loading-container", cls: "loading-container",
items: this._getLoadingTipItems(loadingAnimation), items: this._getLoadingTipItems(loadingAnimation),
element: BI.Layers.make(this.getName(), this) element: BI.Layers.make(this.getName() + "-loading", this)
}); });
} }
BI.Layers.show(self.getName()); BI.Layers.show(self.getName() + "-loading");
} else if (BI.isNull(this._loading)) { } else if (BI.isNull(this._loading)) {
loadingAnimation.element.css("zIndex", 1); loadingAnimation.element.css("zIndex", 1);
BI.createWidget({ BI.createWidget({
@ -118,7 +118,7 @@ BI.Pane = BI.inherit(BI.Widget, {
loaded: function () { loaded: function () {
var self = this, o = this.options; var self = this, o = this.options;
BI.Layers.remove(self.getName()); BI.Layers.remove(self.getName() + "-loading");
this._loading && this._loading.destroy(); this._loading && this._loading.destroy();
o.onLoaded(); o.onLoaded();
self.fireEvent(BI.Pane.EVENT_LOADED); self.fireEvent(BI.Pane.EVENT_LOADED);

Loading…
Cancel
Save