Browse Source

Pull request #1959: 无JIRA任务 bugfix

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

* commit '4313854b24ae1fb1a53917c18eb5f9eb44d89f8f':
  bugfix
  bugfix
es6
guy 4 years ago
parent
commit
8a6ecb875a
  1. 45
      src/base/1.pane.js

45
src/base/1.pane.js

@ -20,18 +20,20 @@ BI.Pane = BI.inherit(BI.Widget, {
}, },
_assertTip: function () { _assertTip: function () {
var o = this.options; var self = this, o = this.options;
if (!this._tipText) { if (!this._tipText) {
this._tipText = BI.createWidget({
type: "bi.label",
cls: "bi-tips",
text: o.tipText,
height: 25
});
BI.createWidget({ BI.createWidget({
type: "bi.absolute_center_adapt", type: "bi.absolute_center_adapt",
element: this, element: this,
items: [this._tipText] items: [{
type: "bi.label",
ref: function (_ref) {
self._tipText = _ref;
},
cls: "bi-tips",
text: o.tipText,
height: 25
}]
}); });
} }
}, },
@ -50,17 +52,17 @@ BI.Pane = BI.inherit(BI.Widget, {
type: "bi.layout", type: "bi.layout",
cls: "animate-rect rect1", cls: "animate-rect rect1",
height: this._getSize(50), height: this._getSize(50),
width: this._getSize(5), width: this._getSize(5)
}, { }, {
type: "bi.layout", type: "bi.layout",
cls: "animate-rect rect2", cls: "animate-rect rect2",
height: this._getSize(50), height: this._getSize(50),
width: this._getSize(5), width: this._getSize(5)
}, { }, {
type: "bi.layout", type: "bi.layout",
cls: "animate-rect rect3", cls: "animate-rect rect3",
height: this._getSize(50), height: this._getSize(50),
width: this._getSize(5), width: this._getSize(5)
}] }]
}); });
// pane在同步方式下由items决定tipText的显示与否 // pane在同步方式下由items决定tipText的显示与否
@ -77,25 +79,24 @@ BI.Pane = BI.inherit(BI.Widget, {
} }
BI.Layers.show(self.getName()); BI.Layers.show(self.getName());
} else if (BI.isNull(this._loading)) { } else if (BI.isNull(this._loading)) {
this._loading = loadingAnimation; loadingAnimation.element.css("zIndex", 1);
this._loading.element.css("zIndex", 1);
BI.createWidget({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
element: this, element: this,
cls: "loading-container", cls: "loading-container",
items: this._getLoadingTipItems(this._loading) items: this._getLoadingTipItems(loadingAnimation)
}); });
} }
self.fireEvent(BI.Pane.EVENT_LOADING); self.fireEvent(BI.Pane.EVENT_LOADING);
this.element.addClass("loading-status"); this.element.addClass("loading-status");
}, },
_getSize: function(v) { _getSize: function (v) {
return Math.ceil(v / (this.options.loadingSize === 'small' ? 2 : 1)); return Math.ceil(v / (this.options.loadingSize === "small" ? 2 : 1));
}, },
_getLoadingTipItems: function (loadingTip) { _getLoadingTipItems: function (loadingTip) {
var o = this.options; var self = this, o = this.options;
var loadingTipItems = [{ var loadingTipItems = [{
type: "bi.horizontal_adapt", type: "bi.horizontal_adapt",
items: [loadingTip] items: [loadingTip]
@ -103,11 +104,14 @@ BI.Pane = BI.inherit(BI.Widget, {
BI.isNotEmptyString(o.loadingText) && loadingTipItems.push({ BI.isNotEmptyString(o.loadingText) && loadingTipItems.push({
type: "bi.text", type: "bi.text",
text: o.loadingText, text: o.loadingText,
tgap: this._getSize(10), tgap: this._getSize(10)
}); });
return [{ return [{
type: "bi.vertical", type: "bi.vertical",
ref: function (_ref) {
self._loading = _ref;
},
items: loadingTipItems items: loadingTipItems
}]; }];
}, },
@ -116,7 +120,6 @@ BI.Pane = BI.inherit(BI.Widget, {
var self = this, o = this.options; var self = this, o = this.options;
BI.Layers.remove(self.getName()); BI.Layers.remove(self.getName());
this._loading && this._loading.destroy(); this._loading && this._loading.destroy();
this._loading && (this._loading = null);
o.onLoaded(); o.onLoaded();
self.fireEvent(BI.Pane.EVENT_LOADED); self.fireEvent(BI.Pane.EVENT_LOADED);
this.element.removeClass("loading-status"); this.element.removeClass("loading-status");
@ -138,10 +141,6 @@ BI.Pane = BI.inherit(BI.Widget, {
populate: function (items) { populate: function (items) {
this.options.items = items || []; this.options.items = items || [];
this.check(); this.check();
},
empty: function () {
} }
}); });
BI.Pane.EVENT_LOADED = "EVENT_LOADED"; BI.Pane.EVENT_LOADED = "EVENT_LOADED";

Loading…
Cancel
Save