Merge pull request #1201 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '5fd2518b6ecbed3f1fd0e8f449898301e7b84e7f':
  REPORT-24866 fix: 监听控件before_popup事件的时候调用setMinDate无效

changelog.md

@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2019-12)
+- 修复了监听日期下拉框before_popup_view事件，调用setMinDate无效的问题
 - 修复了数值滑块逆向排列滑块后populate显示效果不对的问题
 - 不影响父节点勾选状态的复选树支持自定义水印和默认值
 

src/widget/dynamicdate/dynamicdate.combo.js

@@ -190,9 +190,9 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                         listeners: [{
                             eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
                             action: function () {
+                                self.popup.setValue(self.storeValue);
                                 self.popup.setMinDate(opts.minDate);
                                 self.popup.setMaxDate(opts.maxDate);
-                                self.popup.setValue(self.storeValue);
                                 self.fireEvent(BI.DynamicDateCombo.EVENT_BEFORE_POPUPVIEW);
                             }
                         }]

src/widget/dynamicdatetime/dynamicdatetime.combo.js

@@ -195,6 +195,8 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                             eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
                             action: function () {
                                 self.popup.setValue(self.storeValue);
+                                self.popup.setMinDate(opts.minDate);
+                                self.popup.setMaxDate(opts.maxDate);
                                 self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW);
                             }
                         }],