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", 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) + } } }] }]],