From 5fd2518b6ecbed3f1fd0e8f449898301e7b84e7f Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 5 Dec 2019 16:35:02 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-24866=20fix:=20=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6before=5Fpopup=E4=BA=8B=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E8=B0=83=E7=94=A8setMinDate=E6=97=A0?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                        | 1 +
 src/widget/dynamicdate/dynamicdate.combo.js         | 2 +-
 src/widget/dynamicdatetime/dynamicdatetime.combo.js | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index c79ca8f1d..f5f33ea0b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2019-12)
+- 修复了监听日期下拉框before_popup_view事件，调用setMinDate无效的问题
 - 修复了数值滑块逆向排列滑块后populate显示效果不对的问题
 - 不影响父节点勾选状态的复选树支持自定义水印和默认值
 
diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js
index 6cb363ab7..d659a3eee 100644
--- a/src/widget/dynamicdate/dynamicdate.combo.js
+++ b/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);
                             }
                         }]
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
index 7b249fd63..95f655433 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/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);
                             }
                         }],