Merge pull request #239 in FUI/fineui from ~GUY/fineui:master to master

* commit '7cd5375e6e4c10505b423481c52b4b16bfb4b21c':
  pane中在beforeinit前后加入loading效果
  去setValue
  同步4.1

dist/base.js

@@ -224,6 +224,16 @@ BI.Pane = BI.inherit(BI.Widget, {
 
     _init: function () {
         BI.Pane.superclass._init.apply(this, arguments);
+        if (this.beforeInit) {
+            this.loading();
+        }
+    },
+
+    _render: function () {
+        BI.Pane.superclass._render.apply(this, arguments);
+        if (this.beforeInit) {
+            this.loaded();
+        }
     },
 
     _assertTip: function () {

dist/bundle.js

@@ -26258,6 +26258,16 @@ BI.Pane = BI.inherit(BI.Widget, {
 
     _init: function () {
         BI.Pane.superclass._init.apply(this, arguments);
+        if (this.beforeInit) {
+            this.loading();
+        }
+    },
+
+    _render: function () {
+        BI.Pane.superclass._render.apply(this, arguments);
+        if (this.beforeInit) {
+            this.loaded();
+        }
     },
 
     _assertTip: function () {
@@ -75756,6 +75766,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
                 selectedMulti: false,
                 dblClickExpand: false,
                 showIcon: false,
+                nameIsHTML: true,
                 showTitle: false
             },
             data: {
@@ -89416,6 +89427,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
         });
         this.editor.on(BI.TextEditor.EVENT_CONFIRM, function () {
+            this.setValue(BI.parseFloat(this.getValue()));
             self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
         });
         this.topBtn = BI.createWidget({
@@ -89726,8 +89738,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
-        
-        this.setValue(o.value);
     },
 
     _checkValidation: function () {

dist/case.js

@@ -13300,6 +13300,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
                 selectedMulti: false,
                 dblClickExpand: false,
                 showIcon: false,
+                nameIsHTML: true,
                 showTitle: false
             },
             data: {

dist/fineui.js

@@ -28012,6 +28012,16 @@ BI.Pane = BI.inherit(BI.Widget, {
 
     _init: function () {
         BI.Pane.superclass._init.apply(this, arguments);
+        if (this.beforeInit) {
+            this.loading();
+        }
+    },
+
+    _render: function () {
+        BI.Pane.superclass._render.apply(this, arguments);
+        if (this.beforeInit) {
+            this.loaded();
+        }
     },
 
     _assertTip: function () {
@@ -77510,6 +77520,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
                 selectedMulti: false,
                 dblClickExpand: false,
                 showIcon: false,
+                nameIsHTML: true,
                 showTitle: false
             },
             data: {
@@ -91170,6 +91181,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
         });
         this.editor.on(BI.TextEditor.EVENT_CONFIRM, function () {
+            this.setValue(BI.parseFloat(this.getValue()));
             self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
         });
         this.topBtn = BI.createWidget({
@@ -91480,8 +91492,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
-        
-        this.setValue(o.value);
     },
 
     _checkValidation: function () {

dist/widget.js

@@ -12865,6 +12865,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
         });
         this.editor.on(BI.TextEditor.EVENT_CONFIRM, function () {
+            this.setValue(BI.parseFloat(this.getValue()));
             self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
         });
         this.topBtn = BI.createWidget({
@@ -13175,8 +13176,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
-        
-        this.setValue(o.value);
     },
 
     _checkValidation: function () {

src/base/pane.js

@@ -19,6 +19,16 @@ BI.Pane = BI.inherit(BI.Widget, {
 
     _init: function () {
         BI.Pane.superclass._init.apply(this, arguments);
+        if (this.beforeInit) {
+            this.loading();
+        }
+    },
+
+    _render: function () {
+        BI.Pane.superclass._render.apply(this, arguments);
+        if (this.beforeInit) {
+            this.loaded();
+        }
     },
 
     _assertTip: function () {

src/case/tree/tree.display.js

@@ -21,6 +21,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, {
                 selectedMulti: false,
                 dblClickExpand: false,
                 showIcon: false,
+                nameIsHTML: true,
                 showTitle: false
             },
             data: {

src/widget/numbereditor/number.editor.js

@@ -35,6 +35,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.NumberEditor.EVENT_CHANGE);
         });
         this.editor.on(BI.TextEditor.EVENT_CONFIRM, function () {
+            this.setValue(BI.parseFloat(this.getValue()));
             self.fireEvent(BI.NumberEditor.EVENT_CONFIRM);
         });
         this.topBtn = BI.createWidget({

src/widget/numberinterval/numberinterval.js

@@ -236,8 +236,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         self._setComboValueChangedEvent(self.smallCombo);
         self._setEditorValueChangedEvent(self.bigEditor);
         self._setEditorValueChangedEvent(self.smallEditor);
-        
-        this.setValue(o.value);
     },
 
     _checkValidation: function () {