diff --git a/dist/base.js b/dist/base.js index 16cc38d65b..8ab402101c 100644 --- a/dist/base.js +++ b/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 () { diff --git a/dist/bundle.js b/dist/bundle.js index dbacc10dfb..83c44716f3 100644 --- a/dist/bundle.js +++ b/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 () { diff --git a/dist/case.js b/dist/case.js index 126f393aa2..56c8d2909f 100644 --- a/dist/case.js +++ b/dist/case.js @@ -13300,6 +13300,7 @@ BI.DisplayTree = BI.inherit(BI.TreeView, { selectedMulti: false, dblClickExpand: false, showIcon: false, + nameIsHTML: true, showTitle: false }, data: { diff --git a/dist/fineui.js b/dist/fineui.js index 394525b72f..50ea5dfbbf 100644 --- a/dist/fineui.js +++ b/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 () { diff --git a/dist/widget.js b/dist/widget.js index d8d55c23dc..0957b66734 100644 --- a/dist/widget.js +++ b/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 () { diff --git a/src/base/pane.js b/src/base/pane.js index d540bf2e03..adfe3f9664 100644 --- a/src/base/pane.js +++ b/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 () { diff --git a/src/case/tree/tree.display.js b/src/case/tree/tree.display.js index 175d5c06bc..002ede97d2 100644 --- a/src/case/tree/tree.display.js +++ b/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: { diff --git a/src/widget/numbereditor/number.editor.js b/src/widget/numbereditor/number.editor.js index 121d4b84b4..d634edf471 100644 --- a/src/widget/numbereditor/number.editor.js +++ b/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({ diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js index efcafe6080..16a126e583 100644 --- a/src/widget/numberinterval/numberinterval.js +++ b/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 () {