diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 07fd48d7e3..ded8b0e714 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -48463,7 +48463,7 @@ BI.Input = BI.inherit(BI.Single, { if (keyCode == BI.KeyCode.BACKSPACE || keyCode == BI.KeyCode.DELETE) { this.fireEvent(BI.Input.EVENT_BACKSPACE); } - this.fireEvent(BI.Input.EVENT_KEY_DOWN); + this.fireEvent(BI.Input.EVENT_KEY_DOWN, arguments); // _valueChange中会更新_lastValue, 这边缓存用以后续STOP事件服务 var lastValue = this._lastValue; @@ -59661,8 +59661,8 @@ BI.ListLoader = BI.inherit(BI.Widget, { addItems: function (items) { this.count += items.length; if (BI.isObject(this.next)) { + this.options.items = this.options.items.concat(items); if (this.hasNext()) { - this.options.items = this.options.items.concat(items); this.next.setLoaded(); } else { this.next.setEnd(); @@ -64692,6 +64692,7 @@ BI.extend(BI.DynamicDateCard, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTrigger.EVENT_STOP, @@ -64910,6 +64911,7 @@ BI.extend(BI.DynamicDateCard, { } }); +BI.DynamicDateCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -65310,7 +65312,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -65658,6 +65660,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateTimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTimeTrigger.EVENT_STOP, @@ -65879,6 +65882,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateTimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateTimeCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -66386,7 +66390,7 @@ BI.extend(BI.DynamicDateTimeSelect, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -69991,7 +69995,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value), + text: o.text, value: o.value, height: o.height, tipText: "", @@ -70070,6 +70074,13 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, + mounted: function () { + var o = this.options; + if(BI.isKey(o.value)) { + this.setValue([o.value]); + } + }, + _digest: function (v) { return this.options.valueFormatter(v); }, @@ -83358,6 +83369,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.TimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: "EVENT_STOP", @@ -83491,6 +83503,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); + BI.TimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_VALID = "EVENT_VALID"; @@ -83555,7 +83568,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { listeners: [{ eventName: "EVENT_KEY_DOWN", action: function () { - self.fireEvent("EVENT_KEY_DOWN"); + self.fireEvent("EVENT_KEY_DOWN", arguments); } }, { eventName: "EVENT_FOCUS", @@ -89315,7 +89328,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () { }());BI.i18n = { "BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Month_Begin": "月初", - "BI-Multi_Date_YMD": "年/月/日", + "BI-Multi_Date_YMD": "年月日", "BI-Custom_Color": "自定义颜色", "BI-Numerical_Interval_Input_Data": "请输入数值", "BI-Please_Input_Natural_Number": "请输入非负整数", diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 960ee134f6..fb76d718cd 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -48867,7 +48867,7 @@ BI.Input = BI.inherit(BI.Single, { if (keyCode == BI.KeyCode.BACKSPACE || keyCode == BI.KeyCode.DELETE) { this.fireEvent(BI.Input.EVENT_BACKSPACE); } - this.fireEvent(BI.Input.EVENT_KEY_DOWN); + this.fireEvent(BI.Input.EVENT_KEY_DOWN, arguments); // _valueChange中会更新_lastValue, 这边缓存用以后续STOP事件服务 var lastValue = this._lastValue; @@ -60065,8 +60065,8 @@ BI.ListLoader = BI.inherit(BI.Widget, { addItems: function (items) { this.count += items.length; if (BI.isObject(this.next)) { + this.options.items = this.options.items.concat(items); if (this.hasNext()) { - this.options.items = this.options.items.concat(items); this.next.setLoaded(); } else { this.next.setEnd(); @@ -65096,6 +65096,7 @@ BI.extend(BI.DynamicDateCard, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTrigger.EVENT_STOP, @@ -65314,6 +65315,7 @@ BI.extend(BI.DynamicDateCard, { } }); +BI.DynamicDateCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -65714,7 +65716,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -66062,6 +66064,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateTimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTimeTrigger.EVENT_STOP, @@ -66283,6 +66286,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateTimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateTimeCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -66790,7 +66794,7 @@ BI.extend(BI.DynamicDateTimeSelect, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -70395,7 +70399,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value), + text: o.text, value: o.value, height: o.height, tipText: "", @@ -70474,6 +70478,13 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, + mounted: function () { + var o = this.options; + if(BI.isKey(o.value)) { + this.setValue([o.value]); + } + }, + _digest: function (v) { return this.options.valueFormatter(v); }, @@ -83762,6 +83773,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.TimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: "EVENT_STOP", @@ -83895,6 +83907,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); + BI.TimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_VALID = "EVENT_VALID"; @@ -83959,7 +83972,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { listeners: [{ eventName: "EVENT_KEY_DOWN", action: function () { - self.fireEvent("EVENT_KEY_DOWN"); + self.fireEvent("EVENT_KEY_DOWN", arguments); } }, { eventName: "EVENT_FOCUS", @@ -89649,7 +89662,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () { }());BI.i18n = { "BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Month_Begin": "月初", - "BI-Multi_Date_YMD": "年/月/日", + "BI-Multi_Date_YMD": "年月日", "BI-Custom_Color": "自定义颜色", "BI-Numerical_Interval_Input_Data": "请输入数值", "BI-Please_Input_Natural_Number": "请输入非负整数", diff --git a/dist/base.js b/dist/base.js index ee6761a36f..76cf288140 100644 --- a/dist/base.js +++ b/dist/base.js @@ -10601,7 +10601,7 @@ BI.Input = BI.inherit(BI.Single, { if (keyCode == BI.KeyCode.BACKSPACE || keyCode == BI.KeyCode.DELETE) { this.fireEvent(BI.Input.EVENT_BACKSPACE); } - this.fireEvent(BI.Input.EVENT_KEY_DOWN); + this.fireEvent(BI.Input.EVENT_KEY_DOWN, arguments); // _valueChange中会更新_lastValue, 这边缓存用以后续STOP事件服务 var lastValue = this._lastValue; diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 07fd48d7e3..ded8b0e714 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -48463,7 +48463,7 @@ BI.Input = BI.inherit(BI.Single, { if (keyCode == BI.KeyCode.BACKSPACE || keyCode == BI.KeyCode.DELETE) { this.fireEvent(BI.Input.EVENT_BACKSPACE); } - this.fireEvent(BI.Input.EVENT_KEY_DOWN); + this.fireEvent(BI.Input.EVENT_KEY_DOWN, arguments); // _valueChange中会更新_lastValue, 这边缓存用以后续STOP事件服务 var lastValue = this._lastValue; @@ -59661,8 +59661,8 @@ BI.ListLoader = BI.inherit(BI.Widget, { addItems: function (items) { this.count += items.length; if (BI.isObject(this.next)) { + this.options.items = this.options.items.concat(items); if (this.hasNext()) { - this.options.items = this.options.items.concat(items); this.next.setLoaded(); } else { this.next.setEnd(); @@ -64692,6 +64692,7 @@ BI.extend(BI.DynamicDateCard, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTrigger.EVENT_STOP, @@ -64910,6 +64911,7 @@ BI.extend(BI.DynamicDateCard, { } }); +BI.DynamicDateCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -65310,7 +65312,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -65658,6 +65660,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateTimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTimeTrigger.EVENT_STOP, @@ -65879,6 +65882,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateTimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateTimeCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -66386,7 +66390,7 @@ BI.extend(BI.DynamicDateTimeSelect, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -69991,7 +69995,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value), + text: o.text, value: o.value, height: o.height, tipText: "", @@ -70070,6 +70074,13 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, + mounted: function () { + var o = this.options; + if(BI.isKey(o.value)) { + this.setValue([o.value]); + } + }, + _digest: function (v) { return this.options.valueFormatter(v); }, @@ -83358,6 +83369,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.TimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: "EVENT_STOP", @@ -83491,6 +83503,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); + BI.TimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_VALID = "EVENT_VALID"; @@ -83555,7 +83568,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { listeners: [{ eventName: "EVENT_KEY_DOWN", action: function () { - self.fireEvent("EVENT_KEY_DOWN"); + self.fireEvent("EVENT_KEY_DOWN", arguments); } }, { eventName: "EVENT_FOCUS", @@ -89315,7 +89328,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () { }());BI.i18n = { "BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Month_Begin": "月初", - "BI-Multi_Date_YMD": "年/月/日", + "BI-Multi_Date_YMD": "年月日", "BI-Custom_Color": "自定义颜色", "BI-Numerical_Interval_Input_Data": "请输入数值", "BI-Please_Input_Natural_Number": "请输入非负整数", diff --git a/dist/bundle.js b/dist/bundle.js index 960ee134f6..fb76d718cd 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -48867,7 +48867,7 @@ BI.Input = BI.inherit(BI.Single, { if (keyCode == BI.KeyCode.BACKSPACE || keyCode == BI.KeyCode.DELETE) { this.fireEvent(BI.Input.EVENT_BACKSPACE); } - this.fireEvent(BI.Input.EVENT_KEY_DOWN); + this.fireEvent(BI.Input.EVENT_KEY_DOWN, arguments); // _valueChange中会更新_lastValue, 这边缓存用以后续STOP事件服务 var lastValue = this._lastValue; @@ -60065,8 +60065,8 @@ BI.ListLoader = BI.inherit(BI.Widget, { addItems: function (items) { this.count += items.length; if (BI.isObject(this.next)) { + this.options.items = this.options.items.concat(items); if (this.hasNext()) { - this.options.items = this.options.items.concat(items); this.next.setLoaded(); } else { this.next.setEnd(); @@ -65096,6 +65096,7 @@ BI.extend(BI.DynamicDateCard, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTrigger.EVENT_STOP, @@ -65314,6 +65315,7 @@ BI.extend(BI.DynamicDateCard, { } }); +BI.DynamicDateCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -65714,7 +65716,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -66062,6 +66064,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateTimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTimeTrigger.EVENT_STOP, @@ -66283,6 +66286,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateTimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateTimeCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -66790,7 +66794,7 @@ BI.extend(BI.DynamicDateTimeSelect, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -70395,7 +70399,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value), + text: o.text, value: o.value, height: o.height, tipText: "", @@ -70474,6 +70478,13 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, + mounted: function () { + var o = this.options; + if(BI.isKey(o.value)) { + this.setValue([o.value]); + } + }, + _digest: function (v) { return this.options.valueFormatter(v); }, @@ -83762,6 +83773,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.TimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: "EVENT_STOP", @@ -83895,6 +83907,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); + BI.TimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_VALID = "EVENT_VALID"; @@ -83959,7 +83972,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { listeners: [{ eventName: "EVENT_KEY_DOWN", action: function () { - self.fireEvent("EVENT_KEY_DOWN"); + self.fireEvent("EVENT_KEY_DOWN", arguments); } }, { eventName: "EVENT_FOCUS", @@ -89649,7 +89662,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () { }());BI.i18n = { "BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Month_Begin": "月初", - "BI-Multi_Date_YMD": "年/月/日", + "BI-Multi_Date_YMD": "年月日", "BI-Custom_Color": "自定义颜色", "BI-Numerical_Interval_Input_Data": "请输入数值", "BI-Please_Input_Natural_Number": "请输入非负整数", diff --git a/dist/case.js b/dist/case.js index 6b9082132f..6d4b3ce86e 100644 --- a/dist/case.js +++ b/dist/case.js @@ -7641,8 +7641,8 @@ BI.ListLoader = BI.inherit(BI.Widget, { addItems: function (items) { this.count += items.length; if (BI.isObject(this.next)) { + this.options.items = this.options.items.concat(items); if (this.hasNext()) { - this.options.items = this.options.items.concat(items); this.next.setLoaded(); } else { this.next.setEnd(); diff --git a/dist/config.js b/dist/config.js index e362f2b633..78d503020f 100644 --- a/dist/config.js +++ b/dist/config.js @@ -2,7 +2,7 @@ BI.i18n = { "BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Month_Begin": "月初", - "BI-Multi_Date_YMD": "年/月/日", + "BI-Multi_Date_YMD": "年月日", "BI-Custom_Color": "自定义颜色", "BI-Numerical_Interval_Input_Data": "请输入数值", "BI-Please_Input_Natural_Number": "请输入非负整数", diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 167a887dbf..3640b7b2d7 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -48708,7 +48708,7 @@ BI.Input = BI.inherit(BI.Single, { if (keyCode == BI.KeyCode.BACKSPACE || keyCode == BI.KeyCode.DELETE) { this.fireEvent(BI.Input.EVENT_BACKSPACE); } - this.fireEvent(BI.Input.EVENT_KEY_DOWN); + this.fireEvent(BI.Input.EVENT_KEY_DOWN, arguments); // _valueChange中会更新_lastValue, 这边缓存用以后续STOP事件服务 var lastValue = this._lastValue; @@ -59906,8 +59906,8 @@ BI.ListLoader = BI.inherit(BI.Widget, { addItems: function (items) { this.count += items.length; if (BI.isObject(this.next)) { + this.options.items = this.options.items.concat(items); if (this.hasNext()) { - this.options.items = this.options.items.concat(items); this.next.setLoaded(); } else { this.next.setEnd(); @@ -64937,6 +64937,7 @@ BI.extend(BI.DynamicDateCard, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTrigger.EVENT_STOP, @@ -65155,6 +65156,7 @@ BI.extend(BI.DynamicDateCard, { } }); +BI.DynamicDateCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -65555,7 +65557,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -65903,6 +65905,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateTimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTimeTrigger.EVENT_STOP, @@ -66124,6 +66127,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateTimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateTimeCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -66631,7 +66635,7 @@ BI.extend(BI.DynamicDateTimeSelect, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -70236,7 +70240,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value), + text: o.text, value: o.value, height: o.height, tipText: "", @@ -70315,6 +70319,13 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, + mounted: function () { + var o = this.options; + if(BI.isKey(o.value)) { + this.setValue([o.value]); + } + }, + _digest: function (v) { return this.options.valueFormatter(v); }, @@ -83603,6 +83614,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.TimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: "EVENT_STOP", @@ -83736,6 +83748,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); + BI.TimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_VALID = "EVENT_VALID"; @@ -83800,7 +83813,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { listeners: [{ eventName: "EVENT_KEY_DOWN", action: function () { - self.fireEvent("EVENT_KEY_DOWN"); + self.fireEvent("EVENT_KEY_DOWN", arguments); } }, { eventName: "EVENT_FOCUS", diff --git a/dist/fineui.js b/dist/fineui.js index c89e58137d..ca1b3646fc 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -49112,7 +49112,7 @@ BI.Input = BI.inherit(BI.Single, { if (keyCode == BI.KeyCode.BACKSPACE || keyCode == BI.KeyCode.DELETE) { this.fireEvent(BI.Input.EVENT_BACKSPACE); } - this.fireEvent(BI.Input.EVENT_KEY_DOWN); + this.fireEvent(BI.Input.EVENT_KEY_DOWN, arguments); // _valueChange中会更新_lastValue, 这边缓存用以后续STOP事件服务 var lastValue = this._lastValue; @@ -60310,8 +60310,8 @@ BI.ListLoader = BI.inherit(BI.Widget, { addItems: function (items) { this.count += items.length; if (BI.isObject(this.next)) { + this.options.items = this.options.items.concat(items); if (this.hasNext()) { - this.options.items = this.options.items.concat(items); this.next.setLoaded(); } else { this.next.setEnd(); @@ -65341,6 +65341,7 @@ BI.extend(BI.DynamicDateCard, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTrigger.EVENT_STOP, @@ -65559,6 +65560,7 @@ BI.extend(BI.DynamicDateCard, { } }); +BI.DynamicDateCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -65959,7 +65961,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -66307,6 +66309,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateTimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTimeTrigger.EVENT_STOP, @@ -66528,6 +66531,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateTimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateTimeCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -67035,7 +67039,7 @@ BI.extend(BI.DynamicDateTimeSelect, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -70640,7 +70644,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value), + text: o.text, value: o.value, height: o.height, tipText: "", @@ -70719,6 +70723,13 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, + mounted: function () { + var o = this.options; + if(BI.isKey(o.value)) { + this.setValue([o.value]); + } + }, + _digest: function (v) { return this.options.valueFormatter(v); }, @@ -84007,6 +84018,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.TimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: "EVENT_STOP", @@ -84140,6 +84152,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); + BI.TimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_VALID = "EVENT_VALID"; @@ -84204,7 +84217,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { listeners: [{ eventName: "EVENT_KEY_DOWN", action: function () { - self.fireEvent("EVENT_KEY_DOWN"); + self.fireEvent("EVENT_KEY_DOWN", arguments); } }, { eventName: "EVENT_FOCUS", diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 95ab52918d..457fcb203d 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -35890,7 +35890,7 @@ BI.Input = BI.inherit(BI.Single, { if (keyCode == BI.KeyCode.BACKSPACE || keyCode == BI.KeyCode.DELETE) { this.fireEvent(BI.Input.EVENT_BACKSPACE); } - this.fireEvent(BI.Input.EVENT_KEY_DOWN); + this.fireEvent(BI.Input.EVENT_KEY_DOWN, arguments); // _valueChange中会更新_lastValue, 这边缓存用以后续STOP事件服务 var lastValue = this._lastValue; @@ -43192,8 +43192,8 @@ BI.ListLoader = BI.inherit(BI.Widget, { addItems: function (items) { this.count += items.length; if (BI.isObject(this.next)) { + this.options.items = this.options.items.concat(items); if (this.hasNext()) { - this.options.items = this.options.items.concat(items); this.next.setLoaded(); } else { this.next.setEnd(); @@ -47947,6 +47947,7 @@ BI.extend(BI.DynamicDateCard, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTrigger.EVENT_STOP, @@ -48165,6 +48166,7 @@ BI.extend(BI.DynamicDateCard, { } }); +BI.DynamicDateCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -48565,7 +48567,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -48913,6 +48915,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateTimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTimeTrigger.EVENT_STOP, @@ -49134,6 +49137,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateTimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateTimeCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -49641,7 +49645,7 @@ BI.extend(BI.DynamicDateTimeSelect, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -53246,7 +53250,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value), + text: o.text, value: o.value, height: o.height, tipText: "", @@ -53325,6 +53329,13 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, + mounted: function () { + var o = this.options; + if(BI.isKey(o.value)) { + this.setValue([o.value]); + } + }, + _digest: function (v) { return this.options.valueFormatter(v); }, @@ -66613,6 +66624,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.TimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: "EVENT_STOP", @@ -66746,6 +66758,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); + BI.TimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_VALID = "EVENT_VALID"; @@ -66810,7 +66823,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { listeners: [{ eventName: "EVENT_KEY_DOWN", action: function () { - self.fireEvent("EVENT_KEY_DOWN"); + self.fireEvent("EVENT_KEY_DOWN", arguments); } }, { eventName: "EVENT_FOCUS", diff --git a/dist/utils.js b/dist/utils.js index 5abac01b0f..758bc8b634 100644 --- a/dist/utils.js +++ b/dist/utils.js @@ -18109,7 +18109,7 @@ BI.Region.prototype = { };BI.i18n = { "BI-Multi_Date_Quarter_End": "季度末", "BI-Multi_Date_Month_Begin": "月初", - "BI-Multi_Date_YMD": "年/月/日", + "BI-Multi_Date_YMD": "年月日", "BI-Custom_Color": "自定义颜色", "BI-Numerical_Interval_Input_Data": "请输入数值", "BI-Please_Input_Natural_Number": "请输入非负整数", diff --git a/dist/widget.js b/dist/widget.js index 1d68f7b221..5292f0b880 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -2762,6 +2762,7 @@ BI.extend(BI.DynamicDateCard, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTrigger.EVENT_STOP, @@ -2980,6 +2981,7 @@ BI.extend(BI.DynamicDateCard, { } }); +BI.DynamicDateCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -3380,7 +3382,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -3728,6 +3730,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateTimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTimeTrigger.EVENT_STOP, @@ -3949,6 +3952,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateTimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateTimeCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; @@ -4456,7 +4460,7 @@ BI.extend(BI.DynamicDateTimeSelect, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); @@ -8061,7 +8065,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value), + text: o.text, value: o.value, height: o.height, tipText: "", @@ -8140,6 +8144,13 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, + mounted: function () { + var o = this.options; + if(BI.isKey(o.value)) { + this.setValue([o.value]); + } + }, + _digest: function (v) { return this.options.valueFormatter(v); }, @@ -21428,6 +21439,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.TimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: "EVENT_STOP", @@ -21561,6 +21573,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { } }); + BI.TimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_VALID = "EVENT_VALID"; @@ -21625,7 +21638,7 @@ BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);!(function () { listeners: [{ eventName: "EVENT_KEY_DOWN", action: function () { - self.fireEvent("EVENT_KEY_DOWN"); + self.fireEvent("EVENT_KEY_DOWN", arguments); } }, { eventName: "EVENT_FOCUS", diff --git a/src/base/single/input/input.js b/src/base/single/input/input.js index 1d8372dcb3..59dc0ba6d4 100644 --- a/src/base/single/input/input.js +++ b/src/base/single/input/input.js @@ -164,7 +164,7 @@ BI.Input = BI.inherit(BI.Single, { if (keyCode == BI.KeyCode.BACKSPACE || keyCode == BI.KeyCode.DELETE) { this.fireEvent(BI.Input.EVENT_BACKSPACE); } - this.fireEvent(BI.Input.EVENT_KEY_DOWN); + this.fireEvent(BI.Input.EVENT_KEY_DOWN, arguments); // _valueChange中会更新_lastValue, 这边缓存用以后续STOP事件服务 var lastValue = this._lastValue; diff --git a/src/case/loader/loader.list.js b/src/case/loader/loader.list.js index 04c7292a9a..aeb3ad959c 100644 --- a/src/case/loader/loader.list.js +++ b/src/case/loader/loader.list.js @@ -100,8 +100,8 @@ BI.ListLoader = BI.inherit(BI.Widget, { addItems: function (items) { this.count += items.length; if (BI.isObject(this.next)) { + this.options.items = this.options.items.concat(items); if (this.hasNext()) { - this.options.items = this.options.items.concat(items); this.next.setLoaded(); } else { this.next.setEnd(); diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index 5cf8b37540..f2d9cda515 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -64,6 +64,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTrigger.EVENT_STOP, @@ -282,6 +283,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateCombo.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/widget/dynamicdate/dynamicdate.trigger.js b/src/widget/dynamicdate/dynamicdate.trigger.js index 8f9067719c..a3806bec4c 100644 --- a/src/widget/dynamicdate/dynamicdate.trigger.js +++ b/src/widget/dynamicdate/dynamicdate.trigger.js @@ -52,7 +52,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 6db4f7fded..6a277f8e11 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -64,6 +64,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.DynamicDateTimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: BI.DynamicDateTimeTrigger.EVENT_STOP, @@ -285,6 +286,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }); +BI.DynamicDateTimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.DynamicDateTimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.DynamicDateTimeCombo.EVENT_FOCUS = "EVENT_FOCUS"; BI.DynamicDateTimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js index 61d99d4470..d8113f7ab0 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js @@ -52,7 +52,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, { title: BI.bind(this._getTitle, this) }); this.editor.on(BI.SignEditor.EVENT_KEY_DOWN, function () { - self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN); + self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN, arguments); }); this.editor.on(BI.SignEditor.EVENT_FOCUS, function () { self.storeTriggerValue = self.getKey(); diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js index e75a33cbb2..87c16f2afc 100644 --- a/src/widget/multilayersingletree/multilayersingletree.trigger.js +++ b/src/widget/multilayersingletree/multilayersingletree.trigger.js @@ -29,7 +29,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value), + text: o.text, value: o.value, height: o.height, tipText: "", @@ -108,6 +108,13 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }; }, + mounted: function () { + var o = this.options; + if(BI.isKey(o.value)) { + this.setValue([o.value]); + } + }, + _digest: function (v) { return this.options.valueFormatter(v); }, diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index e9f0f0393f..840a97463b 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -78,6 +78,7 @@ if (self.combo.isViewVisible()) { self.combo.hideView(); } + self.fireEvent(BI.TimeCombo.EVENT_KEY_DOWN, arguments); } }, { eventName: "EVENT_STOP", @@ -211,6 +212,7 @@ } }); + BI.TimeCombo.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; BI.TimeCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.TimeCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.TimeCombo.EVENT_VALID = "EVENT_VALID"; diff --git a/src/widget/time/time.trigger.js b/src/widget/time/time.trigger.js index 702b087611..5e2796f079 100644 --- a/src/widget/time/time.trigger.js +++ b/src/widget/time/time.trigger.js @@ -56,7 +56,7 @@ listeners: [{ eventName: "EVENT_KEY_DOWN", action: function () { - self.fireEvent("EVENT_KEY_DOWN"); + self.fireEvent("EVENT_KEY_DOWN", arguments); } }, { eventName: "EVENT_FOCUS", diff --git a/typescript/core/base.ts b/typescript/core/base.ts index 26389d331d..05cc91239c 100644 --- a/typescript/core/base.ts +++ b/typescript/core/base.ts @@ -95,7 +95,7 @@ export interface _base { backFind: (obj: any, predicate: Function, context?: any) => any; - remove: (obj: any, predicate: Function, context?: any) => void; + remove: (obj: any, predicate: any, context?: any) => void; removeAt: (obj: any, index: number|number[]) => void; @@ -367,7 +367,7 @@ export interface _base { parseDateTime: (str: string, fmt: string) => Date; - getDate: (...args: number[]) => Date; + getDate: (...args: (number | string)[]) => Date; getTime: (...args: any[]) => number; } \ No newline at end of file