diff --git a/src/widget/year/card.year.js b/src/widget/year/card.year.js index bc3fe6a587..b747d104be 100644 --- a/src/widget/year/card.year.js +++ b/src/widget/year/card.year.js @@ -103,9 +103,9 @@ BI.StaticYearCard = BI.inherit(BI.Widget, { afterCardShow: function () { this.setValue(self.selectedYear); - var calendar = this.getSelectedCard(); - self.backBtn.setEnable(!calendar.isFrontYear()); - self.preBtn.setEnable(!calendar.isFinalYear()); + // var calendar = this.getSelectedCard(); + // self.backBtn.setEnable(!calendar.isFrontYear()); + // self.preBtn.setEnable(!calendar.isFinalYear()); } }); diff --git a/src/widget/yearquarter/trigger.yearquarter.js b/src/widget/yearquarter/trigger.yearquarter.js index b6abb201f1..cdebb770d4 100644 --- a/src/widget/yearquarter/trigger.yearquarter.js +++ b/src/widget/yearquarter/trigger.yearquarter.js @@ -67,7 +67,9 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, { if(isYear) { return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1 : 1, 1, o.min, o.max)[0]); } - return v === "" || ((BI.isPositiveInteger(v) && v >= 1 && v <= 4) && !BI.checkDateVoid(self.yearEditor.getValue(), (v - 1) * 3 + 1, 1, o.min, o.max)[0]); + var year = self.yearEditor.getValue(); + + return v === "" || ((BI.isPositiveInteger(v) && v >= 1 && v <= 4) && (BI.isEmptyString(year) ? true : !BI.checkDateVoid(self.yearEditor.getValue(), (v - 1) * 3 + 1, 1, o.min, o.max)[0])); }, quitChecker: function () { return false;