From d66c71b9399083e3da16db8347547cadfc7cb1b5 Mon Sep 17 00:00:00 2001 From: saller Date: Tue, 4 Jul 2023 19:56:58 +0800 Subject: [PATCH] fix(comp:date-picker): start and end cell calculation error (#1591) --- .../_private/date-panel/src/panel-body/PanelCell.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/components/_private/date-panel/src/panel-body/PanelCell.tsx b/packages/components/_private/date-panel/src/panel-body/PanelCell.tsx index 7b38cb825..3836d7786 100644 --- a/packages/components/_private/date-panel/src/panel-body/PanelCell.tsx +++ b/packages/components/_private/date-panel/src/panel-body/PanelCell.tsx @@ -61,8 +61,12 @@ export default defineComponent({ const cellTooltip = computed(() => panelProps.cellTooltip?.({ value: cellDate.value, disabled: !!isDisabled.value }), ) - const isStart = computed(() => startDate.value && dateConfig.isSame(startDate.value, cellDate.value, 'date')) - const isEnd = computed(() => endDate.value && dateConfig.isSame(endDate.value, cellDate.value, 'date')) + const isStart = computed( + () => startDate.value && dateConfig.isSame(startDate.value, cellDate.value, getPanelCellType(activeType.value)), + ) + const isEnd = computed( + () => endDate.value && dateConfig.isSame(endDate.value, cellDate.value, getPanelCellType(activeType.value)), + ) const isCurrent = computed(() => dateConfig.isSame(cellDate.value, dateConfig.now(), getPanelCellType(activeType.value)), )