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

BI-18929 月份输入0x下面的面板选不中

es6
windy 7 years ago
parent
7d672cd55e
commit
adcfd0eb4b
12 changed files with 97 additions and 73 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. 34
      demo/js/case/combo/demo.text_value_down_list_combo.js
  2. 16
      dist/_fineui.min.js
  3. 16
      dist/bundle.js
  4. 10
      dist/bundle.min.js
  5. 34
      dist/demo.js
  6. 16
      dist/fineui.min.js
  7. 16
      dist/widget.js
  8. 2
      src/widget/dynamicdate/dynamicdate.trigger.js
  9. 2
      src/widget/dynamicdatetime/dynamicdatetime.trigger.js
  10. 4
      src/widget/filter/operation/filter.operation.js
  11. 1
      src/widget/yearquarter/combo.yearquarter.js
  12. 7
      src/widget/yearquarter/trigger.yearquarter.js

34
demo/js/case/combo/demo.text_value_down_list_combo.js
Unescape View File

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

16
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/bundle.js vendored
Unescape View File

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

10
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

34
dist/demo.js vendored
Unescape View File

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

16
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/widget.js vendored
Unescape View File

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

2
src/widget/dynamicdate/dynamicdate.trigger.js
Unescape View File

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

2
src/widget/dynamicdatetime/dynamicdatetime.trigger.js
Unescape View File

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

4
src/widget/filter/operation/filter.operation.js
Unescape View File

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

1
src/widget/yearquarter/combo.yearquarter.js
Unescape View File

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

7
src/widget/yearquarter/trigger.yearquarter.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save