From 762715630537bd1f90241e7a5f2339684445c987 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Thu, 14 Oct 2021 18:54:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-95485=20fix:=E6=97=A5=E6=9C=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=8A=A8=E6=80=81=E9=9D=A2=E6=9D=BF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdatetime/dynamicdatetime.popup.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/widget/dynamicdatetime/dynamicdatetime.popup.js b/src/widget/dynamicdatetime/dynamicdatetime.popup.js index a4a528171..91c2fb2d1 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js @@ -59,7 +59,12 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, { listeners: [{ eventName: BI.TextButton.EVENT_CHANGE, action: function () { - self.fireEvent(BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE); + var type = self.dateTab.getSelect(); + if (type === BI.DynamicDateCombo.Dynamic) { + self.dynamicPane.checkValidation(true) && self.fireEvent(BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE); + } else { + self.fireEvent(BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE) + } } }] }]], From d218fec007d9dbab3ade88c15573bbdc93f0674d Mon Sep 17 00:00:00 2001 From: data Date: Fri, 15 Oct 2021 10:23:14 +0800 Subject: [PATCH 2/2] auto upgrade version to 2.0.20211015102301 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2fe593e9..6193f02be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211013185141", + "version": "2.0.20211015102301", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",