From 1eda96c4b708c8192200563ecb4800a902a0d8cf Mon Sep 17 00:00:00 2001 From: freddy Date: Thu, 20 Jan 2022 17:13:10 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"REPORT-60473=20&&=20REPORT-64922=20fi?= =?UTF-8?q?x:=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; }