From 227e7c884c4783c336773890e87773e500af42e8 Mon Sep 17 00:00:00 2001 From: jianglinjun Date: Tue, 6 Aug 2024 10:41:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E5=99=A8=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=90=8C=E4=BD=86=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E6=97=B6=E4=B8=8D=E8=A7=A6=E5=8F=91=E5=80=BC?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../date-range-select-picker/date-range-select.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/editor/date-range-select/date-range-select-picker/date-range-select.tsx b/src/editor/date-range-select/date-range-select-picker/date-range-select.tsx index 6f002781..5eae4c86 100644 --- a/src/editor/date-range-select/date-range-select-picker/date-range-select.tsx +++ b/src/editor/date-range-select/date-range-select-picker/date-range-select.tsx @@ -239,6 +239,10 @@ export const IBizDateRangeSelect = defineComponent({ popVisible.value.ALL = false; } else { isOverClose.value = false; + if (props.value.type && timeType.value !== props.value.type) { + popVisible.value.ALL = false; + onTimeChange(timeType.value, curValue.value); + } } } }; -- Gitee From db15222a740de908e97faf13bbb384eccc215f3c Mon Sep 17 00:00:00 2001 From: jianglinjun Date: Tue, 6 Aug 2024 16:22:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../date-range-select-picker/date-range-select.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/date-range-select/date-range-select-picker/date-range-select.tsx b/src/editor/date-range-select/date-range-select-picker/date-range-select.tsx index 5eae4c86..dd657d6a 100644 --- a/src/editor/date-range-select/date-range-select-picker/date-range-select.tsx +++ b/src/editor/date-range-select/date-range-select-picker/date-range-select.tsx @@ -239,7 +239,7 @@ export const IBizDateRangeSelect = defineComponent({ popVisible.value.ALL = false; } else { isOverClose.value = false; - if (props.value.type && timeType.value !== props.value.type) { + if (props.value?.type && timeType.value !== props.value.type) { popVisible.value.ALL = false; onTimeChange(timeType.value, curValue.value); } -- Gitee