github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: showtime error

pull/4499/head
tangjinzhou 2021-08-04 10:45:21 +08:00
parent 6261cc0e59
commit e9404f1b0f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/date-picker/generatePicker/generateRangePicker.tsx
View File

@ -141,6 +141,7 @@ export default function generateRangePicker<DateType>(generateConfig: GenerateCo
allowClear = true, allowClear = true,
dateRender = slots.dateRender, dateRender = slots.dateRender,
renderExtraFooter = slots.renderExtraFooter, renderExtraFooter = slots.renderExtraFooter,
separator = slots.separator?.(),
...restProps ...restProps
} = p; } = p;
const { format, showTime } = p as any; const { format, showTime } = p as any;
@ -158,9 +159,11 @@ export default function generateRangePicker<DateType>(generateConfig: GenerateCo
dateRender={dateRender} dateRender={dateRender}
renderExtraFooter={renderExtraFooter} renderExtraFooter={renderExtraFooter}
separator={ separator={
<span aria-label="to" class={`${pre}-separator`}> separator || (
<SwapRightOutlined /> <span aria-label="to" class={`${pre}-separator`}>
</span> <SwapRightOutlined />
</span>
)
} }
ref={pickerRef} ref={pickerRef}
placeholder={getRangePlaceholder(picker, locale, placeholder)} placeholder={getRangePlaceholder(picker, locale, placeholder)}

2
components/date-picker/generatePicker/props.ts
View File

@ -110,7 +110,7 @@ function rangePickerProps<DateType>() {
disabled: { type: [Boolean, Array] as unknown as PropType<boolean | [boolean, boolean]> }, disabled: { type: [Boolean, Array] as unknown as PropType<boolean | [boolean, boolean]> },
format: String, format: String,
renderExtraFooter: { type: Function as PropType<() => VueNode> }, renderExtraFooter: { type: Function as PropType<() => VueNode> },
separator: { type: Function as PropType<() => VueNode> }, separator: { type: String },
ranges: { ranges: {
type: Object as PropType< type: Object as PropType<
Record< Record<

2
v2-doc

@ -1 +1 @@
Subproject commit 47e2b43427506e270fc8b39aae9c5c5649da3931 Subproject commit 689e25624473f1f0c4c9c5144778ebdbf58c972e