From bc608dc0ee9130c165cf22a35b09a6f1ad94e036 Mon Sep 17 00:00:00 2001 From: iapyang Date: Thu, 26 Apr 2018 17:20:22 +0800 Subject: [PATCH] update --- dist/bundle.js | 5 ++++- dist/widget.js | 5 ++++- src/widget/date/calendar/combo.year.date.js | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index d1a647078..93a2dda54 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -87649,6 +87649,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, { baseCls: "bi-year-combo", min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 + behaviors: {}, height: 25 }); }, @@ -87662,6 +87663,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, { this.popup = BI.createWidget({ type: "bi.year_popup", + behaviors: o.behaviors, min: o.min, max: o.max }); @@ -87701,7 +87703,8 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, { } }); BI.YearDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.year_date_combo", BI.YearDateCombo);/** +BI.shortcut("bi.year_date_combo", BI.YearDateCombo); +/** * Created by GUY on 2015/9/7. * @class BI.DatePicker * @extends BI.Widget diff --git a/dist/widget.js b/dist/widget.js index 4796f32a4..febff6a0a 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -490,6 +490,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, { baseCls: "bi-year-combo", min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 + behaviors: {}, height: 25 }); }, @@ -503,6 +504,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, { this.popup = BI.createWidget({ type: "bi.year_popup", + behaviors: o.behaviors, min: o.min, max: o.max }); @@ -542,7 +544,8 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, { } }); BI.YearDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.year_date_combo", BI.YearDateCombo);/** +BI.shortcut("bi.year_date_combo", BI.YearDateCombo); +/** * Created by GUY on 2015/9/7. * @class BI.DatePicker * @extends BI.Widget diff --git a/src/widget/date/calendar/combo.year.date.js b/src/widget/date/calendar/combo.year.date.js index e75df254f..7cfa955ee 100644 --- a/src/widget/date/calendar/combo.year.date.js +++ b/src/widget/date/calendar/combo.year.date.js @@ -11,6 +11,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, { baseCls: "bi-year-combo", min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 + behaviors: {}, height: 25 }); }, @@ -24,6 +25,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, { this.popup = BI.createWidget({ type: "bi.year_popup", + behaviors: o.behaviors, min: o.min, max: o.max }); @@ -63,4 +65,4 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, { } }); BI.YearDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.year_date_combo", BI.YearDateCombo); \ No newline at end of file +BI.shortcut("bi.year_date_combo", BI.YearDateCombo);