Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BI-19718

es6
windy 7 years ago
parent
306518ea18
commit
653443f142
5 changed files with 84 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      dist/bundle.js
  2. 22
      dist/fineui.js
  3. 22
      dist/widget.js
  4. 7
      src/widget/datetime/datetime.select.js
  5. 15
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

22
dist/bundle.js vendored
Unescape View File

@ -89220,7 +89220,12 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
type: "bi.sign_editor", type: "bi.sign_editor",
value: this._alertInEditorValue(o.min), value: this._alertInEditorValue(o.min),
allowBlank: false, allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"), errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Please_Input_Natural_Number");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
},
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);
} }
@ -92040,8 +92045,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 24; return BI.isNaturalNumber(v) && BI.parseInt(v) < 24;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -92074,8 +92082,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -92106,8 +92117,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,

22
dist/fineui.js vendored
Unescape View File

@ -89463,7 +89463,12 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
type: "bi.sign_editor", type: "bi.sign_editor",
value: this._alertInEditorValue(o.min), value: this._alertInEditorValue(o.min),
allowBlank: false, allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"), errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Please_Input_Natural_Number");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
},
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);
} }
@ -92283,8 +92288,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 24; return BI.isNaturalNumber(v) && BI.parseInt(v) < 24;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -92317,8 +92325,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -92349,8 +92360,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,

22
dist/widget.js vendored
Unescape View File

@ -1666,7 +1666,12 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
type: "bi.sign_editor", type: "bi.sign_editor",
value: this._alertInEditorValue(o.min), value: this._alertInEditorValue(o.min),
allowBlank: false, allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"), errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Please_Input_Natural_Number");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
},
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);
} }
@ -4486,8 +4491,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 24; return BI.isNaturalNumber(v) && BI.parseInt(v) < 24;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -4520,8 +4528,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -4552,8 +4563,11 @@ BI.shortcut("bi.dynamic_date_time_popup", BI.DynamicDateTimePopup);BI.DynamicDat
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,

7
src/widget/datetime/datetime.select.js
Unescape View File

@ -17,7 +17,12 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
type: "bi.sign_editor", type: "bi.sign_editor",
value: this._alertInEditorValue(o.min), value: this._alertInEditorValue(o.min),
allowBlank: false, allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"), errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Please_Input_Natural_Number");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
},
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);
} }

15
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
Unescape View File

@ -19,8 +19,11 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 24; return BI.isNaturalNumber(v) && BI.parseInt(v) < 24;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-23\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -53,8 +56,11 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,
@ -85,8 +91,11 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v) && BI.parseInt(v) < 60; return BI.isNaturalNumber(v) && BI.parseInt(v) < 60;
}, },
errorText: function () { errorText: function (v) {
if(BI.isNumeric(v)) {
return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\""); return BI.i18nText("BI-Basic_Input_From_To_Number", "\"00-59\"");
}
return BI.i18nText("BI-Numerical_Interval_Input_Data");
}, },
listeners: [{ listeners: [{
eventName: BI.SignEditor.EVENT_CONFIRM, eventName: BI.SignEditor.EVENT_CONFIRM,

Write Preview
Loading…
Cancel
Save