fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #362 in FUI/fineui from ~TELLER/fineui:bugfix/BI-18317 to master 

* commit '83d6e63d578264fc112ed5bd4091aecb56134311':
  update
  update
  update
es6
guy 7 years ago
parent
8d6e7b1a6f 83d6e63d57
commit
4b188fb1ce
6 changed files with 38 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      dist/bundle.js
  2. 18
      dist/widget.js
  3. 2
      src/widget/date/calendar/combo.year.date.js
  4. 2
      src/widget/date/calendar/picker.year.js
  5. 1
      src/widget/yearmonth/card.static.yearmonth.js
  6. 1
      src/widget/yearquarter/card.static.yearquarter.js

18
dist/bundle.js vendored
Unescape View File

@ -87649,6 +87649,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
baseCls: "bi-year-combo", baseCls: "bi-year-combo",
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
behaviors: {},
height: 25 height: 25
}); });
}, },
@ -87662,6 +87663,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.year_popup", type: "bi.year_popup",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -87701,7 +87703,8 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
} }
}); });
BI.YearDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; 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. * Created by GUY on 2015/9/7.
* @class BI.DatePicker * @class BI.DatePicker
* @extends BI.Widget * @extends BI.Widget
@ -87865,6 +87868,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments); var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: "bi-year-picker bi-background", baseCls: "bi-year-picker bi-background",
behaviors: {},
height: 40, height: 40,
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31" // 最大日期 max: "2099-12-31" // 最大日期
@ -87905,6 +87909,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({ this.year = BI.createWidget({
type: "bi.year_date_combo", type: "bi.year_date_combo",
min: o.min, min: o.min,
behaviors: o.behaviors,
max: o.max max: o.max
}); });
this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () { this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () {
@ -87965,7 +87970,8 @@ BI.YearPicker = BI.inherit(BI.Widget, {
} }
}); });
BI.YearPicker.EVENT_CHANGE = "EVENT_CHANGE"; 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. * Created by GUY on 2015/9/7.
* @class BI.DateCalendarPopup * @class BI.DateCalendarPopup
* @extends BI.Widget * @extends BI.Widget
@ -108401,6 +108407,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
ref: function () { ref: function () {
self.yearPicker = this; self.yearPicker = this;
}, },
behaviors: o.behaviors,
height: 30, height: 30,
listeners: [{ listeners: [{
eventName: BI.YearPicker.EVENT_CHANGE, eventName: BI.YearPicker.EVENT_CHANGE,
@ -108472,7 +108479,8 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
} }
}); });
BI.StaticYearMonthCard.EVENT_CHANGE = "EVENT_CHANGE"; 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: { props: {
baseCls: "bi-year-month-combo bi-border", baseCls: "bi-year-month-combo bi-border",
@ -109384,6 +109392,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static
ref: function () { ref: function () {
self.yearPicker = this; self.yearPicker = this;
}, },
behaviors: o.behaviors,
height: 30, height: 30,
listeners: [{ listeners: [{
eventName: BI.YearPicker.EVENT_CHANGE, eventName: BI.YearPicker.EVENT_CHANGE,
@ -109447,7 +109456,8 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static
} }
}); });
BI.StaticYearQuarterCard.EVENT_CHANGE = "EVENT_CHANGE"; 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: { props: {
baseCls: "bi-year-quarter-combo bi-border", baseCls: "bi-year-quarter-combo bi-border",

18
dist/widget.js vendored
Unescape View File

@ -490,6 +490,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
baseCls: "bi-year-combo", baseCls: "bi-year-combo",
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
behaviors: {},
height: 25 height: 25
}); });
}, },
@ -503,6 +504,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.year_popup", type: "bi.year_popup",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });
@ -542,7 +544,8 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
} }
}); });
BI.YearDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; 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. * Created by GUY on 2015/9/7.
* @class BI.DatePicker * @class BI.DatePicker
* @extends BI.Widget * @extends BI.Widget
@ -706,6 +709,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments); var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: "bi-year-picker bi-background", baseCls: "bi-year-picker bi-background",
behaviors: {},
height: 40, height: 40,
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31" // 最大日期 max: "2099-12-31" // 最大日期
@ -746,6 +750,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({ this.year = BI.createWidget({
type: "bi.year_date_combo", type: "bi.year_date_combo",
min: o.min, min: o.min,
behaviors: o.behaviors,
max: o.max max: o.max
}); });
this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () { this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () {
@ -806,7 +811,8 @@ BI.YearPicker = BI.inherit(BI.Widget, {
} }
}); });
BI.YearPicker.EVENT_CHANGE = "EVENT_CHANGE"; 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. * Created by GUY on 2015/9/7.
* @class BI.DateCalendarPopup * @class BI.DateCalendarPopup
* @extends BI.Widget * @extends BI.Widget
@ -21242,6 +21248,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
ref: function () { ref: function () {
self.yearPicker = this; self.yearPicker = this;
}, },
behaviors: o.behaviors,
height: 30, height: 30,
listeners: [{ listeners: [{
eventName: BI.YearPicker.EVENT_CHANGE, eventName: BI.YearPicker.EVENT_CHANGE,
@ -21313,7 +21320,8 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
} }
}); });
BI.StaticYearMonthCard.EVENT_CHANGE = "EVENT_CHANGE"; 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: { props: {
baseCls: "bi-year-month-combo bi-border", baseCls: "bi-year-month-combo bi-border",
@ -22225,6 +22233,7 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static
ref: function () { ref: function () {
self.yearPicker = this; self.yearPicker = this;
}, },
behaviors: o.behaviors,
height: 30, height: 30,
listeners: [{ listeners: [{
eventName: BI.YearPicker.EVENT_CHANGE, eventName: BI.YearPicker.EVENT_CHANGE,
@ -22288,7 +22297,8 @@ BI.shortcut("bi.dynamic_year_quarter_card", BI.DynamicYearQuarterCard);BI.Static
} }
}); });
BI.StaticYearQuarterCard.EVENT_CHANGE = "EVENT_CHANGE"; 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: { props: {
baseCls: "bi-year-quarter-combo bi-border", baseCls: "bi-year-quarter-combo bi-border",

2
src/widget/date/calendar/combo.year.date.js
Unescape View File

@ -11,6 +11,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
baseCls: "bi-year-combo", baseCls: "bi-year-combo",
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期 max: "2099-12-31", // 最大日期
behaviors: {},
height: 25 height: 25
}); });
}, },
@ -24,6 +25,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.year_popup", type: "bi.year_popup",
behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max max: o.max
}); });

2
src/widget/date/calendar/picker.year.js
Unescape View File

@ -8,6 +8,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments); var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: "bi-year-picker bi-background", baseCls: "bi-year-picker bi-background",
behaviors: {},
height: 40, height: 40,
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31" // 最大日期 max: "2099-12-31" // 最大日期
@ -48,6 +49,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
this.year = BI.createWidget({ this.year = BI.createWidget({
type: "bi.year_date_combo", type: "bi.year_date_combo",
min: o.min, min: o.min,
behaviors: o.behaviors,
max: o.max max: o.max
}); });
this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () { this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () {

1
src/widget/yearmonth/card.static.yearmonth.js
Unescape View File

@ -42,6 +42,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
ref: function () { ref: function () {
self.yearPicker = this; self.yearPicker = this;
}, },
behaviors: o.behaviors,
height: 30, height: 30,
listeners: [{ listeners: [{
eventName: BI.YearPicker.EVENT_CHANGE, eventName: BI.YearPicker.EVENT_CHANGE,

1
src/widget/yearquarter/card.static.yearquarter.js
Unescape View File

@ -42,6 +42,7 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
ref: function () { ref: function () {
self.yearPicker = this; self.yearPicker = this;
}, },
behaviors: o.behaviors,
height: 30, height: 30,
listeners: [{ listeners: [{
eventName: BI.YearPicker.EVENT_CHANGE, eventName: BI.YearPicker.EVENT_CHANGE,

Write Preview
Loading…
Cancel
Save