Browse Source

Merge pull request #879 in VISUAL/fineui from ~FRANK.QIU/fineui:master to master

* commit 'b406d635fa475450a613fa9dd2f2a0e12981a190':
  BI-41980 fix: 时间默认值和提示
es6
Frank.Qiu 6 years ago
parent
commit
83ba6e76c6
  1. 19
      dist/2.0/fineui.ie.js
  2. 19
      dist/2.0/fineui.js
  3. 19
      dist/bundle.ie.js
  4. 19
      dist/bundle.js
  5. 19
      dist/fineui.ie.js
  6. 19
      dist/fineui.js
  7. 19
      dist/fineui_without_jquery_polyfill.js
  8. 19
      dist/widget.js
  9. 16
      src/widget/time/datetime.popup.js
  10. 3
      src/widget/time/time.trigger.js

19
dist/2.0/fineui.ie.js vendored

@ -78887,15 +78887,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
};
},
setValue: function (v) {
var value = v;
if (BI.isNull(value)) {
var date = BI.getDate();
this.timeSelect.setValue({
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
});
setValue: function (value) {
if (this._checkValueValid(value)) {
this.timeSelect.setValue();
} else {
this.timeSelect.setValue({
hour: value.hour,
@ -78907,6 +78901,10 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
getValue: function () {
return this.timeSelect.getValue();
},
_checkValueValid: function (value) {
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
}
});
BI.TimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
@ -79079,6 +79077,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
items: [{
el: {
type: "bi.label",
title: function () {
return self.text.getText();
},
textAlign: "left",
height: o.height,
width: o.width,

19
dist/2.0/fineui.js vendored

@ -79291,15 +79291,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
};
},
setValue: function (v) {
var value = v;
if (BI.isNull(value)) {
var date = BI.getDate();
this.timeSelect.setValue({
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
});
setValue: function (value) {
if (this._checkValueValid(value)) {
this.timeSelect.setValue();
} else {
this.timeSelect.setValue({
hour: value.hour,
@ -79311,6 +79305,10 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
getValue: function () {
return this.timeSelect.getValue();
},
_checkValueValid: function (value) {
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
}
});
BI.TimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
@ -79483,6 +79481,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
items: [{
el: {
type: "bi.label",
title: function () {
return self.text.getText();
},
textAlign: "left",
height: o.height,
width: o.width,

19
dist/bundle.ie.js vendored

@ -78887,15 +78887,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
};
},
setValue: function (v) {
var value = v;
if (BI.isNull(value)) {
var date = BI.getDate();
this.timeSelect.setValue({
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
});
setValue: function (value) {
if (this._checkValueValid(value)) {
this.timeSelect.setValue();
} else {
this.timeSelect.setValue({
hour: value.hour,
@ -78907,6 +78901,10 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
getValue: function () {
return this.timeSelect.getValue();
},
_checkValueValid: function (value) {
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
}
});
BI.TimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
@ -79079,6 +79077,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
items: [{
el: {
type: "bi.label",
title: function () {
return self.text.getText();
},
textAlign: "left",
height: o.height,
width: o.width,

19
dist/bundle.js vendored

@ -79291,15 +79291,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
};
},
setValue: function (v) {
var value = v;
if (BI.isNull(value)) {
var date = BI.getDate();
this.timeSelect.setValue({
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
});
setValue: function (value) {
if (this._checkValueValid(value)) {
this.timeSelect.setValue();
} else {
this.timeSelect.setValue({
hour: value.hour,
@ -79311,6 +79305,10 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
getValue: function () {
return this.timeSelect.getValue();
},
_checkValueValid: function (value) {
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
}
});
BI.TimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
@ -79483,6 +79481,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
items: [{
el: {
type: "bi.label",
title: function () {
return self.text.getText();
},
textAlign: "left",
height: o.height,
width: o.width,

19
dist/fineui.ie.js vendored

@ -79132,15 +79132,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
};
},
setValue: function (v) {
var value = v;
if (BI.isNull(value)) {
var date = BI.getDate();
this.timeSelect.setValue({
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
});
setValue: function (value) {
if (this._checkValueValid(value)) {
this.timeSelect.setValue();
} else {
this.timeSelect.setValue({
hour: value.hour,
@ -79152,6 +79146,10 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
getValue: function () {
return this.timeSelect.getValue();
},
_checkValueValid: function (value) {
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
}
});
BI.TimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
@ -79324,6 +79322,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
items: [{
el: {
type: "bi.label",
title: function () {
return self.text.getText();
},
textAlign: "left",
height: o.height,
width: o.width,

19
dist/fineui.js vendored

@ -79536,15 +79536,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
};
},
setValue: function (v) {
var value = v;
if (BI.isNull(value)) {
var date = BI.getDate();
this.timeSelect.setValue({
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
});
setValue: function (value) {
if (this._checkValueValid(value)) {
this.timeSelect.setValue();
} else {
this.timeSelect.setValue({
hour: value.hour,
@ -79556,6 +79550,10 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
getValue: function () {
return this.timeSelect.getValue();
},
_checkValueValid: function (value) {
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
}
});
BI.TimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
@ -79728,6 +79726,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
items: [{
el: {
type: "bi.label",
title: function () {
return self.text.getText();
},
textAlign: "left",
height: o.height,
width: o.width,

19
dist/fineui_without_jquery_polyfill.js vendored

@ -62371,15 +62371,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
};
},
setValue: function (v) {
var value = v;
if (BI.isNull(value)) {
var date = BI.getDate();
this.timeSelect.setValue({
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
});
setValue: function (value) {
if (this._checkValueValid(value)) {
this.timeSelect.setValue();
} else {
this.timeSelect.setValue({
hour: value.hour,
@ -62391,6 +62385,10 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
getValue: function () {
return this.timeSelect.getValue();
},
_checkValueValid: function (value) {
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
}
});
BI.TimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
@ -62563,6 +62561,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
items: [{
el: {
type: "bi.label",
title: function () {
return self.text.getText();
},
textAlign: "left",
height: o.height,
width: o.width,

19
dist/widget.js vendored

@ -19445,15 +19445,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
};
},
setValue: function (v) {
var value = v;
if (BI.isNull(value)) {
var date = BI.getDate();
this.timeSelect.setValue({
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
});
setValue: function (value) {
if (this._checkValueValid(value)) {
this.timeSelect.setValue();
} else {
this.timeSelect.setValue({
hour: value.hour,
@ -19465,6 +19459,10 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
getValue: function () {
return this.timeSelect.getValue();
},
_checkValueValid: function (value) {
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
}
});
BI.TimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
@ -19637,6 +19635,9 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () {
items: [{
el: {
type: "bi.label",
title: function () {
return self.text.getText();
},
textAlign: "left",
height: o.height,
width: o.width,

16
src/widget/time/datetime.popup.js

@ -69,15 +69,9 @@
};
},
setValue: function (v) {
var value = v;
if (BI.isNull(value)) {
var date = BI.getDate();
this.timeSelect.setValue({
hour: date.getHours(),
minute: date.getMinutes(),
second: date.getSeconds()
});
setValue: function (value) {
if (this._checkValueValid(value)) {
this.timeSelect.setValue();
} else {
this.timeSelect.setValue({
hour: value.hour,
@ -89,6 +83,10 @@
getValue: function () {
return this.timeSelect.getValue();
},
_checkValueValid: function (value) {
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
}
});
BI.TimePopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";

3
src/widget/time/time.trigger.js

@ -13,6 +13,9 @@
items: [{
el: {
type: "bi.label",
title: function () {
return self.text.getText();
},
textAlign: "left",
height: o.height,
width: o.width,

Loading…
Cancel
Save