From f562dc17dc7f44a301492e4fb0f7b87197030127 Mon Sep 17 00:00:00 2001 From: "stan.yang" Date: Tue, 17 Dec 2024 17:40:20 +0800 Subject: [PATCH] =?UTF-8?q?JSY-46272=20feat:=20=E5=8A=A8=E6=80=81=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E6=94=AF=E6=8C=81=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/widget/dynamicdate/dynamicdate.card.js | 2 ++ packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js | 4 +++- packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js | 2 ++ .../src/widget/dynamicdatetime/dynamicdatetime.combo.js | 2 ++ packages/fineui/src/widget/timeinterval/dateinterval.js | 2 ++ packages/fineui/src/widget/timeinterval/timeinterval.js | 2 ++ .../widget/dynamicdatetime/dynamicdatetime.combo.ts | 1 + .../fineui/typescript/widget/timeinterval/dateinterval.ts | 1 + 8 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/fineui/src/widget/dynamicdate/dynamicdate.card.js b/packages/fineui/src/widget/dynamicdate/dynamicdate.card.js index 9ea322d12..c2521bbf4 100644 --- a/packages/fineui/src/widget/dynamicdate/dynamicdate.card.js +++ b/packages/fineui/src/widget/dynamicdate/dynamicdate.card.js @@ -45,6 +45,7 @@ export class DynamicDateCard extends Widget { props = { baseCls: "bi-dynamic-date-card", + supportWorkDay: true, }; render() { @@ -162,6 +163,7 @@ export class DynamicDateCard extends Widget { logic: { dynamic: true, }, + invisible: !this.options.supportWorkDay, text: i18nText("BI-Basic_Work_Day"), value: DynamicDateCard.TYPE.WORK_DAY, listeners: [ diff --git a/packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js b/packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js index 27e0caae0..d8153894c 100644 --- a/packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js +++ b/packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js @@ -28,7 +28,7 @@ export class DynamicDateCombo extends Single { static EVENT_ERROR = "EVENT_ERROR"; static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW"; - + static Static = 1; static Dynamic = 2; @@ -51,6 +51,7 @@ export class DynamicDateCombo extends Single { attributes: { tabIndex: -1, }, + supportWorkDay: true, isNeedAdjustHeight: false, isNeedAdjustWidth: false, isPreview: false, // 是否是预览状态 @@ -204,6 +205,7 @@ export class DynamicDateCombo extends Single { isPreview: opts.isPreview, width: opts.isNeedAdjustWidth ? opts.width : undefined, supportDynamic: opts.supportDynamic, + supportWorkDay: opts.supportWorkDay, behaviors: opts.behaviors, min: opts.minDate, max: opts.maxDate, diff --git a/packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js b/packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js index c4eafa71e..f647452b0 100644 --- a/packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js +++ b/packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js @@ -34,6 +34,7 @@ export class DynamicDatePopup extends Widget { baseCls: "bi-dynamic-date-popup", width: 272, supportDynamic: true, + supportWorkDay: true, isPreview: false, // 是否是预览状态 }; @@ -164,6 +165,7 @@ export class DynamicDatePopup extends Widget { return { type: DynamicDateCard.xtype, cls: "dynamic-date-pane", + supportWorkDay: this.options.supportWorkDay, listeners: [ { eventName: "EVENT_CHANGE", diff --git a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 3be733631..b89e8cbb8 100644 --- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -39,6 +39,7 @@ export class DynamicDateTimeCombo extends Single { format: "", allowEdit: true, supportDynamic: true, + supportWorkDay: true, attributes: { tabIndex: -1, }, @@ -212,6 +213,7 @@ export class DynamicDateTimeCombo extends Single { timeSelectTypes: opts.timeSelectTypes, width: opts.isNeedAdjustWidth ? opts.width : undefined, supportDynamic: opts.supportDynamic, + supportWorkDay: opts.supportWorkDay, behaviors: opts.behaviors, min: opts.minDate, max: opts.maxDate, diff --git a/packages/fineui/src/widget/timeinterval/dateinterval.js b/packages/fineui/src/widget/timeinterval/dateinterval.js index 180785b39..5f1aaef77 100644 --- a/packages/fineui/src/widget/timeinterval/dateinterval.js +++ b/packages/fineui/src/widget/timeinterval/dateinterval.js @@ -43,6 +43,7 @@ export class DateInterval extends Single { height: 24, format: "", supportDynamic: true, + supportWorkDay: true, simple: false, }); } @@ -93,6 +94,7 @@ export class DateInterval extends Single { popup: o.popup, isPreview: o.isPreview, supportDynamic: o.supportDynamic, + supportWorkDay: o.supportWorkDay, minDate: o.minDate, maxDate: o.maxDate, simple: o.simple, diff --git a/packages/fineui/src/widget/timeinterval/timeinterval.js b/packages/fineui/src/widget/timeinterval/timeinterval.js index f84971e69..4a4b580d7 100644 --- a/packages/fineui/src/widget/timeinterval/timeinterval.js +++ b/packages/fineui/src/widget/timeinterval/timeinterval.js @@ -42,6 +42,7 @@ export class TimeInterval extends Single { height: 24, format: "", supportDynamic: true, + supportWorkDay: true, }); } @@ -91,6 +92,7 @@ export class TimeInterval extends Single { popup: o.popup, isPreview: o.isPreview, timeSelectTypes: o.timeSelectTypes, + supportWorkDay: o.supportWorkDay, simple: o.simple, supportDynamic: o.supportDynamic, minDate: o.minDate, diff --git a/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts b/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts index 7ef1abc68..63f8b0845 100644 --- a/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts +++ b/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts @@ -20,6 +20,7 @@ export declare class DynamicDateTimeCombo extends Single { format?: string; allowEdit?: boolean; supportDynamic?: boolean; + supportWorkDay?: boolean; attributes?: { tabIndex?: number; }; diff --git a/packages/fineui/typescript/widget/timeinterval/dateinterval.ts b/packages/fineui/typescript/widget/timeinterval/dateinterval.ts index 27ca6f787..ec4932452 100644 --- a/packages/fineui/typescript/widget/timeinterval/dateinterval.ts +++ b/packages/fineui/typescript/widget/timeinterval/dateinterval.ts @@ -14,6 +14,7 @@ export declare class DateInterval extends Single { minDate?: string; maxDate?: string; supportDynamic?: boolean; + supportWorkDay?: boolean; watermark?: string; container?: string; popup?: any;