From 42d1e3f4380a18a0b6f2e1d5bc174889194ef514 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 21 Jan 2021 16:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=B7=A5=E4=BD=9C=E6=97=A5=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E7=BA=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/dynamicdate/dynamicdate.card.js        | 3 +++
 src/widget/yearmonth/combo.yearmonth.js           | 2 +-
 src/widget/yearmonth/trigger.yearmonth.js         | 2 +-
 src/widget/yearmonthinterval/yearmonthinterval.js | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/widget/dynamicdate/dynamicdate.card.js b/src/widget/dynamicdate/dynamicdate.card.js
index 18fad75cfc..cacb66eb50 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 cb8d480849..51d4f1c44b 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 e6c1f7630f..5fc95abc19 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 8b05ac479c..108a3e1f10 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);