Browse Source

Merge pull request #717 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '00219bf518a43f0497a3bac911eeb9c45bde67d7':
  update
  BI-33222 改BI-27490导致的问题
  update
es6
windy 6 years ago
parent
commit
ba459f3e60
  1. 4
      dist/bundle.ie.js
  2. 6
      dist/bundle.ie.min.js
  3. 4
      dist/bundle.js
  4. 6
      dist/bundle.min.js
  5. 25
      dist/demo.js
  6. 4
      dist/fineui.ie.js
  7. 6
      dist/fineui.ie.min.js
  8. 4
      dist/fineui.js
  9. 6
      dist/fineui.min.js
  10. 4
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 4
      dist/widget.js
  13. 2
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  14. 2
      src/widget/numbereditor/number.editor.js

4
dist/bundle.ie.js vendored

@ -62576,7 +62576,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) { _autoSwitch: function (v, type) {
var limit = 0; var limit = 0;
var value = v; var value = v + "";
switch (type) { switch (type) {
case BI.DynamicDateTimeSelect.HOUR: case BI.DynamicDateTimeSelect.HOUR:
limit = 2; limit = 2;
@ -71737,7 +71737,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add)); this.setValue(BI.add(v, add));
}, },
setUpEnable: function (v) { setUpEnable: function (v) {

6
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored

@ -63115,7 +63115,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) { _autoSwitch: function (v, type) {
var limit = 0; var limit = 0;
var value = v; var value = v + "";
switch (type) { switch (type) {
case BI.DynamicDateTimeSelect.HOUR: case BI.DynamicDateTimeSelect.HOUR:
limit = 2; limit = 2;
@ -72276,7 +72276,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add)); this.setValue(BI.add(v, add));
}, },
setUpEnable: function (v) { setUpEnable: function (v) {

6
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored

@ -6044,7 +6044,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);/** BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

4
dist/fineui.ie.js vendored

@ -62818,7 +62818,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) { _autoSwitch: function (v, type) {
var limit = 0; var limit = 0;
var value = v; var value = v + "";
switch (type) { switch (type) {
case BI.DynamicDateTimeSelect.HOUR: case BI.DynamicDateTimeSelect.HOUR:
limit = 2; limit = 2;
@ -71979,7 +71979,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add)); this.setValue(BI.add(v, add));
}, },
setUpEnable: function (v) { setUpEnable: function (v) {

6
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored

@ -63357,7 +63357,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) { _autoSwitch: function (v, type) {
var limit = 0; var limit = 0;
var value = v; var value = v + "";
switch (type) { switch (type) {
case BI.DynamicDateTimeSelect.HOUR: case BI.DynamicDateTimeSelect.HOUR:
limit = 2; limit = 2;
@ -72518,7 +72518,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add)); this.setValue(BI.add(v, add));
}, },
setUpEnable: function (v) { setUpEnable: function (v) {

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui_without_jquery_polyfill.js vendored

@ -46239,7 +46239,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) { _autoSwitch: function (v, type) {
var limit = 0; var limit = 0;
var value = v; var value = v + "";
switch (type) { switch (type) {
case BI.DynamicDateTimeSelect.HOUR: case BI.DynamicDateTimeSelect.HOUR:
limit = 2; limit = 2;
@ -55400,7 +55400,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add)); this.setValue(BI.add(v, add));
}, },
setUpEnable: function (v) { setUpEnable: function (v) {

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -4424,7 +4424,7 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
_autoSwitch: function (v, type) { _autoSwitch: function (v, type) {
var limit = 0; var limit = 0;
var value = v; var value = v + "";
switch (type) { switch (type) {
case BI.DynamicDateTimeSelect.HOUR: case BI.DynamicDateTimeSelect.HOUR:
limit = 2; limit = 2;
@ -13585,7 +13585,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add)); this.setValue(BI.add(v, add));
}, },
setUpEnable: function (v) { setUpEnable: function (v) {

2
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

@ -137,7 +137,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
_autoSwitch: function (v, type) { _autoSwitch: function (v, type) {
var limit = 0; var limit = 0;
var value = v; var value = v + "";
switch (type) { switch (type) {
case BI.DynamicDateTimeSelect.HOUR: case BI.DynamicDateTimeSelect.HOUR:
limit = 2; limit = 2;

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

@ -90,7 +90,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());
this.setValue(v.add(add)); this.setValue(BI.add(v, add));
}, },
setUpEnable: function (v) { setUpEnable: function (v) {

Loading…
Cancel
Save