Browse Source

Pull request #3769: JSY-46272 feat: 动态日期时间支持屏蔽工作日

Merge in VISUAL/fineui from ~STAN.YANG/fineui:master to master

* commit 'f562dc17dc7f44a301492e4fb0f7b87197030127':
  JSY-46272 feat: 动态日期时间支持屏蔽工作日
master
parent
commit
d6916c4f48
  1. 2
      packages/fineui/src/widget/dynamicdate/dynamicdate.card.js
  2. 2
      packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js
  3. 2
      packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js
  4. 2
      packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js
  5. 2
      packages/fineui/src/widget/timeinterval/dateinterval.js
  6. 2
      packages/fineui/src/widget/timeinterval/timeinterval.js
  7. 1
      packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts
  8. 1
      packages/fineui/typescript/widget/timeinterval/dateinterval.ts

2
packages/fineui/src/widget/dynamicdate/dynamicdate.card.js

@ -45,6 +45,7 @@ export class DynamicDateCard extends Widget {
props = { props = {
baseCls: "bi-dynamic-date-card", baseCls: "bi-dynamic-date-card",
supportWorkDay: true,
}; };
render() { render() {
@ -162,6 +163,7 @@ export class DynamicDateCard extends Widget {
logic: { logic: {
dynamic: true, dynamic: true,
}, },
invisible: !this.options.supportWorkDay,
text: i18nText("BI-Basic_Work_Day"), text: i18nText("BI-Basic_Work_Day"),
value: DynamicDateCard.TYPE.WORK_DAY, value: DynamicDateCard.TYPE.WORK_DAY,
listeners: [ listeners: [

2
packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js

@ -51,6 +51,7 @@ export class DynamicDateCombo extends Single {
attributes: { attributes: {
tabIndex: -1, tabIndex: -1,
}, },
supportWorkDay: true,
isNeedAdjustHeight: false, isNeedAdjustHeight: false,
isNeedAdjustWidth: false, isNeedAdjustWidth: false,
isPreview: false, // 是否是预览状态 isPreview: false, // 是否是预览状态
@ -204,6 +205,7 @@ export class DynamicDateCombo extends Single {
isPreview: opts.isPreview, isPreview: opts.isPreview,
width: opts.isNeedAdjustWidth ? opts.width : undefined, width: opts.isNeedAdjustWidth ? opts.width : undefined,
supportDynamic: opts.supportDynamic, supportDynamic: opts.supportDynamic,
supportWorkDay: opts.supportWorkDay,
behaviors: opts.behaviors, behaviors: opts.behaviors,
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,

2
packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js

@ -34,6 +34,7 @@ export class DynamicDatePopup extends Widget {
baseCls: "bi-dynamic-date-popup", baseCls: "bi-dynamic-date-popup",
width: 272, width: 272,
supportDynamic: true, supportDynamic: true,
supportWorkDay: true,
isPreview: false, // 是否是预览状态 isPreview: false, // 是否是预览状态
}; };
@ -164,6 +165,7 @@ export class DynamicDatePopup extends Widget {
return { return {
type: DynamicDateCard.xtype, type: DynamicDateCard.xtype,
cls: "dynamic-date-pane", cls: "dynamic-date-pane",
supportWorkDay: this.options.supportWorkDay,
listeners: [ listeners: [
{ {
eventName: "EVENT_CHANGE", eventName: "EVENT_CHANGE",

2
packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -39,6 +39,7 @@ export class DynamicDateTimeCombo extends Single {
format: "", format: "",
allowEdit: true, allowEdit: true,
supportDynamic: true, supportDynamic: true,
supportWorkDay: true,
attributes: { attributes: {
tabIndex: -1, tabIndex: -1,
}, },
@ -212,6 +213,7 @@ export class DynamicDateTimeCombo extends Single {
timeSelectTypes: opts.timeSelectTypes, timeSelectTypes: opts.timeSelectTypes,
width: opts.isNeedAdjustWidth ? opts.width : undefined, width: opts.isNeedAdjustWidth ? opts.width : undefined,
supportDynamic: opts.supportDynamic, supportDynamic: opts.supportDynamic,
supportWorkDay: opts.supportWorkDay,
behaviors: opts.behaviors, behaviors: opts.behaviors,
min: opts.minDate, min: opts.minDate,
max: opts.maxDate, max: opts.maxDate,

2
packages/fineui/src/widget/timeinterval/dateinterval.js

@ -43,6 +43,7 @@ export class DateInterval extends Single {
height: 24, height: 24,
format: "", format: "",
supportDynamic: true, supportDynamic: true,
supportWorkDay: true,
simple: false, simple: false,
}); });
} }
@ -93,6 +94,7 @@ export class DateInterval extends Single {
popup: o.popup, popup: o.popup,
isPreview: o.isPreview, isPreview: o.isPreview,
supportDynamic: o.supportDynamic, supportDynamic: o.supportDynamic,
supportWorkDay: o.supportWorkDay,
minDate: o.minDate, minDate: o.minDate,
maxDate: o.maxDate, maxDate: o.maxDate,
simple: o.simple, simple: o.simple,

2
packages/fineui/src/widget/timeinterval/timeinterval.js

@ -42,6 +42,7 @@ export class TimeInterval extends Single {
height: 24, height: 24,
format: "", format: "",
supportDynamic: true, supportDynamic: true,
supportWorkDay: true,
}); });
} }
@ -91,6 +92,7 @@ export class TimeInterval extends Single {
popup: o.popup, popup: o.popup,
isPreview: o.isPreview, isPreview: o.isPreview,
timeSelectTypes: o.timeSelectTypes, timeSelectTypes: o.timeSelectTypes,
supportWorkDay: o.supportWorkDay,
simple: o.simple, simple: o.simple,
supportDynamic: o.supportDynamic, supportDynamic: o.supportDynamic,
minDate: o.minDate, minDate: o.minDate,

1
packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts

@ -20,6 +20,7 @@ export declare class DynamicDateTimeCombo extends Single {
format?: string; format?: string;
allowEdit?: boolean; allowEdit?: boolean;
supportDynamic?: boolean; supportDynamic?: boolean;
supportWorkDay?: boolean;
attributes?: { attributes?: {
tabIndex?: number; tabIndex?: number;
}; };

1
packages/fineui/typescript/widget/timeinterval/dateinterval.ts

@ -14,6 +14,7 @@ export declare class DateInterval extends Single {
minDate?: string; minDate?: string;
maxDate?: string; maxDate?: string;
supportDynamic?: boolean; supportDynamic?: boolean;
supportWorkDay?: boolean;
watermark?: string; watermark?: string;
container?: string; container?: string;
popup?: any; popup?: any;

Loading…
Cancel
Save