feat: time-picker custom clearIcon
parent
11b718518d
commit
5ae9597d53
|
@ -180,7 +180,7 @@ export type { TagProps } from './tag';
|
|||
export { default as Tag, CheckableTag } from './tag';
|
||||
|
||||
export type { TimePickerProps, TimeRangePickerProps } from './time-picker';
|
||||
export { default as TimePicker } from './time-picker';
|
||||
export { default as TimePicker, TimeRangePicker } from './time-picker';
|
||||
|
||||
export type { TimelineProps, TimelineItemProps } from './timeline';
|
||||
export { default as Timeline, TimelineItem } from './timeline';
|
||||
|
|
|
@ -148,6 +148,7 @@ export default function generateRangePicker<DateType>(
|
|||
dateRender = slots.dateRender,
|
||||
renderExtraFooter = slots.renderExtraFooter,
|
||||
separator = slots.separator?.(),
|
||||
clearIcon = slots.clearIcon?.(),
|
||||
...restProps
|
||||
} = p;
|
||||
const { format, showTime } = p as any;
|
||||
|
@ -176,7 +177,7 @@ export default function generateRangePicker<DateType>(
|
|||
suffixIcon={
|
||||
suffixIcon || (picker === 'time' ? <ClockCircleOutlined /> : <CalendarOutlined />)
|
||||
}
|
||||
clearIcon={<CloseCircleFilled />}
|
||||
clearIcon={clearIcon || <CloseCircleFilled />}
|
||||
allowClear={allowClear}
|
||||
transitionName={transitionName || `${rootPrefixCls.value}-slide-up`}
|
||||
{...restProps}
|
||||
|
|
|
@ -145,6 +145,7 @@ export default function generatePicker<DateType>(
|
|||
monthCellRender = slots.monthCellRender ||
|
||||
(props as any).monthCellContentRender ||
|
||||
slots.monthCellContentRender,
|
||||
clearIcon = slots.clearIcon?.(),
|
||||
...restProps
|
||||
} = p;
|
||||
const showTime = p.showTime === '' ? true : p.showTime;
|
||||
|
@ -181,7 +182,7 @@ export default function generatePicker<DateType>(
|
|||
suffixIcon ||
|
||||
(mergedPicker === 'time' ? <ClockCircleOutlined /> : <CalendarOutlined />)
|
||||
}
|
||||
clearIcon={<CloseCircleFilled />}
|
||||
clearIcon={clearIcon || <CloseCircleFilled />}
|
||||
allowClear={allowClear}
|
||||
transitionName={transitionName || `${rootPrefixCls.value}-slide-up`}
|
||||
{...restProps}
|
||||
|
|
|
@ -92,7 +92,6 @@ function createTimePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
|
|||
return (
|
||||
<InternalTimePicker
|
||||
{...attrs}
|
||||
{...slots}
|
||||
{...props}
|
||||
dropdownClassName={props.popupClassName}
|
||||
mode={undefined}
|
||||
|
@ -103,6 +102,7 @@ function createTimePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
|
|||
onFocus={onFoucs}
|
||||
onBlur={onBlur}
|
||||
onOk={onOk}
|
||||
v-slots={slots}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
@ -177,7 +177,6 @@ function createTimePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
|
|||
return (
|
||||
<InternalRangePicker
|
||||
{...attrs}
|
||||
{...slots}
|
||||
{...props}
|
||||
dropdownClassName={props.popupClassName}
|
||||
picker="time"
|
||||
|
@ -190,6 +189,7 @@ function createTimePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
|
|||
onPanelChange={onPanelChange}
|
||||
onOk={onOk}
|
||||
onCalendarChange={onCalendarChange}
|
||||
v-slots={slots}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue