Browse Source

Merge pull request #404 in FUI/fineui from ~WINDY/fui:master to master

* commit '1ad6936c90d034cc01af66faf617fa7a4b8a4799':
  update
  BI-21411
master
guy 7 years ago
parent
commit
3640025984
  1. 6
      dist/_fineui.min.js
  2. 30
      dist/bundle.js
  3. 8
      dist/bundle.min.js
  4. 30
      dist/fineui.js
  5. 6
      dist/fineui.min.js
  6. 30
      dist/widget.js
  7. 30
      src/widget/year/trigger.year.js

6
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

30
dist/bundle.js vendored

@ -108714,6 +108714,13 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
height: 24
});
},
beforeInit: function (callback) {
var o = this.options;
o.title = BI.bind(this._titleCreator, this);
callback();
},
_init: function () {
BI.DynamicYearTrigger.superclass._init.apply(this, arguments);
var self = this, o = this.options, c = this._const;
@ -108803,7 +108810,27 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
var dateStr = date.print("%Y");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr));
},
_titleCreator: function () {
var storeValue = this.storeValue || {};
var type = storeValue.type || BI.DynamicDateCombo.Static;
var value = storeValue.value;
if(!this.editor.isValid()) {
return "";
}
switch (type) {
case BI.DynamicDateCombo.Dynamic:
var text = this._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = date.print("%Y");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
value = value || {};
return value.year;
}
},
setValue: function (v) {
@ -108825,7 +108852,6 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
value = value || {};
this.editor.setState(value.year);
this.editor.setValue(value.year);
this.setTitle(value.year);
break;
}
},

8
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

30
dist/fineui.js vendored

@ -108957,6 +108957,13 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
height: 24
});
},
beforeInit: function (callback) {
var o = this.options;
o.title = BI.bind(this._titleCreator, this);
callback();
},
_init: function () {
BI.DynamicYearTrigger.superclass._init.apply(this, arguments);
var self = this, o = this.options, c = this._const;
@ -109046,7 +109053,27 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
var dateStr = date.print("%Y");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr));
},
_titleCreator: function () {
var storeValue = this.storeValue || {};
var type = storeValue.type || BI.DynamicDateCombo.Static;
var value = storeValue.value;
if(!this.editor.isValid()) {
return "";
}
switch (type) {
case BI.DynamicDateCombo.Dynamic:
var text = this._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = date.print("%Y");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
value = value || {};
return value.year;
}
},
setValue: function (v) {
@ -109068,7 +109095,6 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
value = value || {};
this.editor.setState(value.year);
this.editor.setValue(value.year);
this.setTitle(value.year);
break;
}
},

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

30
dist/widget.js vendored

@ -21154,6 +21154,13 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
height: 24
});
},
beforeInit: function (callback) {
var o = this.options;
o.title = BI.bind(this._titleCreator, this);
callback();
},
_init: function () {
BI.DynamicYearTrigger.superclass._init.apply(this, arguments);
var self = this, o = this.options, c = this._const;
@ -21243,7 +21250,27 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
var dateStr = date.print("%Y");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr));
},
_titleCreator: function () {
var storeValue = this.storeValue || {};
var type = storeValue.type || BI.DynamicDateCombo.Static;
var value = storeValue.value;
if(!this.editor.isValid()) {
return "";
}
switch (type) {
case BI.DynamicDateCombo.Dynamic:
var text = this._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = date.print("%Y");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
value = value || {};
return value.year;
}
},
setValue: function (v) {
@ -21265,7 +21292,6 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
value = value || {};
this.editor.setState(value.year);
this.editor.setValue(value.year);
this.setTitle(value.year);
break;
}
},

30
src/widget/year/trigger.year.js

@ -12,6 +12,13 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
height: 24
});
},
beforeInit: function (callback) {
var o = this.options;
o.title = BI.bind(this._titleCreator, this);
callback();
},
_init: function () {
BI.DynamicYearTrigger.superclass._init.apply(this, arguments);
var self = this, o = this.options, c = this._const;
@ -101,7 +108,27 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
var dateStr = date.print("%Y");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr));
},
_titleCreator: function () {
var storeValue = this.storeValue || {};
var type = storeValue.type || BI.DynamicDateCombo.Static;
var value = storeValue.value;
if(!this.editor.isValid()) {
return "";
}
switch (type) {
case BI.DynamicDateCombo.Dynamic:
var text = this._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = date.print("%Y");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
value = value || {};
return value.year;
}
},
setValue: function (v) {
@ -123,7 +150,6 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
value = value || {};
this.editor.setState(value.year);
this.editor.setValue(value.year);
this.setTitle(value.year);
break;
}
},

Loading…
Cancel
Save