Browse Source

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

* commit '7cd5375e6e4c10505b423481c52b4b16bfb4b21c':
  pane中在beforeinit前后加入loading效果
  去setValue
  同步4.1
es6
guy 7 years ago
parent
commit
698f54ed2b
  1. 10
      dist/base.js
  2. 14
      dist/bundle.js
  3. 1
      dist/case.js
  4. 14
      dist/fineui.js
  5. 3
      dist/widget.js
  6. 10
      src/base/pane.js
  7. 1
      src/case/tree/tree.display.js
  8. 1
      src/widget/numbereditor/number.editor.js
  9. 2
      src/widget/numberinterval/numberinterval.js

10
dist/base.js vendored

@ -224,6 +224,16 @@ BI.Pane = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.Pane.superclass._init.apply(this, arguments); 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 () { _assertTip: function () {

14
dist/bundle.js vendored

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

1
dist/case.js vendored

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

14
dist/fineui.js vendored

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

3
dist/widget.js vendored

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

10
src/base/pane.js

@ -19,6 +19,16 @@ BI.Pane = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.Pane.superclass._init.apply(this, arguments); 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 () { _assertTip: function () {

1
src/case/tree/tree.display.js

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

1
src/widget/numbereditor/number.editor.js

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

2
src/widget/numberinterval/numberinterval.js

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

Loading…
Cancel
Save