Pull request #1959: 无JIRA任务 bugfix

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

* commit '4313854b24ae1fb1a53917c18eb5f9eb44d89f8f':
  bugfix
  bugfix

src/base/1.pane.js

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