Browse Source

Merge pull request #248 in ~GUY/fineui from ~WINDY/fineui:BI4.1 to BI4.1

* commit '0d03ea5a5c9ff62abdfecf05ade1f47b0a13aa36':
  日期校验
es6
windy 7 years ago
parent
commit
09b2d6ea74
  1. 4
      bi/widget.js
  2. 4
      dist/bundle.js
  3. 2
      dist/bundle.min.js
  4. 4
      dist/widget.js
  5. 4
      src/widget/multidate/multidate.popup.js

4
bi/widget.js

@ -7366,7 +7366,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
},
_checkValueValid: function (value) {
return BI.isNotNull(value) && BI.isNotEmptyObject(value) && BI.isNotEmptyString(value);
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
},
setValue: function (v) {
@ -7424,7 +7424,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
self._setInnerValue(this.day);
break;
default:
if (!this._checkValueValid(value)) {
if (this._checkValueValid(value)) {
var date = new Date();
this.dateTab.setSelect(BI.MultiDateCombo.MULTI_DATE_YMD_CARD);
this.ymd.setValue({

4
dist/bundle.js vendored

@ -82590,7 +82590,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
},
_checkValueValid: function (value) {
return BI.isNotNull(value) && BI.isNotEmptyObject(value) && BI.isNotEmptyString(value);
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
},
setValue: function (v) {
@ -82648,7 +82648,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
self._setInnerValue(this.day);
break;
default:
if (!this._checkValueValid(value)) {
if (this._checkValueValid(value)) {
var date = new Date();
this.dateTab.setSelect(BI.MultiDateCombo.MULTI_DATE_YMD_CARD);
this.ymd.setValue({

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -7366,7 +7366,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
},
_checkValueValid: function (value) {
return BI.isNotNull(value) && BI.isNotEmptyObject(value) && BI.isNotEmptyString(value);
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
},
setValue: function (v) {
@ -7424,7 +7424,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
self._setInnerValue(this.day);
break;
default:
if (!this._checkValueValid(value)) {
if (this._checkValueValid(value)) {
var date = new Date();
this.dateTab.setSelect(BI.MultiDateCombo.MULTI_DATE_YMD_CARD);
this.ymd.setValue({

4
src/widget/multidate/multidate.popup.js

@ -216,7 +216,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
},
_checkValueValid: function (value) {
return BI.isNotNull(value) && BI.isNotEmptyObject(value) && BI.isNotEmptyString(value);
return BI.isNull(value) || BI.isEmptyObject(value) || BI.isEmptyString(value);
},
setValue: function (v) {
@ -274,7 +274,7 @@ BI.MultiDatePopup = BI.inherit(BI.Widget, {
self._setInnerValue(this.day);
break;
default:
if (!this._checkValueValid(value)) {
if (this._checkValueValid(value)) {
var date = new Date();
this.dateTab.setSelect(BI.MultiDateCombo.MULTI_DATE_YMD_CARD);
this.ymd.setValue({

Loading…
Cancel
Save