diff --git a/src/base/combination/searcher.js b/src/base/combination/searcher.js index 7da8689c2..e7d16c53e 100644 --- a/src/base/combination/searcher.js +++ b/src/base/combination/searcher.js @@ -307,6 +307,14 @@ BI.Searcher = BI.inherit(BI.Widget, { destroyed: function () { BI.Maskers.remove(this.getName()); + }, + + focus: function () { + this.editor.focus(); + }, + + blur: function () { + this.editor.blur(); } }); BI.Searcher.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/component/treevaluechooser/combo.listtreevaluechooser.js b/src/component/treevaluechooser/combo.listtreevaluechooser.js index a90c6a4b9..e6bebe3d6 100644 --- a/src/component/treevaluechooser/combo.listtreevaluechooser.js +++ b/src/component/treevaluechooser/combo.listtreevaluechooser.js @@ -102,6 +102,14 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, this._initData(items); } this.combo.populate(); + }, + + focus: function () { + this.combo.focus(); + }, + + blur: function () { + this.combo.blur(); } }); diff --git a/src/component/treevaluechooser/combo.treevaluechooser.insert.js b/src/component/treevaluechooser/combo.treevaluechooser.insert.js index b01fe2e0f..d506dfe8b 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.insert.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.insert.js @@ -101,6 +101,14 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { this._initData(items); } this.combo.populate(); + }, + + focus: function () { + this.combo.focus(); + }, + + blur: function () { + this.combo.blur(); } }); diff --git a/src/component/treevaluechooser/combo.treevaluechooser.js b/src/component/treevaluechooser/combo.treevaluechooser.js index fbff4000a..f47b3f84b 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.js @@ -105,6 +105,14 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this._initData(items); } this.combo.populate(); + }, + + focus: function () { + this.combo.focus(); + }, + + blur: function () { + this.combo.blur(); } }); diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index 81fb7faa0..997211275 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -298,6 +298,18 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { }, hidePopupView: function () { this.combo.hideView(); + }, + + focus: function () { + this.trigger.focus(); + }, + + blur: function () { + this.trigger.blur(); + }, + + setWaterMark: function (v) { + this.trigger.setWaterMark(v); } }); diff --git a/src/widget/dynamicdate/dynamicdate.trigger.js b/src/widget/dynamicdate/dynamicdate.trigger.js index 06bdb10ff..48e8a4601 100644 --- a/src/widget/dynamicdate/dynamicdate.trigger.js +++ b/src/widget/dynamicdate/dynamicdate.trigger.js @@ -308,8 +308,19 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, { }, getValue: function () { return this.storeValue; - } + }, + + focus: function () { + this.editor.focus(); + }, + blur: function () { + this.editor.blur(); + }, + + setWaterMark: function (v) { + this.editor.setWaterMark(v); + } }); BI.DynamicDateTrigger.EVENT_BLUR = "EVENT_BLUR"; diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 6565f9943..37655791d 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -306,6 +306,18 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { isValid: function () { return this.trigger.isValid(); + }, + + focus: function () { + this.trigger.focus(); + }, + + blur: function () { + this.trigger.blur(); + }, + + setWaterMark: function (v) { + this.trigger.setWaterMark(v); } }); diff --git a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js index 6a1d4d5de..e58cd99f5 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js @@ -379,8 +379,19 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, { isValid: function () { return this.editor.isValid(); - } + }, + + focus: function () { + this.editor.focus(); + }, + blur: function () { + this.editor.blur(); + }, + + setWaterMark: function (v) { + this.editor.setWaterMark(v); + } }); BI.DynamicDateTimeTrigger.EVENT_BLUR = "EVENT_BLUR"; diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js index ef7f8867d..ea846f08d 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js @@ -238,6 +238,14 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { populate: function (items) { this.combo.populate(items); + }, + + focus: function () { + this.trigger.focus(); + }, + + blur: function () { + this.trigger.blur(); } }); diff --git a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js index 7203378ba..2fd1c96ec 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js @@ -237,6 +237,14 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { getValue: function () { return this.searcher.getValue(); + }, + + focus: function () { + this.searcher.focus(); + }, + + blur: function () { + this.searcher.blur(); } }); diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index 824cb9bae..7f2765a16 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -239,6 +239,14 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { populate: function (items) { this.combo.populate(items); + }, + + focus: function () { + this.trigger.focus(); + }, + + blur: function () { + this.trigger.blur(); } }); diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js index 20e47af0d..0812c8029 100644 --- a/src/widget/multilayersingletree/multilayersingletree.trigger.js +++ b/src/widget/multilayersingletree/multilayersingletree.trigger.js @@ -239,6 +239,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { getValue: function () { return this.searcher.getValue(); + }, + + focus: function () { + this.searcher.focus(); + }, + + blur: function () { + this.searcher.blur(); } }); BI.MultiLayerSingleTreeTrigger.EVENT_FOCUS = "EVENT_FOCUS"; diff --git a/src/widget/multiselect/multiselect.trigger.js b/src/widget/multiselect/multiselect.trigger.js index d24d9c23a..d829fa740 100644 --- a/src/widget/multiselect/multiselect.trigger.js +++ b/src/widget/multiselect/multiselect.trigger.js @@ -136,6 +136,14 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { getValue: function () { return this.searcher.getValue(); + }, + + focus: function () { + this.searcher.focus(); + }, + + blur: function () { + this.searcher.blur(); } }); diff --git a/src/widget/multiselect/trigger/searcher.multiselect.js b/src/widget/multiselect/trigger/searcher.multiselect.js index ec26eccca..ab2688eb4 100644 --- a/src/widget/multiselect/trigger/searcher.multiselect.js +++ b/src/widget/multiselect/trigger/searcher.multiselect.js @@ -94,6 +94,14 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, { } }, + focus: function () { + this.editor.focus(); + }, + + blur: function () { + this.editor.blur(); + }, + adjustView: function () { this.searcher.adjustView(); }, diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index b6a3aca37..908b7002f 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -344,6 +344,14 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { populate: function () { this.combo.populate(); + }, + + focus: function () { + this.trigger.focus(); + }, + + blur: function () { + this.trigger.blur(); } }); diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index c48ca8b36..532f76fe8 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -360,6 +360,14 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { populate: function () { this.combo.populate(); + }, + + focus: function () { + this.trigger.focus(); + }, + + blur: function () { + this.trigger.blur(); } }); diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index dfa1e0ac5..21b27687c 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -378,6 +378,14 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { populate: function () { this.combo.populate(); + }, + + focus: function () { + this.trigger.focus(); + }, + + blur: function () { + this.trigger.blur(); } }); diff --git a/src/widget/multitree/trigger/searcher.list.multi.tree.js b/src/widget/multitree/trigger/searcher.list.multi.tree.js index 2a8d9f4c5..3b126a5a5 100644 --- a/src/widget/multitree/trigger/searcher.list.multi.tree.js +++ b/src/widget/multitree/trigger/searcher.list.multi.tree.js @@ -153,6 +153,14 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, { populate: function (items) { this.searcher.populate.apply(this.searcher, arguments); + }, + + focus: function () { + this.editor.focus(); + }, + + blur: function () { + this.editor.blur(); } }); diff --git a/src/widget/multitree/trigger/searcher.multi.tree.js b/src/widget/multitree/trigger/searcher.multi.tree.js index 6790e2c23..ffece8cb9 100644 --- a/src/widget/multitree/trigger/searcher.multi.tree.js +++ b/src/widget/multitree/trigger/searcher.multi.tree.js @@ -184,6 +184,14 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { populate: function (items) { this.searcher.populate.apply(this.searcher, arguments); + }, + + focus: function () { + this.editor.focus(); + }, + + blur: function () { + this.editor.blur(); } }); diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index e816b8fa6..d69443bc7 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -222,6 +222,18 @@ this.setValue(nowTome); this.hidePopupView(); this.fireEvent(BI.TimeCombo.EVENT_CONFIRM); + }, + + focus: function () { + this.trigger.focus(); + }, + + blur: function () { + this.trigger.blur(); + }, + + setWaterMark: function (v) { + this.trigger.setWaterMark(v); } }); diff --git a/src/widget/time/time.trigger.js b/src/widget/time/time.trigger.js index 037a03888..cd8e25cd4 100644 --- a/src/widget/time/time.trigger.js +++ b/src/widget/time/time.trigger.js @@ -180,8 +180,19 @@ getValue: function () { return this.storeValue; - } + }, + + focus: function () { + this.editor.focus(); + }, + + blur: function () { + this.editor.blur(); + }, + setWaterMark: function (v) { + this.editor.setWaterMark(v); + } }); BI.shortcut("bi.time_trigger", BI.TimeTrigger); })(); \ No newline at end of file diff --git a/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts b/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts index bc47f39f3..6709fd8e3 100644 --- a/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts +++ b/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts @@ -23,4 +23,8 @@ export declare class ListTreeValueChooserInsertCombo extends AbstractListTreeVal populate(items: T[]): void; getSearcher(): Widget; + + focus(): void; + + blur(): void; } diff --git a/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts b/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts index 41b785b18..971f44022 100644 --- a/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts +++ b/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts @@ -22,4 +22,8 @@ export declare class TreeValueChooserInsertCombo extends AbstractTreeValueChoose populate(items: T[]): void; getSearcher(): Widget; + + focus(): void; + + blur(): void; } diff --git a/typescript/component/treevaluechooser/combo.treevaluechooser.ts b/typescript/component/treevaluechooser/combo.treevaluechooser.ts index be535af4a..859480ce6 100644 --- a/typescript/component/treevaluechooser/combo.treevaluechooser.ts +++ b/typescript/component/treevaluechooser/combo.treevaluechooser.ts @@ -24,4 +24,8 @@ export declare class TreeValueChooserCombo extends AbstractTreeValueChooser { populate(items: T[]): void; getSearcher(): Widget; + + focus(): void; + + blur(): void; } diff --git a/typescript/widget/dynamicdate/dynamicdate.combo.ts b/typescript/widget/dynamicdate/dynamicdate.combo.ts index a7ead70cf..00921782f 100644 --- a/typescript/widget/dynamicdate/dynamicdate.combo.ts +++ b/typescript/widget/dynamicdate/dynamicdate.combo.ts @@ -36,6 +36,12 @@ export declare class DynamicDateCombo extends Single { hidePopupView(): void; getValue(): DynamicDataComboValue; + + focus(): void; + + blur(): void; + + setWaterMark(v: string): void; } export interface DynamicDataComboValue { diff --git a/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts b/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts index b6593b2a7..b4122ead8 100644 --- a/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts +++ b/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts @@ -32,4 +32,10 @@ export declare class DynamicDateTimeCombo extends Single { getKey(): string; hidePopupView(): void; + + focus(): void; + + blur(): void; + + setWaterMark(v: string): void } diff --git a/typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts b/typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts index 489186e72..a6625bebf 100644 --- a/typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts +++ b/typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts @@ -15,4 +15,8 @@ export declare class MultiLayerSelectTreeCombo extends Widget { populate(items: T[]): void; getSearcher(): Widget; + + focus(): void; + + blur(): void; } diff --git a/typescript/widget/multilayersingletree/multilayersingletree.combo.ts b/typescript/widget/multilayersingletree/multilayersingletree.combo.ts index 19150a8f6..706d3445f 100644 --- a/typescript/widget/multilayersingletree/multilayersingletree.combo.ts +++ b/typescript/widget/multilayersingletree/multilayersingletree.combo.ts @@ -15,4 +15,8 @@ export declare class MultiLayerSingleTreeCombo extends Widget { populate(items: T[]): void; getSearcher(): Widget; + + focus(): void; + + blur(): void; } diff --git a/typescript/widget/multitree/multi.tree.combo.ts b/typescript/widget/multitree/multi.tree.combo.ts index d8b546441..e96ed9808 100644 --- a/typescript/widget/multitree/multi.tree.combo.ts +++ b/typescript/widget/multitree/multi.tree.combo.ts @@ -15,4 +15,8 @@ export declare class MultiTreeCombo extends Single { hideView(): void; getSearcher(): Widget; + + focus(): void; + + blur(): void; } diff --git a/typescript/widget/multitree/multi.tree.insert.combo.ts b/typescript/widget/multitree/multi.tree.insert.combo.ts index b701f580b..55f2bbdf6 100644 --- a/typescript/widget/multitree/multi.tree.insert.combo.ts +++ b/typescript/widget/multitree/multi.tree.insert.combo.ts @@ -23,4 +23,8 @@ export declare class MultiTreeInsertCombo extends Single { populate(): void; getSearcher(): Widget; + + focus(): void; + + blur(): void; } diff --git a/typescript/widget/multitree/multi.tree.list.combo.ts b/typescript/widget/multitree/multi.tree.list.combo.ts index 375d1f5e1..202b8b9b0 100644 --- a/typescript/widget/multitree/multi.tree.list.combo.ts +++ b/typescript/widget/multitree/multi.tree.list.combo.ts @@ -22,4 +22,8 @@ export declare class MultiTreeListCombo extends Single { populate(): void; getSearcher(): Widget; + + focus(): void; + + blur(): void; } diff --git a/typescript/widget/time/time.combo.ts b/typescript/widget/time/time.combo.ts index fa14d017f..9b52d1fd1 100644 --- a/typescript/widget/time/time.combo.ts +++ b/typescript/widget/time/time.combo.ts @@ -10,4 +10,10 @@ export declare class TimeCombo extends Single { static EVENT_BEFORE_POPUPVIEW: string; hidePopupView(): void; + + focus(): void; + + blur(): void; + + setWaterMark(v: string): void; }