Browse Source

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

* commit '51e5b2f3be45952baf560d5262a15f32a23fa7e2':
  update
  BI-18929 月份输入0x下面的面板选不中
  update
es6
guy 7 years ago
parent
commit
c01c8089e5
  1. 40
      demo/js/case/combo/demo.text_value_down_list_combo.js
  2. 30
      dist/_fineui.min.js
  3. 16
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 14
      dist/bundle.min.js
  6. 40
      dist/demo.js
  7. 2
      dist/fineui.min.css
  8. 30
      dist/fineui.min.js
  9. 16
      dist/widget.js
  10. 2
      src/widget/dynamicdate/dynamicdate.trigger.js
  11. 2
      src/widget/dynamicdatetime/dynamicdatetime.trigger.js
  12. 4
      src/widget/filter/operation/filter.operation.js
  13. 1
      src/widget/yearquarter/combo.yearquarter.js
  14. 7
      src/widget/yearquarter/trigger.yearquarter.js

40
demo/js/case/combo/demo.text_value_down_list_combo.js

@ -18,25 +18,31 @@ Demo.TextValueDownListCombo = BI.inherit(BI.Widget, {
},
text: "默认值",
value: 11,
items: [
[{
el: {
text: "层级1",
value: 1
},
children: [{
text: "层级1-1",
value: 11
}]
}],
[{
text: "层级2",
value: 2
items: [[{
text: BI.i18nText("BI-Basic_Number_IN"),
value: 1,
cls: "dot-e-font"
}, {
text: BI.i18nText("BI-Basic_Not_Number_In"),
value: 2,
cls: "dot-e-font"
}], [{
el: {
text: BI.i18nText("BI-Basic_More_Than"),
value: 3,
cls: "dot-e-font"
},
value: 3,
children: [{
text: BI.i18nText("BI-Basic_Settled_Value"),
value: 4,
cls: "dot-e-font"
}, {
text: "层级3",
value: 3
text: BI.i18nText("BI-Basic_Average_Value"),
value: 4,
cls: "dot-e-font"
}]
]
}]]
}, {
type: "bi.button",
width: 90,

30
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/bundle.js vendored

@ -90888,7 +90888,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
type: BI.DynamicDateCombo.Static,
value: {
year: date[0] | 0,
month: date[1],
month: date[1] | 0,
day: date[2] | 0
}
};
@ -91826,7 +91826,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
type: BI.DynamicDateCombo.Static,
value: {
year: date[0] | 0,
month: date[1],
month: date[1] | 0,
day: date[2] | 0,
hour: date[3] | 0,
minute: date[4] | 0,
@ -93717,13 +93717,13 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
case BI.AbstractFilterItem.FILTER_OPERATION_FORMULA:
text = BI.i18nText("BI-Conf_Add_Formula");
cls = "filter-formula-font";
items = this.options.constants.FORMULA_COMBO;
items = self.options.constants.FORMULA_COMBO;
break;
case BI.AbstractFilterItem.FILTER_OPERATION_CONDITION:
default:
text = BI.i18nText("BI-Conf_Add_Condition");
cls = "filter-condition-font";
items = this.options.constants.CONDITION_COMBO;
items = self.options.constants.CONDITION_COMBO;
break;
}
@ -109505,7 +109505,6 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
});
this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_FOCUS, function () {
self.storeTriggerValue = self.trigger.getKey();
self.fireEvent(BI.DynamicYearQuarterCombo.EVENT_FOCUS);
});
this.combo = BI.createWidget({
@ -109896,6 +109895,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
watermark: BI.i18nText("BI-Basic_Unrestricted"),
hgap: c.hgap,
vgap: c.vgap,
title: "",
allowBlank: true
});
editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () {
@ -109976,7 +109976,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
},
_setInnerValue: function (date, text) {
var dateStr = date.print("%Y-%x");
var dateStr = date.print("%Y-%Q");
this.yearEditor.setValue(date.getFullYear());
this.quarterEditor.setValue(date.getQuarter());
this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr));
@ -110011,6 +110011,10 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
getValue: function () {
return this.storeValue;
},
getKey: function () {
return this.yearEditor.getValue() + "-" + this.quarterEditor.getValue();
}
});
BI.DynamicYearQuarterTrigger.EVENT_FOCUS = "EVENT_FOCUS";

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

14
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

40
dist/demo.js vendored

@ -2234,25 +2234,31 @@ Demo.TextValueDownListCombo = BI.inherit(BI.Widget, {
},
text: "默认值",
value: 11,
items: [
[{
el: {
text: "层级1",
value: 1
},
children: [{
text: "层级1-1",
value: 11
}]
}],
[{
text: "层级2",
value: 2
items: [[{
text: BI.i18nText("BI-Basic_Number_IN"),
value: 1,
cls: "dot-e-font"
}, {
text: BI.i18nText("BI-Basic_Not_Number_In"),
value: 2,
cls: "dot-e-font"
}], [{
el: {
text: BI.i18nText("BI-Basic_More_Than"),
value: 3,
cls: "dot-e-font"
},
value: 3,
children: [{
text: BI.i18nText("BI-Basic_Settled_Value"),
value: 4,
cls: "dot-e-font"
}, {
text: "层级3",
value: 3
text: BI.i18nText("BI-Basic_Average_Value"),
value: 4,
cls: "dot-e-font"
}]
]
}]]
}, {
type: "bi.button",
width: 90,

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

30
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/widget.js vendored

@ -3729,7 +3729,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
type: BI.DynamicDateCombo.Static,
value: {
year: date[0] | 0,
month: date[1],
month: date[1] | 0,
day: date[2] | 0
}
};
@ -4667,7 +4667,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
type: BI.DynamicDateCombo.Static,
value: {
year: date[0] | 0,
month: date[1],
month: date[1] | 0,
day: date[2] | 0,
hour: date[3] | 0,
minute: date[4] | 0,
@ -6558,13 +6558,13 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
case BI.AbstractFilterItem.FILTER_OPERATION_FORMULA:
text = BI.i18nText("BI-Conf_Add_Formula");
cls = "filter-formula-font";
items = this.options.constants.FORMULA_COMBO;
items = self.options.constants.FORMULA_COMBO;
break;
case BI.AbstractFilterItem.FILTER_OPERATION_CONDITION:
default:
text = BI.i18nText("BI-Conf_Add_Condition");
cls = "filter-condition-font";
items = this.options.constants.CONDITION_COMBO;
items = self.options.constants.CONDITION_COMBO;
break;
}
@ -22346,7 +22346,6 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
});
this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_FOCUS, function () {
self.storeTriggerValue = self.trigger.getKey();
self.fireEvent(BI.DynamicYearQuarterCombo.EVENT_FOCUS);
});
this.combo = BI.createWidget({
@ -22737,6 +22736,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
watermark: BI.i18nText("BI-Basic_Unrestricted"),
hgap: c.hgap,
vgap: c.vgap,
title: "",
allowBlank: true
});
editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () {
@ -22817,7 +22817,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
},
_setInnerValue: function (date, text) {
var dateStr = date.print("%Y-%x");
var dateStr = date.print("%Y-%Q");
this.yearEditor.setValue(date.getFullYear());
this.quarterEditor.setValue(date.getQuarter());
this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr));
@ -22852,6 +22852,10 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
getValue: function () {
return this.storeValue;
},
getKey: function () {
return this.yearEditor.getValue() + "-" + this.quarterEditor.getValue();
}
});
BI.DynamicYearQuarterTrigger.EVENT_FOCUS = "EVENT_FOCUS";

2
src/widget/dynamicdate/dynamicdate.trigger.js

@ -70,7 +70,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
type: BI.DynamicDateCombo.Static,
value: {
year: date[0] | 0,
month: date[1],
month: date[1] | 0,
day: date[2] | 0
}
};

2
src/widget/dynamicdatetime/dynamicdatetime.trigger.js

@ -70,7 +70,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
type: BI.DynamicDateCombo.Static,
value: {
year: date[0] | 0,
month: date[1],
month: date[1] | 0,
day: date[2] | 0,
hour: date[3] | 0,
minute: date[4] | 0,

4
src/widget/filter/operation/filter.operation.js

@ -179,13 +179,13 @@
case BI.AbstractFilterItem.FILTER_OPERATION_FORMULA:
text = BI.i18nText("BI-Conf_Add_Formula");
cls = "filter-formula-font";
items = this.options.constants.FORMULA_COMBO;
items = self.options.constants.FORMULA_COMBO;
break;
case BI.AbstractFilterItem.FILTER_OPERATION_CONDITION:
default:
text = BI.i18nText("BI-Conf_Add_Condition");
cls = "filter-condition-font";
items = this.options.constants.CONDITION_COMBO;
items = self.options.constants.CONDITION_COMBO;
break;
}

1
src/widget/yearquarter/combo.yearquarter.js

@ -46,7 +46,6 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
});
this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_FOCUS, function () {
self.storeTriggerValue = self.trigger.getKey();
self.fireEvent(BI.DynamicYearQuarterCombo.EVENT_FOCUS);
});
this.combo = BI.createWidget({

7
src/widget/yearquarter/trigger.yearquarter.js

@ -74,6 +74,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
watermark: BI.i18nText("BI-Basic_Unrestricted"),
hgap: c.hgap,
vgap: c.vgap,
title: "",
allowBlank: true
});
editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () {
@ -154,7 +155,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
},
_setInnerValue: function (date, text) {
var dateStr = date.print("%Y-%x");
var dateStr = date.print("%Y-%Q");
this.yearEditor.setValue(date.getFullYear());
this.quarterEditor.setValue(date.getQuarter());
this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr));
@ -189,6 +190,10 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
getValue: function () {
return this.storeValue;
},
getKey: function () {
return this.yearEditor.getValue() + "-" + this.quarterEditor.getValue();
}
});
BI.DynamicYearQuarterTrigger.EVENT_FOCUS = "EVENT_FOCUS";

Loading…
Cancel
Save