Merge remote-tracking branch 'origin/master'

3 years ago · a5b8c254f3
2 changed files with 7 additions and 2 deletions
--- 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",
--- 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)
+                                }
                            }
                        }]
                    }]],