From 1a35304ca65e84100530d871081f662ec452bafe Mon Sep 17 00:00:00 2001 From: freddy Date: Thu, 20 Jan 2022 16:46:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-60473=20&&=20REPORT-64922=20fix:?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=97=A5=E6=9C=9F=E6=8E=A7=E4=BB=B6=E7=9A=84?= =?UTF-8?q?focus=E3=80=81blur=E5=92=8CsetWaterMark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdate/dynamicdate.combo.js | 16 ++++++++++++++++ src/widget/dynamicdate/dynamicdate.trigger.js | 13 ++++++++++++- .../dynamicdatetime/dynamicdatetime.combo.js | 16 ++++++++++++++++ .../dynamicdatetime/dynamicdatetime.trigger.js | 15 +++++++++++++-- src/widget/time/time.combo.js | 16 ++++++++++++++++ src/widget/time/time.trigger.js | 13 ++++++++++++- .../widget/dynamicdate/dynamicdate.combo.ts | 8 ++++++++ .../dynamicdatetime/dynamicdatetime.combo.ts | 8 ++++++++ typescript/widget/time/time.combo.ts | 8 ++++++++ 9 files changed, 109 insertions(+), 4 deletions(-) diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index 81fb7faa0..e1c610675 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -298,6 +298,22 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { }, hidePopupView: function () { this.combo.hideView(); + }, + + hideView: 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..50e7dde5b 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -306,6 +306,22 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { isValid: function () { return this.trigger.isValid(); + }, + + hideView: 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/dynamicdatetime/dynamicdatetime.trigger.js b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js index 6a1d4d5de..b93c3a508 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"; @@ -393,4 +404,4 @@ BI.DynamicDateTimeTrigger.EVENT_VALID = "EVENT_VALID"; BI.DynamicDateTimeTrigger.EVENT_ERROR = "EVENT_ERROR"; BI.DynamicDateTimeTrigger.EVENT_TRIGGER_CLICK = "EVENT_TRIGGER_CLICK"; BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; -BI.shortcut("bi.dynamic_date_time_trigger", BI.DynamicDateTimeTrigger); +BI.shortcut("bi.dynamic_date_time_trigger", BI.DynamicDateTimeTrigger); \ No newline at end of file diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index e816b8fa6..dba165451 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -222,6 +222,22 @@ this.setValue(nowTome); this.hidePopupView(); this.fireEvent(BI.TimeCombo.EVENT_CONFIRM); + }, + + hideView: 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/time/time.trigger.js b/src/widget/time/time.trigger.js index 037a03888..3111a0ccf 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/widget/dynamicdate/dynamicdate.combo.ts b/typescript/widget/dynamicdate/dynamicdate.combo.ts index a7ead70cf..32c74536f 100644 --- a/typescript/widget/dynamicdate/dynamicdate.combo.ts +++ b/typescript/widget/dynamicdate/dynamicdate.combo.ts @@ -36,6 +36,14 @@ export declare class DynamicDateCombo extends Single { hidePopupView(): void; getValue(): DynamicDataComboValue; + + hideView(): void; + + 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..84aef8b40 100644 --- a/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts +++ b/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts @@ -32,4 +32,12 @@ export declare class DynamicDateTimeCombo extends Single { getKey(): string; hidePopupView(): void; + + hideView(): void; + + focus(): void; + + blur(): void; + + seWaterMark(v: string): void; } diff --git a/typescript/widget/time/time.combo.ts b/typescript/widget/time/time.combo.ts index fa14d017f..998b9b0d8 100644 --- a/typescript/widget/time/time.combo.ts +++ b/typescript/widget/time/time.combo.ts @@ -10,4 +10,12 @@ export declare class TimeCombo extends Single { static EVENT_BEFORE_POPUPVIEW: string; hidePopupView(): void; + + hideView(): void; + + focus(): void; + + blur(): void; + + setWaterMark(v: string): void; } From 1eda96c4b708c8192200563ecb4800a902a0d8cf Mon Sep 17 00:00:00 2001 From: freddy Date: Thu, 20 Jan 2022 17:13:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"REPORT-60473=20&&=20REPORT-64922?= =?UTF-8?q?=20fix:=E5=AE=9E=E7=8E=B0=E6=97=A5=E6=9C=9F=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E7=9A=84focus=E3=80=81blur=E5=92=8CsetWaterMark"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1a35304ca65e84100530d871081f662ec452bafe. --- src/widget/dynamicdate/dynamicdate.combo.js | 16 ---------------- src/widget/dynamicdate/dynamicdate.trigger.js | 13 +------------ .../dynamicdatetime/dynamicdatetime.combo.js | 16 ---------------- .../dynamicdatetime/dynamicdatetime.trigger.js | 15 ++------------- src/widget/time/time.combo.js | 16 ---------------- src/widget/time/time.trigger.js | 13 +------------ .../widget/dynamicdate/dynamicdate.combo.ts | 8 -------- .../dynamicdatetime/dynamicdatetime.combo.ts | 8 -------- typescript/widget/time/time.combo.ts | 8 -------- 9 files changed, 4 insertions(+), 109 deletions(-) diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index e1c610675..81fb7faa0 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -298,22 +298,6 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { }, hidePopupView: function () { this.combo.hideView(); - }, - - hideView: 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 48e8a4601..06bdb10ff 100644 --- a/src/widget/dynamicdate/dynamicdate.trigger.js +++ b/src/widget/dynamicdate/dynamicdate.trigger.js @@ -308,19 +308,8 @@ 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 50e7dde5b..6565f9943 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -306,22 +306,6 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { isValid: function () { return this.trigger.isValid(); - }, - - hideView: 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/dynamicdatetime/dynamicdatetime.trigger.js b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js index b93c3a508..6a1d4d5de 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js @@ -379,19 +379,8 @@ 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"; @@ -404,4 +393,4 @@ BI.DynamicDateTimeTrigger.EVENT_VALID = "EVENT_VALID"; BI.DynamicDateTimeTrigger.EVENT_ERROR = "EVENT_ERROR"; BI.DynamicDateTimeTrigger.EVENT_TRIGGER_CLICK = "EVENT_TRIGGER_CLICK"; BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; -BI.shortcut("bi.dynamic_date_time_trigger", BI.DynamicDateTimeTrigger); \ No newline at end of file +BI.shortcut("bi.dynamic_date_time_trigger", BI.DynamicDateTimeTrigger); diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index dba165451..e816b8fa6 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -222,22 +222,6 @@ this.setValue(nowTome); this.hidePopupView(); this.fireEvent(BI.TimeCombo.EVENT_CONFIRM); - }, - - hideView: 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/time/time.trigger.js b/src/widget/time/time.trigger.js index 3111a0ccf..037a03888 100644 --- a/src/widget/time/time.trigger.js +++ b/src/widget/time/time.trigger.js @@ -180,19 +180,8 @@ 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/widget/dynamicdate/dynamicdate.combo.ts b/typescript/widget/dynamicdate/dynamicdate.combo.ts index 32c74536f..a7ead70cf 100644 --- a/typescript/widget/dynamicdate/dynamicdate.combo.ts +++ b/typescript/widget/dynamicdate/dynamicdate.combo.ts @@ -36,14 +36,6 @@ export declare class DynamicDateCombo extends Single { hidePopupView(): void; getValue(): DynamicDataComboValue; - - hideView(): void; - - 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 84aef8b40..b6593b2a7 100644 --- a/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts +++ b/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts @@ -32,12 +32,4 @@ export declare class DynamicDateTimeCombo extends Single { getKey(): string; hidePopupView(): void; - - hideView(): void; - - focus(): void; - - blur(): void; - - seWaterMark(v: string): void; } diff --git a/typescript/widget/time/time.combo.ts b/typescript/widget/time/time.combo.ts index 998b9b0d8..fa14d017f 100644 --- a/typescript/widget/time/time.combo.ts +++ b/typescript/widget/time/time.combo.ts @@ -10,12 +10,4 @@ export declare class TimeCombo extends Single { static EVENT_BEFORE_POPUPVIEW: string; hidePopupView(): void; - - hideView(): void; - - focus(): void; - - blur(): void; - - setWaterMark(v: string): void; } From ed1452ea8036e2ebf15caa23b32702b409139cea Mon Sep 17 00:00:00 2001 From: freddy Date: Fri, 21 Jan 2022 21:01:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-60473=20&&=20REPORT-64922=20fix:?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=B8=8B=E6=8B=89=E6=A1=86=E5=92=8C=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=8E=A7=E4=BB=B6focus=20blur=E5=92=8C=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=8E=A7=E4=BB=B6setWaterMark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/searcher.js | 8 ++++++++ .../treevaluechooser/combo.listtreevaluechooser.js | 8 ++++++++ .../combo.treevaluechooser.insert.js | 8 ++++++++ .../treevaluechooser/combo.treevaluechooser.js | 8 ++++++++ src/widget/dynamicdate/dynamicdate.combo.js | 12 ++++++++++++ src/widget/dynamicdate/dynamicdate.trigger.js | 13 ++++++++++++- src/widget/dynamicdatetime/dynamicdatetime.combo.js | 12 ++++++++++++ .../dynamicdatetime/dynamicdatetime.trigger.js | 13 ++++++++++++- .../multilayerselecttree.combo.js | 12 ++++++++++++ .../multilayerselecttree.trigger.js | 8 ++++++++ .../multilayersingletree.combo.js | 11 +++++++++++ .../multilayersingletree.trigger.js | 8 ++++++++ src/widget/multiselect/multiselect.trigger.js | 8 ++++++++ .../multiselect/trigger/searcher.multiselect.js | 8 ++++++++ src/widget/multitree/multi.tree.combo.js | 11 +++++++++++ src/widget/multitree/multi.tree.insert.combo.js | 11 +++++++++++ src/widget/multitree/multi.tree.list.combo.js | 11 +++++++++++ .../multitree/trigger/searcher.list.multi.tree.js | 8 ++++++++ src/widget/multitree/trigger/searcher.multi.tree.js | 8 ++++++++ src/widget/time/time.combo.js | 12 ++++++++++++ src/widget/time/time.trigger.js | 13 ++++++++++++- .../treevaluechooser/combo.listtreevaluechooser.ts | 4 ++++ .../combo.treevaluechooser.insert.ts | 4 ++++ .../treevaluechooser/combo.treevaluechooser.ts | 4 ++++ typescript/widget/dynamicdate/dynamicdate.combo.ts | 6 ++++++ .../widget/dynamicdatetime/dynamicdatetime.combo.ts | 6 ++++++ .../multilayerselecttree.combo.ts | 4 ++++ .../multilayersingletree.combo.ts | 4 ++++ typescript/widget/multitree/multi.tree.combo.ts | 4 ++++ .../widget/multitree/multi.tree.insert.combo.ts | 4 ++++ .../widget/multitree/multi.tree.list.combo.ts | 4 ++++ typescript/widget/time/time.combo.ts | 6 ++++++ 32 files changed, 258 insertions(+), 3 deletions(-) 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 412b1f9e7..b11b9bc14 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js @@ -156,6 +156,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { }, { eventName: BI.MultiLayerSelectTreeTrigger.EVENT_FOCUS, action: function () { + if (!self.combo.isViewVisible()) { + self.combo.showView(); + } + self.fireEvent(BI.MultiLayerSelectTreeCombo.EVENT_FOCUS); } }, { @@ -238,6 +242,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 4109f6eb7..8d22714e1 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -158,6 +158,9 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { }, { eventName: BI.MultiLayerSingleTreeTrigger.EVENT_FOCUS, action: function () { + if (!self.combo.isViewVisible()) { + self.combo.showView(); + } self.fireEvent(BI.MultiLayerSingleTreeCombo.EVENT_FOCUS); } }, { @@ -239,6 +242,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 5c6e177a7..67190043b 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -124,6 +124,9 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { }; this.trigger.on(BI.MultiSelectTrigger.EVENT_FOCUS, function () { + if (!self.combo.isViewVisible()) { + self.combo.showView(); + } self.fireEvent(BI.MultiTreeCombo.EVENT_FOCUS); }); this.trigger.on(BI.MultiSelectTrigger.EVENT_BLUR, function () { @@ -344,6 +347,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 b82d27f3f..632a46a24 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -140,6 +140,9 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { }; this.trigger.on(BI.MultiSelectTrigger.EVENT_FOCUS, function () { + if (!self.combo.isViewVisible()) { + self.combo.showView(); + } self.fireEvent(BI.MultiTreeInsertCombo.EVENT_FOCUS); }); this.trigger.on(BI.MultiSelectTrigger.EVENT_BLUR, function () { @@ -360,6 +363,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 018f7f74b..68d50b989 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -158,6 +158,9 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { }; this.trigger.on(BI.MultiSelectTrigger.EVENT_FOCUS, function () { + if (!self.combo.isViewVisible()) { + self.combo.showView(); + } self.fireEvent(BI.MultiTreeListCombo.EVENT_FOCUS); }); this.trigger.on(BI.MultiSelectTrigger.EVENT_BLUR, function () { @@ -378,6 +381,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; } From 0bc476572b2cd6604a704665527b92f5dc34c67a Mon Sep 17 00:00:00 2001 From: freddy Date: Mon, 24 Jan 2022 14:30:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-60473=20&&=20REPORT-64922=20fix:?= =?UTF-8?q?=E5=8E=BB=E6=8E=89focus=E6=97=B6showView?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multilayerselecttree/multilayerselecttree.combo.js | 4 ---- src/widget/multilayersingletree/multilayersingletree.combo.js | 3 --- src/widget/multitree/multi.tree.combo.js | 3 --- src/widget/multitree/multi.tree.insert.combo.js | 3 --- src/widget/multitree/multi.tree.list.combo.js | 3 --- 5 files changed, 16 deletions(-) diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js index b11b9bc14..0f4e78fff 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js @@ -156,10 +156,6 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { }, { eventName: BI.MultiLayerSelectTreeTrigger.EVENT_FOCUS, action: function () { - if (!self.combo.isViewVisible()) { - self.combo.showView(); - } - self.fireEvent(BI.MultiLayerSelectTreeCombo.EVENT_FOCUS); } }, { diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index 8d22714e1..29e97b93e 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -158,9 +158,6 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { }, { eventName: BI.MultiLayerSingleTreeTrigger.EVENT_FOCUS, action: function () { - if (!self.combo.isViewVisible()) { - self.combo.showView(); - } self.fireEvent(BI.MultiLayerSingleTreeCombo.EVENT_FOCUS); } }, { diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 67190043b..b65692bdc 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -124,9 +124,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { }; this.trigger.on(BI.MultiSelectTrigger.EVENT_FOCUS, function () { - if (!self.combo.isViewVisible()) { - self.combo.showView(); - } self.fireEvent(BI.MultiTreeCombo.EVENT_FOCUS); }); this.trigger.on(BI.MultiSelectTrigger.EVENT_BLUR, function () { diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index 632a46a24..0b1e9701c 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -140,9 +140,6 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { }; this.trigger.on(BI.MultiSelectTrigger.EVENT_FOCUS, function () { - if (!self.combo.isViewVisible()) { - self.combo.showView(); - } self.fireEvent(BI.MultiTreeInsertCombo.EVENT_FOCUS); }); this.trigger.on(BI.MultiSelectTrigger.EVENT_BLUR, function () { diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index 68d50b989..5848eb41b 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -158,9 +158,6 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { }; this.trigger.on(BI.MultiSelectTrigger.EVENT_FOCUS, function () { - if (!self.combo.isViewVisible()) { - self.combo.showView(); - } self.fireEvent(BI.MultiTreeListCombo.EVENT_FOCUS); }); this.trigger.on(BI.MultiSelectTrigger.EVENT_BLUR, function () {