From bc608dc0ee9130c165cf22a35b09a6f1ad94e036 Mon Sep 17 00:00:00 2001 From: iapyang Date: Thu, 26 Apr 2018 17:20:22 +0800 Subject: [PATCH 1/3] 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); From 98eb3173b52c021661e90dded093297c34c0bf33 Mon Sep 17 00:00:00 2001 From: iapyang Date: Thu, 26 Apr 2018 17:23:01 +0800 Subject: [PATCH 2/3] update --- dist/bundle.js | 9 +++++++-- dist/widget.js | 9 +++++++-- src/widget/date/calendar/picker.year.js | 4 +++- src/widget/yearmonth/card.static.yearmonth.js | 3 ++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index 93a2dda54..793bedabe 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -87868,6 +87868,7 @@ BI.YearPicker = BI.inherit(BI.Widget, { var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { baseCls: "bi-year-picker bi-background", + behaviors: {}, height: 40, min: "1900-01-01", // 最小日期 max: "2099-12-31" // 最大日期 @@ -87908,6 +87909,7 @@ BI.YearPicker = BI.inherit(BI.Widget, { this.year = BI.createWidget({ type: "bi.year_date_combo", min: o.min, + behaviors: o.behaviors, max: o.max }); this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () { @@ -87968,7 +87970,8 @@ BI.YearPicker = BI.inherit(BI.Widget, { } }); BI.YearPicker.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.year_picker", BI.YearPicker);/** +BI.shortcut("bi.year_picker", BI.YearPicker); +/** * Created by GUY on 2015/9/7. * @class BI.DateCalendarPopup * @extends BI.Widget @@ -108404,6 +108407,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear ref: function () { self.yearPicker = this; }, + behaviors: o.behaviors, height: 30, listeners: [{ eventName: BI.YearPicker.EVENT_CHANGE, @@ -108475,7 +108479,8 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear } }); BI.StaticYearMonthCard.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard);BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { +BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard); +BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { props: { baseCls: "bi-year-month-combo bi-border", diff --git a/dist/widget.js b/dist/widget.js index febff6a0a..3136d6793 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -709,6 +709,7 @@ BI.YearPicker = BI.inherit(BI.Widget, { var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { baseCls: "bi-year-picker bi-background", + behaviors: {}, height: 40, min: "1900-01-01", // 最小日期 max: "2099-12-31" // 最大日期 @@ -749,6 +750,7 @@ BI.YearPicker = BI.inherit(BI.Widget, { this.year = BI.createWidget({ type: "bi.year_date_combo", min: o.min, + behaviors: o.behaviors, max: o.max }); this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () { @@ -809,7 +811,8 @@ BI.YearPicker = BI.inherit(BI.Widget, { } }); BI.YearPicker.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.year_picker", BI.YearPicker);/** +BI.shortcut("bi.year_picker", BI.YearPicker); +/** * Created by GUY on 2015/9/7. * @class BI.DateCalendarPopup * @extends BI.Widget @@ -21245,6 +21248,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear ref: function () { self.yearPicker = this; }, + behaviors: o.behaviors, height: 30, listeners: [{ eventName: BI.YearPicker.EVENT_CHANGE, @@ -21316,7 +21320,8 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear } }); BI.StaticYearMonthCard.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard);BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { +BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard); +BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { props: { baseCls: "bi-year-month-combo bi-border", diff --git a/src/widget/date/calendar/picker.year.js b/src/widget/date/calendar/picker.year.js index bfd3de39e..5fe5deef2 100644 --- a/src/widget/date/calendar/picker.year.js +++ b/src/widget/date/calendar/picker.year.js @@ -8,6 +8,7 @@ BI.YearPicker = BI.inherit(BI.Widget, { var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { baseCls: "bi-year-picker bi-background", + behaviors: {}, height: 40, min: "1900-01-01", // 最小日期 max: "2099-12-31" // 最大日期 @@ -48,6 +49,7 @@ BI.YearPicker = BI.inherit(BI.Widget, { this.year = BI.createWidget({ type: "bi.year_date_combo", min: o.min, + behaviors: o.behaviors, max: o.max }); this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () { @@ -108,4 +110,4 @@ BI.YearPicker = BI.inherit(BI.Widget, { } }); BI.YearPicker.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.year_picker", BI.YearPicker); \ No newline at end of file +BI.shortcut("bi.year_picker", BI.YearPicker); diff --git a/src/widget/yearmonth/card.static.yearmonth.js b/src/widget/yearmonth/card.static.yearmonth.js index d208ba6d2..b0860ad42 100644 --- a/src/widget/yearmonth/card.static.yearmonth.js +++ b/src/widget/yearmonth/card.static.yearmonth.js @@ -42,6 +42,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, { ref: function () { self.yearPicker = this; }, + behaviors: o.behaviors, height: 30, listeners: [{ eventName: BI.YearPicker.EVENT_CHANGE, @@ -113,4 +114,4 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, { } }); BI.StaticYearMonthCard.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard); \ No newline at end of file +BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard); From 83d6e63d578264fc112ed5bd4091aecb56134311 Mon Sep 17 00:00:00 2001 From: iapyang Date: Thu, 26 Apr 2018 17:31:11 +0800 Subject: [PATCH 3/3] update --- dist/bundle.js | 4 +++- dist/widget.js | 4 +++- src/widget/yearquarter/card.static.yearquarter.js | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index 793bedabe..ebd00ea14 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -109392,6 +109392,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static ref: function () { self.yearPicker = this; }, + behaviors: o.behaviors, height: 30, listeners: [{ eventName: BI.YearPicker.EVENT_CHANGE, @@ -109455,7 +109456,8 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static } }); BI.StaticYearQuarterCard.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard);BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { +BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard); +BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { props: { baseCls: "bi-year-quarter-combo bi-border", diff --git a/dist/widget.js b/dist/widget.js index 3136d6793..afc2b32ce 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -22233,6 +22233,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static ref: function () { self.yearPicker = this; }, + behaviors: o.behaviors, height: 30, listeners: [{ eventName: BI.YearPicker.EVENT_CHANGE, @@ -22296,7 +22297,8 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static } }); BI.StaticYearQuarterCard.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard);BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { +BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard); +BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { props: { baseCls: "bi-year-quarter-combo bi-border", diff --git a/src/widget/yearquarter/card.static.yearquarter.js b/src/widget/yearquarter/card.static.yearquarter.js index 8e0fc27fa..1d2793784 100644 --- a/src/widget/yearquarter/card.static.yearquarter.js +++ b/src/widget/yearquarter/card.static.yearquarter.js @@ -42,6 +42,7 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, { ref: function () { self.yearPicker = this; }, + behaviors: o.behaviors, height: 30, listeners: [{ eventName: BI.YearPicker.EVENT_CHANGE, @@ -105,4 +106,4 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, { } }); BI.StaticYearQuarterCard.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard); \ No newline at end of file +BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard);