From 5ae9597d5395f968b22d0a0307d38919fa1f8ebc Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Thu, 5 Aug 2021 10:25:58 +0800
Subject: [PATCH] feat: time-picker custom clearIcon

---
 components/components.ts                                      | 2 +-
 components/date-picker/generatePicker/generateRangePicker.tsx | 3 ++-
 .../date-picker/generatePicker/generateSinglePicker.tsx       | 3 ++-
 components/time-picker/time-picker.tsx                        | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/components.ts b/components/components.ts
index 3cc40ef3a..6f2501775 100644
--- a/components/components.ts
+++ b/components/components.ts
@@ -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';
diff --git a/components/date-picker/generatePicker/generateRangePicker.tsx b/components/date-picker/generatePicker/generateRangePicker.tsx
index 45742a0d8..d1ffaa412 100644
--- a/components/date-picker/generatePicker/generateRangePicker.tsx
+++ b/components/date-picker/generatePicker/generateRangePicker.tsx
@@ -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}
diff --git a/components/date-picker/generatePicker/generateSinglePicker.tsx b/components/date-picker/generatePicker/generateSinglePicker.tsx
index f569c0e2d..7c1ed0bad 100644
--- a/components/date-picker/generatePicker/generateSinglePicker.tsx
+++ b/components/date-picker/generatePicker/generateSinglePicker.tsx
@@ -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}
diff --git a/components/time-picker/time-picker.tsx b/components/time-picker/time-picker.tsx
index c31a0a1b4..e4b304bb0 100644
--- a/components/time-picker/time-picker.tsx
+++ b/components/time-picker/time-picker.tsx
@@ -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}
           />
         );
       };