From 1c985e855c5f9bf49104d387a1c9ef4f45b7df24 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Wed, 2 Aug 2023 20:27:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-131340=20fix:=20DynamicDateTimeCombo?= =?UTF-8?q?=E7=9A=84value=E9=BB=98=E8=AE=A4=E5=80=BC=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamicdatetime/dynamicdatetime.combo.js | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 97f916acb..73caee9fa 100644 --- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -31,29 +31,20 @@ export class DynamicDateTimeCombo extends Single { iconWidth: 24 }; - props = () => { - const date = getDate(); - return { - baseCls: "bi-dynamic-date--time-combo", - height: 24, - minDate: "1900-01-01", - maxDate: "2099-12-31", - format: "", - allowEdit: true, - supportDynamic: true, - attributes: { - tabIndex: -1 - }, - isNeedAdjustHeight: false, - isNeedAdjustWidth: false, - value: { - type: DynamicDateTimeCombo.Static, - value: { - year: date.getFullYear(), - month: date.getMonth() + 1 - } - } - }; + props = { + baseCls: "bi-dynamic-date--time-combo", + height: 24, + minDate: "1900-01-01", + maxDate: "2099-12-31", + format: "", + allowEdit: true, + supportDynamic: true, + attributes: { + tabIndex: -1, + }, + isNeedAdjustHeight: false, + isNeedAdjustWidth: false, + value: null, }; static EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; From f41e81b48e2db2630a06b725410dd59247313e66 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Wed, 2 Aug 2023 20:31:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BI-131340=20fix:=20DynamicDateTimeCombo?= =?UTF-8?q?=E4=B8=8D=E8=AE=BE=E7=BD=AEvalue=E7=9A=84=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 73caee9fa..3ac88d788 100644 --- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -44,7 +44,6 @@ export class DynamicDateTimeCombo extends Single { }, isNeedAdjustHeight: false, isNeedAdjustWidth: false, - value: null, }; static EVENT_KEY_DOWN = "EVENT_KEY_DOWN";