From 3cdb12095bb771ece657c13357889b83ba625e6e Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Fri, 6 Dec 2019 17:21:12 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-24923=20&&=20REPORT-24867=20fix:=20?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=8E=A7=E4=BB=B6=E4=B8=8B=E6=8B=89=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/dynamicdate/dynamicdate.combo.js         | 1 +
 src/widget/dynamicdate/dynamicdate.popup.js         | 4 ++--
 src/widget/dynamicdatetime/dynamicdatetime.combo.js | 1 +
 src/widget/dynamicdatetime/dynamicdatetime.popup.js | 4 ++--
 src/widget/yearmonth/card.static.yearmonth.js       | 4 ++--
 src/widget/yearmonth/popup.yearmonth.js             | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js
index d659a3eee..d12dc03fc 100644
--- a/src/widget/dynamicdate/dynamicdate.combo.js
+++ b/src/widget/dynamicdate/dynamicdate.combo.js
@@ -46,6 +46,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                         toggle: false,
                         isNeedAdjustHeight: false,
                         isNeedAdjustWidth: false,
+                        destroyWhenHide: true,
                         el: {
                             type: "bi.dynamic_date_trigger",
                             min: opts.minDate,
diff --git a/src/widget/dynamicdate/dynamicdate.popup.js b/src/widget/dynamicdate/dynamicdate.popup.js
index b862db0fb..73abd0b1a 100644
--- a/src/widget/dynamicdate/dynamicdate.popup.js
+++ b/src/widget/dynamicdate/dynamicdate.popup.js
@@ -173,16 +173,16 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
 
     setMinDate: function (minDate) {
         if (this.options.min !== minDate) {
+            this.options.min = minDate;
             this.ymd.setMinDate(minDate);
         }
-        this.options.min = minDate;
     },
 
     setMaxDate: function (maxDate) {
         if (this.options.max !== maxDate) {
+            this.options.max = maxDate;
             this.ymd.setMaxDate(maxDate);
         }
-        this.options.max = maxDate;
     },
 
     setValue: function (v) {
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
index 95f655433..27d2b9520 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
@@ -39,6 +39,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                 items: [{
                     el: {
                         type: "bi.combo",
+                        destroyWhenHide: true,
                         container: opts.container,
                         ref: function () {
                             self.combo = this;
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.popup.js b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
index d8f943551..f98c57959 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
@@ -180,16 +180,16 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
 
     setMinDate: function (minDate) {
         if (this.options.min !== minDate) {
+            this.options.min = minDate;
             this.ymd.setMinDate(minDate);
         }
-        this.options.min = minDate;
     },
 
     setMaxDate: function (maxDate) {
         if (this.options.max !== maxDate) {
+            this.options.max = maxDate;
             this.ymd.setMaxDate(maxDate);
         }
-        this.options.max = maxDate;
     },
 
     setValue: function (v) {
diff --git a/src/widget/yearmonth/card.static.yearmonth.js b/src/widget/yearmonth/card.static.yearmonth.js
index 24a2f2ff4..740dcf6d1 100644
--- a/src/widget/yearmonth/card.static.yearmonth.js
+++ b/src/widget/yearmonth/card.static.yearmonth.js
@@ -115,18 +115,18 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
 
     setMinDate: function (minDate) {
         if (this.options.min !== minDate) {
+            this.options.min = minDate;
             this.yearPicker.setMinDate(minDate);
             this._checkMonthStatus(this.selectedYear);
         }
-        this.options.min = minDate;
     },
 
     setMaxDate: function (maxDate) {
         if (this.options.max !== maxDate) {
+            this.options.max = maxDate;
             this.yearPicker.setMaxDate(maxDate);
             this._checkMonthStatus(this.selectedYear);
         }
-        this.options.max = maxDate;
     },
 
     getValue: function () {
diff --git a/src/widget/yearmonth/popup.yearmonth.js b/src/widget/yearmonth/popup.yearmonth.js
index d8559b1b7..6c874b2b3 100644
--- a/src/widget/yearmonth/popup.yearmonth.js
+++ b/src/widget/yearmonth/popup.yearmonth.js
@@ -172,16 +172,16 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
 
     setMinDate: function (minDate) {
         if (this.options.min !== minDate) {
+            this.options.min = minDate;
             this.year.setMinDate(minDate);
         }
-        this.options.min = minDate;
     },
 
     setMaxDate: function (maxDate) {
         if (this.options.max !== maxDate) {
+            this.options.max = maxDate;
             this.year.setMaxDate(maxDate);
         }
-        this.options.max = maxDate;
     },
 
     setValue: function (v) {