diff --git a/src/widget/dynamicdate/dynamicdate.card.js b/src/widget/dynamicdate/dynamicdate.card.js index 18fad75cf..cacb66eb5 100644 --- a/src/widget/dynamicdate/dynamicdate.card.js +++ b/src/widget/dynamicdate/dynamicdate.card.js @@ -298,6 +298,9 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, { case BI.DynamicDateCard.TYPE.DAY: valueMap.day = (value.offset === 0 ? -value.value : value.value); break; + case BI.DynamicDateCard.TYPE.WORK_DAY: + valueMap.workDay = (value.offset === 0 ? -value.value : value.value); + break; default: break; } diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index cb8d48084..51d4f1c44 100644 --- a/src/widget/yearmonth/combo.yearmonth.js +++ b/src/widget/yearmonth/combo.yearmonth.js @@ -188,7 +188,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { return this.trigger.getKey(); }, - isValid: function () { + isStateValid: function () { return this.trigger.isValid(); } diff --git a/src/widget/yearmonth/trigger.yearmonth.js b/src/widget/yearmonth/trigger.yearmonth.js index e6c1f7630..5fc95abc1 100644 --- a/src/widget/yearmonth/trigger.yearmonth.js +++ b/src/widget/yearmonth/trigger.yearmonth.js @@ -259,7 +259,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, { return this.yearEditor.getValue() + "-" + this.monthEditor.getValue(); }, - isValid: function () { + isStateValid: function () { return this.yearEditor.isValid() && this.monthEditor.isValid(); } }); diff --git a/src/widget/yearmonthinterval/yearmonthinterval.js b/src/widget/yearmonthinterval/yearmonthinterval.js index 8b05ac479..108a3e1f1 100644 --- a/src/widget/yearmonthinterval/yearmonthinterval.js +++ b/src/widget/yearmonthinterval/yearmonthinterval.js @@ -100,7 +100,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, { combo.on(BI.DynamicYearMonthCombo.EVENT_CONFIRM, function () { BI.Bubbles.hide("error"); var smallDate = self.left.getKey(), bigDate = self.right.getKey(); - if (self.left.isValid() && self.right.isValid() && self._check(smallDate, bigDate) && self._compare(smallDate, bigDate)) { + if (self.left.isStateValid() && self.right.isStateValid() && self._check(smallDate, bigDate) && self._compare(smallDate, bigDate)) { self._setTitle(BI.i18nText("BI-Time_Interval_Error_Text")); self.element.addClass(self.constants.timeErrorCls); self.fireEvent(BI.YearMonthInterval.EVENT_ERROR);