Browse Source

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

* commit 'e9eff19aee6ffb628f397078072c830e708df9cb':
  fix: 常量补充
  BI-41212 fix: 使用箭头按钮微调小时的时候不需要自动切换输入框
es6
windy 6 years ago
parent
commit
528d9b3796
  1. 19
      dist/bundle.ie.js
  2. 28
      dist/bundle.ie.min.js
  3. 19
      dist/bundle.js
  4. 18
      dist/bundle.min.js
  5. 19
      dist/fineui.ie.js
  6. 26
      dist/fineui.ie.min.js
  7. 19
      dist/fineui.js
  8. 16
      dist/fineui.min.js
  9. 19
      dist/fineui_without_jquery_polyfill.js
  10. 2
      dist/utils.min.js
  11. 19
      dist/widget.js
  12. 15
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  13. 4
      src/widget/numbereditor/number.editor.js

19
dist/bundle.ie.js vendored

@ -63311,7 +63311,17 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
value = "0" + value; value = "0" + value;
} }
if (value.length === 2) { if (value.length === 2) {
type === BI.DynamicDateTimeSelect.HOUR ? this.minute.focus() : this.second.focus(); switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
this.hour.isEditing() && this.minute.focus();
break;
case BI.DynamicDateTimeSelect.MINUTE:
this.minute.isEditing() && this.second.focus();
break;
case BI.DynamicDateTimeSelect.SECOND:
default:
break;
}
} }
return value; return value;
}, },
@ -63357,7 +63367,8 @@ BI.shortcut("bi.dynamic_date_time_select", BI.DynamicDateTimeSelect);
BI.extend(BI.DynamicDateTimeSelect, { BI.extend(BI.DynamicDateTimeSelect, {
HOUR: 1, HOUR: 1,
MINUTE: 2 MINUTE: 2,
SECOND: 3
});BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, { });BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
_const: { _const: {
hgap: 4, hgap: 4,
@ -72499,6 +72510,10 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.editor.focus(); this.editor.focus();
}, },
isEditing: function () {
return this.editor.isEditing();
},
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());

28
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

19
dist/bundle.js vendored

@ -63715,7 +63715,17 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
value = "0" + value; value = "0" + value;
} }
if (value.length === 2) { if (value.length === 2) {
type === BI.DynamicDateTimeSelect.HOUR ? this.minute.focus() : this.second.focus(); switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
this.hour.isEditing() && this.minute.focus();
break;
case BI.DynamicDateTimeSelect.MINUTE:
this.minute.isEditing() && this.second.focus();
break;
case BI.DynamicDateTimeSelect.SECOND:
default:
break;
}
} }
return value; return value;
}, },
@ -63761,7 +63771,8 @@ BI.shortcut("bi.dynamic_date_time_select", BI.DynamicDateTimeSelect);
BI.extend(BI.DynamicDateTimeSelect, { BI.extend(BI.DynamicDateTimeSelect, {
HOUR: 1, HOUR: 1,
MINUTE: 2 MINUTE: 2,
SECOND: 3
});BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, { });BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
_const: { _const: {
hgap: 4, hgap: 4,
@ -72903,6 +72914,10 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.editor.focus(); this.editor.focus();
}, },
isEditing: function () {
return this.editor.isEditing();
},
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());

18
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

19
dist/fineui.ie.js vendored

@ -63556,7 +63556,17 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
value = "0" + value; value = "0" + value;
} }
if (value.length === 2) { if (value.length === 2) {
type === BI.DynamicDateTimeSelect.HOUR ? this.minute.focus() : this.second.focus(); switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
this.hour.isEditing() && this.minute.focus();
break;
case BI.DynamicDateTimeSelect.MINUTE:
this.minute.isEditing() && this.second.focus();
break;
case BI.DynamicDateTimeSelect.SECOND:
default:
break;
}
} }
return value; return value;
}, },
@ -63602,7 +63612,8 @@ BI.shortcut("bi.dynamic_date_time_select", BI.DynamicDateTimeSelect);
BI.extend(BI.DynamicDateTimeSelect, { BI.extend(BI.DynamicDateTimeSelect, {
HOUR: 1, HOUR: 1,
MINUTE: 2 MINUTE: 2,
SECOND: 3
});BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, { });BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
_const: { _const: {
hgap: 4, hgap: 4,
@ -72744,6 +72755,10 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.editor.focus(); this.editor.focus();
}, },
isEditing: function () {
return this.editor.isEditing();
},
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());

26
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

19
dist/fineui.js vendored

@ -63960,7 +63960,17 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
value = "0" + value; value = "0" + value;
} }
if (value.length === 2) { if (value.length === 2) {
type === BI.DynamicDateTimeSelect.HOUR ? this.minute.focus() : this.second.focus(); switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
this.hour.isEditing() && this.minute.focus();
break;
case BI.DynamicDateTimeSelect.MINUTE:
this.minute.isEditing() && this.second.focus();
break;
case BI.DynamicDateTimeSelect.SECOND:
default:
break;
}
} }
return value; return value;
}, },
@ -64006,7 +64016,8 @@ BI.shortcut("bi.dynamic_date_time_select", BI.DynamicDateTimeSelect);
BI.extend(BI.DynamicDateTimeSelect, { BI.extend(BI.DynamicDateTimeSelect, {
HOUR: 1, HOUR: 1,
MINUTE: 2 MINUTE: 2,
SECOND: 3
});BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, { });BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
_const: { _const: {
hgap: 4, hgap: 4,
@ -73148,6 +73159,10 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.editor.focus(); this.editor.focus();
}, },
isEditing: function () {
return this.editor.isEditing();
},
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());

16
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

19
dist/fineui_without_jquery_polyfill.js vendored

@ -46755,7 +46755,17 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
value = "0" + value; value = "0" + value;
} }
if (value.length === 2) { if (value.length === 2) {
type === BI.DynamicDateTimeSelect.HOUR ? this.minute.focus() : this.second.focus(); switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
this.hour.isEditing() && this.minute.focus();
break;
case BI.DynamicDateTimeSelect.MINUTE:
this.minute.isEditing() && this.second.focus();
break;
case BI.DynamicDateTimeSelect.SECOND:
default:
break;
}
} }
return value; return value;
}, },
@ -46801,7 +46811,8 @@ BI.shortcut("bi.dynamic_date_time_select", BI.DynamicDateTimeSelect);
BI.extend(BI.DynamicDateTimeSelect, { BI.extend(BI.DynamicDateTimeSelect, {
HOUR: 1, HOUR: 1,
MINUTE: 2 MINUTE: 2,
SECOND: 3
});BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, { });BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
_const: { _const: {
hgap: 4, hgap: 4,
@ -55943,6 +55954,10 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.editor.focus(); this.editor.focus();
}, },
isEditing: function () {
return this.editor.isEditing();
},
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

19
dist/widget.js vendored

@ -4270,7 +4270,17 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
value = "0" + value; value = "0" + value;
} }
if (value.length === 2) { if (value.length === 2) {
type === BI.DynamicDateTimeSelect.HOUR ? this.minute.focus() : this.second.focus(); switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
this.hour.isEditing() && this.minute.focus();
break;
case BI.DynamicDateTimeSelect.MINUTE:
this.minute.isEditing() && this.second.focus();
break;
case BI.DynamicDateTimeSelect.SECOND:
default:
break;
}
} }
return value; return value;
}, },
@ -4316,7 +4326,8 @@ BI.shortcut("bi.dynamic_date_time_select", BI.DynamicDateTimeSelect);
BI.extend(BI.DynamicDateTimeSelect, { BI.extend(BI.DynamicDateTimeSelect, {
HOUR: 1, HOUR: 1,
MINUTE: 2 MINUTE: 2,
SECOND: 3
});BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, { });BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
_const: { _const: {
hgap: 4, hgap: 4,
@ -13458,6 +13469,10 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.editor.focus(); this.editor.focus();
}, },
isEditing: function () {
return this.editor.isEditing();
},
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());

15
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

@ -151,7 +151,17 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
value = "0" + value; value = "0" + value;
} }
if (value.length === 2) { if (value.length === 2) {
type === BI.DynamicDateTimeSelect.HOUR ? this.minute.focus() : this.second.focus(); switch (type) {
case BI.DynamicDateTimeSelect.HOUR:
this.hour.isEditing() && this.minute.focus();
break;
case BI.DynamicDateTimeSelect.MINUTE:
this.minute.isEditing() && this.second.focus();
break;
case BI.DynamicDateTimeSelect.SECOND:
default:
break;
}
} }
return value; return value;
}, },
@ -197,5 +207,6 @@ BI.shortcut("bi.dynamic_date_time_select", BI.DynamicDateTimeSelect);
BI.extend(BI.DynamicDateTimeSelect, { BI.extend(BI.DynamicDateTimeSelect, {
HOUR: 1, HOUR: 1,
MINUTE: 2 MINUTE: 2,
SECOND: 3
}); });

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

@ -88,6 +88,10 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
this.editor.focus(); this.editor.focus();
}, },
isEditing: function () {
return this.editor.isEditing();
},
// 微调 // 微调
_finetuning: function (add) { _finetuning: function (add) {
var v = BI.parseFloat(this.getValue()); var v = BI.parseFloat(this.getValue());

Loading…
Cancel
Save