From f6c7b3d9a4e056284f4dd70d60c02ef95acbf759 Mon Sep 17 00:00:00 2001 From: "Zhenfei.Li" Date: Tue, 11 May 2021 11:23:45 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-7586=20refactor:=20ts=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/datetimepane/datetimepane.js | 5 +++-- typescript/widget/datepane/datepane.ts | 5 +++++ typescript/widget/datetimepane/datetimepane.ts | 11 +++++++++++ .../widget/dynamicdate/dynamicdate.combo.ts | 1 + .../dynamicdatetime/dynamicdatetime.combo.ts | 1 + typescript/widget/timeinterval/dateinterval.ts | 5 +++++ typescript/widget/timeinterval/timeinterval.ts | 18 ++++++++++++++++++ typescript/widget/year/combo.year.ts | 4 ++++ typescript/widget/yearmonth/combo.yearmonth.ts | 4 ++++ .../yearmonthinterval/yearmonthinterval.ts | 4 ++++ .../widget/yearquarter/combo.yearquarter.ts | 4 ++++ 11 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 typescript/widget/datetimepane/datetimepane.ts create mode 100644 typescript/widget/timeinterval/timeinterval.ts diff --git a/src/widget/datetimepane/datetimepane.js b/src/widget/datetimepane/datetimepane.js index 166d016e8..aaad8a0dd 100644 --- a/src/widget/datetimepane/datetimepane.js +++ b/src/widget/datetimepane/datetimepane.js @@ -73,12 +73,12 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, { listeners: [{ eventName: "EVENT_CHANGE", action: function () { - self.fireEvent("EVENT_CHANGE"); + self.fireEvent(BI.DynamicDateTimePane.EVENT_CHANGE); } }, { eventName: "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW", action: function () { - self.fireEvent("EVENT_BEFORE_YEAR_MONTH_POPUPVIEW"); + self.fireEvent(BI.DynamicDateTimePane.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW); } }], ref: function () { @@ -205,6 +205,7 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, { } }); BI.DynamicDateTimePane.EVENT_CHANGE = "EVENT_CHANGE"; +BI.DynamicDateTimePane.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW"; BI.shortcut("bi.dynamic_date_time_pane", BI.DynamicDateTimePane); BI.extend(BI.DynamicDateTimePane, { diff --git a/typescript/widget/datepane/datepane.ts b/typescript/widget/datepane/datepane.ts index 2bdcc9255..6e3212bfc 100644 --- a/typescript/widget/datepane/datepane.ts +++ b/typescript/widget/datepane/datepane.ts @@ -3,6 +3,11 @@ import { Widget } from "../../core/widget"; export declare class DynamicDatePane extends Widget { static xtype: string; static EVENT_CHANGE: string; + static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string; static Static: 1; static Dynamic: 2; + + setMinDate(minDate: string): void; + + setMaxDate(minDate: string): void; } diff --git a/typescript/widget/datetimepane/datetimepane.ts b/typescript/widget/datetimepane/datetimepane.ts new file mode 100644 index 000000000..7afe9c578 --- /dev/null +++ b/typescript/widget/datetimepane/datetimepane.ts @@ -0,0 +1,11 @@ +import { Widget } from "../../core/widget"; + +export declare class DynamicDateTimePane extends Widget { + static xtype: string; + static EVENT_CHANGE: string; + static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string; + + setMinDate(minDate: string): void; + + setMaxDate(minDate: string): void; +} diff --git a/typescript/widget/dynamicdate/dynamicdate.combo.ts b/typescript/widget/dynamicdate/dynamicdate.combo.ts index ca852b3b4..3f19c3386 100644 --- a/typescript/widget/dynamicdate/dynamicdate.combo.ts +++ b/typescript/widget/dynamicdate/dynamicdate.combo.ts @@ -13,6 +13,7 @@ export declare class DynamicDateCombo extends Single { static EVENT_VALID: string; static EVENT_ERROR: string; static EVENT_BEFORE_POPUPVIEW: string; + static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string; setMinDate(minDate: string): void; diff --git a/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts b/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts index 19fd98c32..8f8ba564c 100644 --- a/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts +++ b/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts @@ -10,6 +10,7 @@ export declare class DynamicDateTimeCombo extends Single { static EVENT_VALID: string; static EVENT_ERROR: string; static EVENT_BEFORE_POPUPVIEW: string; + static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string; static Static: 1; static Dynamic: 2; diff --git a/typescript/widget/timeinterval/dateinterval.ts b/typescript/widget/timeinterval/dateinterval.ts index 76c1c8233..bae50b238 100644 --- a/typescript/widget/timeinterval/dateinterval.ts +++ b/typescript/widget/timeinterval/dateinterval.ts @@ -6,9 +6,14 @@ export declare class DateInterval extends Single { static EVENT_CHANGE: string; static EVENT_VALID: string; static EVENT_ERROR: string; + static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string; getValue(): { start: DynamicDataComboValue; end: DynamicDataComboValue; }; + + setMinDate(minDate: string): void; + + setMaxDate(minDate: string): void; } diff --git a/typescript/widget/timeinterval/timeinterval.ts b/typescript/widget/timeinterval/timeinterval.ts new file mode 100644 index 000000000..475ba688b --- /dev/null +++ b/typescript/widget/timeinterval/timeinterval.ts @@ -0,0 +1,18 @@ +import { Single } from "../../base/single/single"; +import { DynamicDataComboValue } from "../dynamicdate/dynamicdate.combo"; + +export declare class TimeInterval extends Single { + static xtype: string; + static EVENT_CHANGE: string; + static EVENT_VALID: string; + static EVENT_ERROR: string; + + getValue(): { + start: DynamicDataComboValue; + end: DynamicDataComboValue; + }; + + setMinDate(minDate: string): void; + + setMaxDate(minDate: string): void; +} diff --git a/typescript/widget/year/combo.year.ts b/typescript/widget/year/combo.year.ts index 32afe0aad..809dc6c69 100644 --- a/typescript/widget/year/combo.year.ts +++ b/typescript/widget/year/combo.year.ts @@ -4,4 +4,8 @@ export declare class DynamicYearCombo extends Widget { static xtype: string; static EVENT_CONFIRM: string; static EVENT_BEFORE_POPUPVIEW: string; + + setMinDate(minDate: string): void; + + setMaxDate(maxDate: string): void; } diff --git a/typescript/widget/yearmonth/combo.yearmonth.ts b/typescript/widget/yearmonth/combo.yearmonth.ts index 382729819..557173441 100644 --- a/typescript/widget/yearmonth/combo.yearmonth.ts +++ b/typescript/widget/yearmonth/combo.yearmonth.ts @@ -11,4 +11,8 @@ export declare class DynamicYearMonthCombo extends Single { hideView(): void; getKey(): string; + + setMinDate(minDate: string): void; + + setMaxDate(maxDate: string): void; } diff --git a/typescript/widget/yearmonthinterval/yearmonthinterval.ts b/typescript/widget/yearmonthinterval/yearmonthinterval.ts index 57a0c2d9e..0c12744ae 100644 --- a/typescript/widget/yearmonthinterval/yearmonthinterval.ts +++ b/typescript/widget/yearmonthinterval/yearmonthinterval.ts @@ -11,4 +11,8 @@ export declare class YearMonthInterval extends Single { start: number; end: number; }; + + setMinDate(minDate: string): void; + + setMaxDate(maxDate: string): void; } diff --git a/typescript/widget/yearquarter/combo.yearquarter.ts b/typescript/widget/yearquarter/combo.yearquarter.ts index b735dbc10..b1e42df97 100644 --- a/typescript/widget/yearquarter/combo.yearquarter.ts +++ b/typescript/widget/yearquarter/combo.yearquarter.ts @@ -4,4 +4,8 @@ export declare class DynamicYearQuarterCombo extends Widget { static xtype: string; static EVENT_CONFIRM: string; static EVENT_BEFORE_POPUPVIEW: string; + + setMinDate(minDate: string): void; + + setMaxDate(maxDate: string): void; }