From 91c1c22efe62944fdd87883865665718109f6278 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 3 Jul 2020 17:47:20 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-34704=20=E6=9B=B4=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E7=9A=84=E7=81=B0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 2 +- src/widget/date/calendar/combo.month.date.js | 5 ++ src/widget/date/calendar/picker.date.js | 26 +++++++-- src/widget/date/calendar/popup.month.js | 61 +++++++++++--------- 4 files changed, 63 insertions(+), 31 deletions(-) diff --git a/changelog.md b/changelog.md index 84ab485688..f2618763c0 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # 更新日志 2.0(2020-07) -- 修复date_picker最大值最小值判断问题 +- 修复date_picker最大值最小值与面板展示判断问题 - 复选下拉树和下拉列表添加showView和hideVIew方法 - number_editor支持自动检测数值与范围是否合法 - 修复了颜色选择器设置值为null的时候,trigger和popup表现不一致的问题 diff --git a/src/widget/date/calendar/combo.month.date.js b/src/widget/date/calendar/combo.month.date.js index fef307866e..cbdb552dc9 100644 --- a/src/widget/date/calendar/combo.month.date.js +++ b/src/widget/date/calendar/combo.month.date.js @@ -23,6 +23,7 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, { this.popup = BI.createWidget({ type: "bi.month_popup", + allowMonths: o.allowMonths, behaviors: o.behaviors }); @@ -55,6 +56,10 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, { }); }, + populate: function () { + this.combo.populate.apply(this.combo, arguments); + }, + setValue: function (v) { this.trigger.setValue(v); this.popup.setValue(v); diff --git a/src/widget/date/calendar/picker.date.js b/src/widget/date/calendar/picker.date.js index 58e98588fa..06b556ed3c 100644 --- a/src/widget/date/calendar/picker.date.js +++ b/src/widget/date/calendar/picker.date.js @@ -6,7 +6,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments); - + return BI.extend(conf, { baseCls: "bi-date-picker", height: 40, @@ -76,13 +76,14 @@ BI.DatePicker = BI.inherit(BI.Widget, { this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () { self.setValue({ year: self.year.getValue(), - month: self.month.getValue(), + month: self._refreshMonth() }); self.fireEvent(BI.DatePicker.EVENT_CHANGE); }); this.month = BI.createWidget({ type: "bi.month_date_combo", behaviors: o.behaviors, + allowMonths: this._getAllowMonths() }); this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () { self.setValue({ @@ -128,12 +129,29 @@ BI.DatePicker = BI.inherit(BI.Widget, { }); }, + _refreshMonth: function () { + var month = this.month.getValue(); + this.month.populate(this._getAllowMonths()); + var allowMonth = this._getAllowMonths(); + if (!BI.contains(allowMonth, month)) { + month = allowMonth[0]; + } + return month; + }, + + _getAllowMonths: function () { + var self = this, o = this.options; + return BI.filter(BI.range(1, 13), function (idx, v) { + return !BI.checkDateVoid(self.year.getValue(), v, 1, o.min, o.max)[0]; + }) + }, + _checkLeftValid: function () { var o = this.options; var minDate = BI.parseDateTime(o.min, "%Y-%X-%d"); var valid = !(this._month <= (minDate.getMonth() + 1) && this._year <= minDate.getFullYear()); this.left.setEnable(valid); - + return valid; }, @@ -142,7 +160,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { var maxDate = BI.parseDateTime(o.max, "%Y-%X-%d"); var valid = !(this._month >= (maxDate.getMonth() + 1) && this._year >= maxDate.getFullYear()); this.right.setEnable(valid); - + return valid; }, diff --git a/src/widget/date/calendar/popup.month.js b/src/widget/date/calendar/popup.month.js index 658642b210..251511e776 100644 --- a/src/widget/date/calendar/popup.month.js +++ b/src/widget/date/calendar/popup.month.js @@ -18,6 +18,35 @@ BI.MonthPopup = BI.inherit(BI.Widget, { BI.MonthPopup.superclass._init.apply(this, arguments); var self = this, o = this.options; + this.month = BI.createWidget({ + type: "bi.button_group", + element: this, + behaviors: o.behaviors, + items: BI.createItems(this._getItems(o.allowMonths), {}), + layouts: [BI.LogicFactory.createLogic("table", BI.extend({ + dynamic: true + }, { + columns: 2, + rows: 6, + columnSize: [1 / 2, 1 / 2], + rowSize: 25 + })), { + type: "bi.center_adapt", + vgap: 1, + hgap: 2 + }], + value: o.value + }); + + this.month.on(BI.Controller.EVENT_CHANGE, function (type) { + self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); + if (type === BI.Events.CLICK) { + self.fireEvent(BI.MonthPopup.EVENT_CHANGE); + } + }); + }, + + _getItems: function(m) { // 纵向排列月 var month = [1, 7, 2, 8, 3, 9, 4, 10, 5, 11, 6, 12]; var items = []; @@ -39,37 +68,17 @@ BI.MonthPopup = BI.inherit(BI.Widget, { height: 23, width: 38, value: td, - text: td + text: td, + disabled: !BI.contains(m, td) }; }); }); - this.month = BI.createWidget({ - type: "bi.button_group", - element: this, - behaviors: o.behaviors, - items: BI.createItems(items, {}), - layouts: [BI.LogicFactory.createLogic("table", BI.extend({ - dynamic: true - }, { - columns: 2, - rows: 6, - columnSize: [1 / 2, 1 / 2], - rowSize: 25 - })), { - type: "bi.center_adapt", - vgap: 1, - hgap: 2 - }], - value: o.value - }); + return items; + }, - this.month.on(BI.Controller.EVENT_CHANGE, function (type) { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - if (type === BI.Events.CLICK) { - self.fireEvent(BI.MonthPopup.EVENT_CHANGE); - } - }); + populate: function(months) { + this.month.populate(this._getItems(months)); }, getValue: function () {