From d453ab34e46babd4f596b7c8dc02491c0fdc8aeb Mon Sep 17 00:00:00 2001 From: jimmychai Date: Wed, 1 Nov 2023 16:19:09 +0800 Subject: [PATCH] =?UTF-8?q?BI-125208=20feat:=20=E7=BB=84=E4=BB=B6=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=B1=BB=E5=9E=8B=E7=9A=84=E8=BF=87=E6=BB=A4=E7=AE=97?= =?UTF-8?q?=E5=AD=90=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/widget/dynamicdatetime/dynamicdatetime.combo.js | 1 + .../src/widget/dynamicdatetime/dynamicdatetime.popup.js | 1 + .../widget/dynamicdatetime/dynamicdatetime.timeselect.js | 9 ++++++++- packages/fineui/src/widget/numbereditor/number.editor.js | 4 ++-- packages/fineui/src/widget/timeinterval/timeinterval.js | 1 + packages/fineui/src/widget/yearinterval/yearinterval.js | 2 ++ .../widget/yearquarterinterval/yearquarterinterval.js | 2 ++ 7 files changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 3ac88d788..0fc27ae09 100644 --- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -207,6 +207,7 @@ export class DynamicDateTimeCombo extends Single { popup: { el: { type: DynamicDateTimePopup.xtype, + timeSelectTypes: opts.timeSelectTypes, width: opts.isNeedAdjustWidth ? opts.width : undefined, supportDynamic: opts.supportDynamic, behaviors: opts.behaviors, diff --git a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.popup.js b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.popup.js index 6668ca462..33678a041 100644 --- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.popup.js +++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.popup.js @@ -204,6 +204,7 @@ export class DynamicDateTimePopup extends Widget { { el: { type: DynamicDateTimeSelect.xtype, + timeSelectTypes: o.timeSelectTypes, cls: "bi-split-top", ref: _ref => { this.timeSelect = _ref; diff --git a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js index 45355275b..32ef8f9a0 100644 --- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js +++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js @@ -29,11 +29,12 @@ export class DynamicDateTimeSelect extends Widget { return { baseCls: "bi-date-time-select", editorHeight: SIZE_CONSANTS.LIST_ITEM_HEIGHT, + timeSelectTypes: [DynamicDateTimeSelect.HOUR, DynamicDateTimeSelect.MINUTE, DynamicDateTimeSelect.SECOND], }; } render() { - const { editorHeight } = this.options; + const { editorHeight, timeSelectTypes } = this.options; return { type: CenterAdaptLayout.xtype, @@ -44,6 +45,8 @@ export class DynamicDateTimeSelect extends Widget { { el: { type: NumberEditor.xtype, + disabled: !timeSelectTypes.includes(DynamicDateTimeSelect.HOUR), + warningTitle: i18nText("BI-Basic_Do_Not_Support_Modification"), ref: _ref => { this.hour = _ref; }, @@ -89,6 +92,8 @@ export class DynamicDateTimeSelect extends Widget { }, { type: NumberEditor.xtype, + disabled: !timeSelectTypes.includes(DynamicDateTimeSelect.MINUTE), + warningTitle: i18nText("BI-Basic_Do_Not_Support_Modification"), ref: _ref => { this.minute = _ref; }, @@ -133,6 +138,8 @@ export class DynamicDateTimeSelect extends Widget { }, { type: NumberEditor.xtype, + disabled: !timeSelectTypes.includes(DynamicDateTimeSelect.SECOND), + warningTitle: i18nText("BI-Basic_Do_Not_Support_Modification"), ref: _ref => { this.second = _ref; }, diff --git a/packages/fineui/src/widget/numbereditor/number.editor.js b/packages/fineui/src/widget/numbereditor/number.editor.js index 1adc95ce4..054830699 100644 --- a/packages/fineui/src/widget/numbereditor/number.editor.js +++ b/packages/fineui/src/widget/numbereditor/number.editor.js @@ -1,6 +1,5 @@ import { shortcut, - Widget, extend, emptyFn, createWidget, @@ -18,9 +17,10 @@ import { import { SignEditor } from "@/case"; import { TextEditor } from "../editor"; import { IconButton } from "@/base"; +import { Single } from "../../base/single"; @shortcut() -export class NumberEditor extends Widget { +export class NumberEditor extends Single { static xtype = "bi.number_editor"; static EVENT_CONFIRM = "EVENT_CONFIRM"; diff --git a/packages/fineui/src/widget/timeinterval/timeinterval.js b/packages/fineui/src/widget/timeinterval/timeinterval.js index b1c9848c2..47e6d0210 100644 --- a/packages/fineui/src/widget/timeinterval/timeinterval.js +++ b/packages/fineui/src/widget/timeinterval/timeinterval.js @@ -76,6 +76,7 @@ export class TimeInterval extends Single { const o = this.options; const combo = createWidget({ type: DynamicDateTimeCombo.xtype, + timeSelectTypes: o.timeSelectTypes, simple: o.simple, supportDynamic: o.supportDynamic, minDate: o.minDate, diff --git a/packages/fineui/src/widget/yearinterval/yearinterval.js b/packages/fineui/src/widget/yearinterval/yearinterval.js index 42172300f..d82ee5654 100644 --- a/packages/fineui/src/widget/yearinterval/yearinterval.js +++ b/packages/fineui/src/widget/yearinterval/yearinterval.js @@ -28,6 +28,7 @@ export class YearInterval extends Single { minDate: "1900-01-01", maxDate: "2099-12-31", supportDynamic: true, + simple: false, }; static EVENT_VALID = "EVENT_VALID"; @@ -71,6 +72,7 @@ export class YearInterval extends Single { const o = this.options; const combo = createWidget({ type: DynamicYearCombo.xtype, + simple: o.simple, supportDynamic: o.supportDynamic, minDate: o.minDate, maxDate: o.maxDate, diff --git a/packages/fineui/src/widget/yearquarterinterval/yearquarterinterval.js b/packages/fineui/src/widget/yearquarterinterval/yearquarterinterval.js index 16fa9f4a5..e6ea96a7d 100644 --- a/packages/fineui/src/widget/yearquarterinterval/yearquarterinterval.js +++ b/packages/fineui/src/widget/yearquarterinterval/yearquarterinterval.js @@ -28,6 +28,7 @@ export class YearQuarterInterval extends Single { minDate: "1900-01-01", maxDate: "2099-12-31", supportDynamic: true, + simple: false, }; static EVENT_VALID = "EVENT_VALID"; @@ -71,6 +72,7 @@ export class YearQuarterInterval extends Single { const o = this.options; const combo = createWidget({ type: DynamicYearQuarterCombo.xtype, + simple: o.simple, supportDynamic: o.supportDynamic, minDate: o.minDate, maxDate: o.maxDate,