From f9898df8513da30684f47739d8dff54a84acfea3 Mon Sep 17 00:00:00 2001 From: l30053176 Date: Wed, 24 Jul 2024 11:50:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9yearPanel=E4=B8=AD?= =?UTF-8?q?=E7=9A=84disabled=E6=98=BE=E7=A4=BA=E8=AF=95=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/PickerPanel/YearPanel/index.tsx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/PickerPanel/YearPanel/index.tsx b/src/PickerPanel/YearPanel/index.tsx index be585dc91..ff25db748 100644 --- a/src/PickerPanel/YearPanel/index.tsx +++ b/src/PickerPanel/YearPanel/index.tsx @@ -66,13 +66,9 @@ export default function YearPanel( const startDate = generateConfig.setDate(startMonth, 1); // End - const endMonth = generateConfig.setMonth( - currentDate, - generateConfig.getMonth(currentDate) + 1, - ); - const enDate = generateConfig.addDate(endMonth, -1); - - return disabledDate(startDate, disabledInfo) && disabledDate(enDate, disabledInfo); + const endMonth = generateConfig.setMonth(currentDate, 11); + const endDate = generateConfig.addDate(endMonth, 31); + return disabledDate(startDate, disabledInfo) && disabledDate(endDate, disabledInfo); } : null; From e94363d604c2618f850fdb551acb4cb5d1f1a51a Mon Sep 17 00:00:00 2001 From: sakuraee <56988719+sakuraee@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:16:38 +0800 Subject: [PATCH 2/3] Update index.tsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改拼写错误 --- src/PickerPanel/YearPanel/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PickerPanel/YearPanel/index.tsx b/src/PickerPanel/YearPanel/index.tsx index ff25db748..7bae93985 100644 --- a/src/PickerPanel/YearPanel/index.tsx +++ b/src/PickerPanel/YearPanel/index.tsx @@ -67,7 +67,7 @@ export default function YearPanel( // End const endMonth = generateConfig.setMonth(currentDate, 11); - const endDate = generateConfig.addDate(endMonth, 31); + const endDate = generateConfig.setDate(endMonth, 31); return disabledDate(startDate, disabledInfo) && disabledDate(endDate, disabledInfo); } : null; From b9016cea3de645ab90a29f8e97781006333607aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?= Date: Mon, 29 Jul 2024 16:41:02 +0800 Subject: [PATCH 3/3] test: update test case --- src/PickerPanel/YearPanel/index.tsx | 4 ++-- tests/panel.spec.tsx | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/PickerPanel/YearPanel/index.tsx b/src/PickerPanel/YearPanel/index.tsx index 7bae93985..fad63562a 100644 --- a/src/PickerPanel/YearPanel/index.tsx +++ b/src/PickerPanel/YearPanel/index.tsx @@ -66,8 +66,8 @@ export default function YearPanel( const startDate = generateConfig.setDate(startMonth, 1); // End - const endMonth = generateConfig.setMonth(currentDate, 11); - const endDate = generateConfig.setDate(endMonth, 31); + const endMonth = generateConfig.addYear(startDate, 1); + const endDate = generateConfig.addDate(endMonth, -1); return disabledDate(startDate, disabledInfo) && disabledDate(endDate, disabledInfo); } : null; diff --git a/tests/panel.spec.tsx b/tests/panel.spec.tsx index b9af5afd0..39131afab 100644 --- a/tests/panel.spec.tsx +++ b/tests/panel.spec.tsx @@ -715,4 +715,15 @@ describe('Picker.Panel', () => { expect(container.querySelector('.rc-picker-header-view').textContent).toEqual('01:02:03 AM'); }); + it('year panel disabled check', () => { + const { container } = render( + date.isBefore(getDay('1990-12-25'))} + defaultValue={getDay('1990-01-01')} + />, + ); + + expect(container.querySelector('.rc-picker-cell-selected').textContent).toEqual('1990'); + }); });