Browse Source

Merge pull request #320 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '2f4a6680b5377688e0e07cd13a2fa287ccef3859':
  同步4.1
es6
windy 7 years ago
parent
commit
72db2057af
  1. 2
      dist/bundle.js
  2. 1
      dist/case.js
  3. 2
      dist/fineui.js
  4. 1
      dist/widget.js
  5. 1
      src/case/tree/tree.display.js
  6. 1
      src/widget/numbereditor/number.editor.js

2
dist/bundle.js vendored

@ -75716,6 +75716,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: {
@ -89376,6 +89377,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({

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: {

2
dist/fineui.js vendored

@ -77470,6 +77470,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: {
@ -91130,6 +91131,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({

1
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({

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({

Loading…
Cancel
Save