From e9404f1b0fed3837186dab9eb0feead4297d650f Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Wed, 4 Aug 2021 10:45:21 +0800 Subject: [PATCH] fix: showtime error --- .../date-picker/generatePicker/generateRangePicker.tsx | 9 ++++++--- components/date-picker/generatePicker/props.ts | 2 +- v2-doc | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/components/date-picker/generatePicker/generateRangePicker.tsx b/components/date-picker/generatePicker/generateRangePicker.tsx index 6ec3a1b7e..2cde9df85 100644 --- a/components/date-picker/generatePicker/generateRangePicker.tsx +++ b/components/date-picker/generatePicker/generateRangePicker.tsx @@ -141,6 +141,7 @@ export default function generateRangePicker(generateConfig: GenerateCo allowClear = true, dateRender = slots.dateRender, renderExtraFooter = slots.renderExtraFooter, + separator = slots.separator?.(), ...restProps } = p; const { format, showTime } = p as any; @@ -158,9 +159,11 @@ export default function generateRangePicker(generateConfig: GenerateCo dateRender={dateRender} renderExtraFooter={renderExtraFooter} separator={ - - - + separator || ( + + + + ) } ref={pickerRef} placeholder={getRangePlaceholder(picker, locale, placeholder)} diff --git a/components/date-picker/generatePicker/props.ts b/components/date-picker/generatePicker/props.ts index a5e68e10c..b233ac193 100644 --- a/components/date-picker/generatePicker/props.ts +++ b/components/date-picker/generatePicker/props.ts @@ -110,7 +110,7 @@ function rangePickerProps() { disabled: { type: [Boolean, Array] as unknown as PropType }, format: String, renderExtraFooter: { type: Function as PropType<() => VueNode> }, - separator: { type: Function as PropType<() => VueNode> }, + separator: { type: String }, ranges: { type: Object as PropType< Record< diff --git a/v2-doc b/v2-doc index 47e2b4342..689e25624 160000 --- a/v2-doc +++ b/v2-doc @@ -1 +1 @@ -Subproject commit 47e2b43427506e270fc8b39aae9c5c5649da3931 +Subproject commit 689e25624473f1f0c4c9c5144778ebdbf58c972e