From 8c1a36a84b5f442acb036325bc04b59d50bfcfd5 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 14 May 2018 10:56:27 +0800 Subject: [PATCH] BI-21030 --- dist/bundle.js | 5 +++-- dist/fineui.js | 5 +++-- dist/widget.js | 5 +++-- src/widget/datepane/card.static.datepane.js | 4 ++-- src/widget/datetimepane/card.static.datetimepane.js | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index 6bbf473c5..ba68f2912 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -88681,9 +88681,9 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, { } self.selectedTime = { year: value.year, - month: value.month, - day: day + month: value.month }; + day !== 0 && (self.selectedTime.day = day); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setValue(self.selectedTime); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); @@ -89408,6 +89408,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar month: value.month, day: day }); + day !== 0 && (self.selectedTime.day = day); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setValue(self.selectedTime); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); diff --git a/dist/fineui.js b/dist/fineui.js index 5fe13f367..887659def 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -88924,9 +88924,9 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, { } self.selectedTime = { year: value.year, - month: value.month, - day: day + month: value.month }; + day !== 0 && (self.selectedTime.day = day); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setValue(self.selectedTime); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); @@ -89651,6 +89651,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar month: value.month, day: day }); + day !== 0 && (self.selectedTime.day = day); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setValue(self.selectedTime); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); diff --git a/dist/widget.js b/dist/widget.js index e4b670c59..b5d83b1a9 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -1127,9 +1127,9 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, { } self.selectedTime = { year: value.year, - month: value.month, - day: day + month: value.month }; + day !== 0 && (self.selectedTime.day = day); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setValue(self.selectedTime); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); @@ -1854,6 +1854,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar month: value.month, day: day }); + day !== 0 && (self.selectedTime.day = day); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setValue(self.selectedTime); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); diff --git a/src/widget/datepane/card.static.datepane.js b/src/widget/datepane/card.static.datepane.js index 1d31abce1..4f1cd6ea1 100644 --- a/src/widget/datepane/card.static.datepane.js +++ b/src/widget/datepane/card.static.datepane.js @@ -38,9 +38,9 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, { } self.selectedTime = { year: value.year, - month: value.month, - day: day + month: value.month }; + day !== 0 && (self.selectedTime.day = day); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setValue(self.selectedTime); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE); diff --git a/src/widget/datetimepane/card.static.datetimepane.js b/src/widget/datetimepane/card.static.datetimepane.js index 6c8bd92ee..0c8d4f49b 100644 --- a/src/widget/datetimepane/card.static.datetimepane.js +++ b/src/widget/datetimepane/card.static.datetimepane.js @@ -38,6 +38,7 @@ BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, { month: value.month, day: day }); + day !== 0 && (self.selectedTime.day = day); self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime)); self.calendar.setValue(self.selectedTime); day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);