From ed7c3ce2b23c54f583d927e407d09d238201f655 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Fri, 3 Nov 2023 15:23:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/dynamicdate/dynamicdate.combo.ts | 1 + .../dynamicdatetime/dynamicdatetime.combo.ts | 14 +++++++++++ .../widget/timeinterval/timeinterval.ts | 8 +++---- .../typescript/widget/year/combo.year.ts | 9 ++++++++ .../widget/yearinterval/yearinterval.ts | 23 +++++++++++++++++++ .../widget/yearmonth/combo.yearmonth.ts | 11 +++++++++ .../yearmonthinterval/yearmonthinterval.ts | 9 ++++++-- .../widget/yearquarter/combo.yearquarter.ts | 10 ++++++++ .../yearquarterinterval.ts | 23 +++++++++++++++++++ 9 files changed, 102 insertions(+), 6 deletions(-) create mode 100644 packages/fineui/typescript/widget/yearinterval/yearinterval.ts create mode 100644 packages/fineui/typescript/widget/yearquarterinterval/yearquarterinterval.ts diff --git a/packages/fineui/typescript/widget/dynamicdate/dynamicdate.combo.ts b/packages/fineui/typescript/widget/dynamicdate/dynamicdate.combo.ts index 305a71c4f..e9a54490a 100644 --- a/packages/fineui/typescript/widget/dynamicdate/dynamicdate.combo.ts +++ b/packages/fineui/typescript/widget/dynamicdate/dynamicdate.combo.ts @@ -25,6 +25,7 @@ export declare class DynamicDateCombo extends Single { tabIndex?: number; }; watermark?: string; + simple?: boolean; } & Single['props'] setMinDate(minDate: string): void; diff --git a/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts b/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts index 268372758..120f38ef3 100644 --- a/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts +++ b/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts @@ -25,6 +25,8 @@ export declare class DynamicDateTimeCombo extends Single { watermark?: string; } & Single['props']; + getValue(): DynamicDateTimeComboValue; + setMinDate(minDate: string): void; setMaxDate(minDate: string): void; @@ -39,3 +41,15 @@ export declare class DynamicDateTimeCombo extends Single { setWaterMark(v: string): void } + +export interface DynamicDateTimeComboValue { + type: number; + value: { + year: number; + month: number; + day: number; + hour: number; + minute: number; + second: number; + }; +} diff --git a/packages/fineui/typescript/widget/timeinterval/timeinterval.ts b/packages/fineui/typescript/widget/timeinterval/timeinterval.ts index d9596e4fd..87d4fd977 100644 --- a/packages/fineui/typescript/widget/timeinterval/timeinterval.ts +++ b/packages/fineui/typescript/widget/timeinterval/timeinterval.ts @@ -1,5 +1,5 @@ import { Single } from "../../base/single/single"; -import { DynamicDataComboValue } from "../dynamicdate/dynamicdate.combo"; +import { DynamicDateTimeComboValue } from "../dynamicdatetime/dynamicdatetime.combo"; export declare class TimeInterval extends Single { static xtype: string; @@ -13,11 +13,11 @@ export declare class TimeInterval extends Single { supportDynamic?: boolean; watermark?: string; simple?: boolean; - } & Single['props'] + } & Single['props']; getValue(): { - start: DynamicDataComboValue; - end: DynamicDataComboValue; + start: DynamicDateTimeComboValue; + end: DynamicDateTimeComboValue; }; setMinDate(minDate: string): void; diff --git a/packages/fineui/typescript/widget/year/combo.year.ts b/packages/fineui/typescript/widget/year/combo.year.ts index 605f1700d..5b9b21acb 100644 --- a/packages/fineui/typescript/widget/year/combo.year.ts +++ b/packages/fineui/typescript/widget/year/combo.year.ts @@ -7,7 +7,16 @@ export declare class DynamicYearCombo extends Widget { static EVENT_CONFIRM: string; static EVENT_BEFORE_POPUPVIEW: string; + getValue(): DynamicYearComboValue; + setMinDate(minDate: string): void; setMaxDate(maxDate: string): void; } + +export interface DynamicYearComboValue { + type: number; + value: { + year: number; + }; +} diff --git a/packages/fineui/typescript/widget/yearinterval/yearinterval.ts b/packages/fineui/typescript/widget/yearinterval/yearinterval.ts new file mode 100644 index 000000000..36461498a --- /dev/null +++ b/packages/fineui/typescript/widget/yearinterval/yearinterval.ts @@ -0,0 +1,23 @@ +import { Single } from "../../base/single/single"; +import { DynamicYearComboValue } from "../year/combo.year"; + +export declare class YearInterval extends Single { + static xtype: string; + static EVENT_VALID: string; + static EVENT_ERROR: string; + static EVENT_CHANGE: string; + static EVENT_BEFORE_POPUPVIEW: string; + + props: { + simple?: boolean; + } & Single['props']; + + getValue(): { + start: DynamicYearComboValue; + end: DynamicYearComboValue; + }; + + setMinDate(minDate: string): void; + + setMaxDate(maxDate: string): void; +} diff --git a/packages/fineui/typescript/widget/yearmonth/combo.yearmonth.ts b/packages/fineui/typescript/widget/yearmonth/combo.yearmonth.ts index 557173441..10f198e46 100644 --- a/packages/fineui/typescript/widget/yearmonth/combo.yearmonth.ts +++ b/packages/fineui/typescript/widget/yearmonth/combo.yearmonth.ts @@ -12,7 +12,18 @@ export declare class DynamicYearMonthCombo extends Single { getKey(): string; + getValue(): DynamicYearMonthComboValue; + setMinDate(minDate: string): void; setMaxDate(maxDate: string): void; } + +export interface DynamicYearMonthComboValue { + type: number; + value: { + year: number; + month: number; + }; +} + diff --git a/packages/fineui/typescript/widget/yearmonthinterval/yearmonthinterval.ts b/packages/fineui/typescript/widget/yearmonthinterval/yearmonthinterval.ts index 0c12744ae..9da536c22 100644 --- a/packages/fineui/typescript/widget/yearmonthinterval/yearmonthinterval.ts +++ b/packages/fineui/typescript/widget/yearmonthinterval/yearmonthinterval.ts @@ -1,4 +1,5 @@ import { Single } from '../../base/single/single'; +import { DynamicYearMonthComboValue } from '../yearmonth/combo.yearmonth'; export declare class YearMonthInterval extends Single { static xtype: string; @@ -7,9 +8,13 @@ export declare class YearMonthInterval extends Single { static EVENT_CHANGE: string; static EVENT_BEFORE_POPUPVIEW: string; + props: { + simple?: boolean; + } & Single['props']; + getValue(): { - start: number; - end: number; + start: DynamicYearMonthComboValue; + end: DynamicYearMonthComboValue; }; setMinDate(minDate: string): void; diff --git a/packages/fineui/typescript/widget/yearquarter/combo.yearquarter.ts b/packages/fineui/typescript/widget/yearquarter/combo.yearquarter.ts index b1e42df97..f1a07770b 100644 --- a/packages/fineui/typescript/widget/yearquarter/combo.yearquarter.ts +++ b/packages/fineui/typescript/widget/yearquarter/combo.yearquarter.ts @@ -5,7 +5,17 @@ export declare class DynamicYearQuarterCombo extends Widget { static EVENT_CONFIRM: string; static EVENT_BEFORE_POPUPVIEW: string; + getValue(): DynamicYearQuarterComboValue; + setMinDate(minDate: string): void; setMaxDate(maxDate: string): void; } + +export interface DynamicYearQuarterComboValue { + type: number; + value: { + year: number; + quarter: number; + }; +} diff --git a/packages/fineui/typescript/widget/yearquarterinterval/yearquarterinterval.ts b/packages/fineui/typescript/widget/yearquarterinterval/yearquarterinterval.ts new file mode 100644 index 000000000..30f90abcf --- /dev/null +++ b/packages/fineui/typescript/widget/yearquarterinterval/yearquarterinterval.ts @@ -0,0 +1,23 @@ +import { Single } from "../../base/single/single"; +import { DynamicYearQuarterComboValue } from "../yearquarter/combo.yearquarter"; + +export declare class YearQuarterInterval extends Single { + static xtype: string; + static EVENT_VALID: string; + static EVENT_ERROR: string; + static EVENT_CHANGE: string; + static EVENT_BEFORE_POPUPVIEW: string; + + props: { + simple?: boolean; + } & Single['props']; + + getValue(): { + start: DynamicYearQuarterComboValue; + end: DynamicYearQuarterComboValue; + }; + + setMinDate(minDate: string): void; + + setMaxDate(maxDate: string): void; +} From 831f9e02593485f36a0015add5c4e7b9711c11ef Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Fri, 3 Nov 2023 15:28:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/typescript/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/fineui/typescript/index.ts b/packages/fineui/typescript/index.ts index 3e85c960b..97de6153e 100644 --- a/packages/fineui/typescript/index.ts +++ b/packages/fineui/typescript/index.ts @@ -167,8 +167,10 @@ export { BubblePopupView, BubblePopupBarView, TextBubblePopupBarView } from "./c export { ArrowTreeGroupNodeCheckbox } from "./case/checkbox/check.arrownode"; export { NumberInterval } from "./widget/numberinterval/numberinterval"; export { DynamicYearQuarterCombo } from "./widget/yearquarter/combo.yearquarter"; +export { YearQuarterInterval } from "./widget/yearquarterinterval/yearquarterinterval"; export { DynamicYearCombo } from "./widget/year/combo.year"; export { DynamicYearPopup } from "./widget/year/popup.year"; +export { YearInterval } from "./widget/yearinterval/yearinterval"; export { IntervalSlider } from "./widget/intervalslider/intervalslider"; export { MultiSelectInsertList } from "./widget/multiselectlist/multiselectlist.insert"; export { YearMonthInterval } from "./widget/yearmonthinterval/yearmonthinterval";