Merge remote-tracking branch 'origin/main' into feat-v4

components/calendar/generateCalendar.tsx

@@ -88,7 +88,7 @@ function generateCalendar<
     );
   }
 
-  const Calendar = defineComponent({
+  const Calendar = defineComponent<Props>({
     name: 'ACalendar',
     inheritAttrs: false,
     props: {
@@ -122,7 +122,7 @@ function generateCalendar<
       onPanelChange: { type: Function as PropType<Props['onPanelChange']>, default: undefined },
       onSelect: { type: Function as PropType<Props['onSelect']>, default: undefined },
       valueFormat: { type: String, default: undefined },
-    },
+    } as any,
     slots: Object as CustomSlotsType<{
       dateFullCellRender?: { current: DateType };
       dateCellRender?: { current: DateType };

components/time-picker/time-picker.tsx

@@ -77,15 +77,15 @@ function createTimePicker<
   });
 
   const { TimePicker: InternalTimePicker, RangePicker: InternalRangePicker } = DatePicker as any;
-  const TimePicker = defineComponent({
+  const TimePicker = defineComponent<DTimePickerProps>({
     name: 'ATimePicker',
     inheritAttrs: false,
     props: {
-      ...commonProps<DateType>(),
-      ...datePickerProps<DateType>(),
+      ...commonProps<any>(),
+      ...datePickerProps<any>(),
       ...timePickerProps(),
       addon: { type: Function },
-    },
+    } as any,
     slots: Object as CustomSlotsType<{
       addon?: any;
       renderExtraFooter?: any;
@@ -155,15 +155,15 @@ function createTimePicker<
     },
   });
 
-  const TimeRangePicker = defineComponent({
+  const TimeRangePicker = defineComponent<DTimeRangePickerProps>({
     name: 'ATimeRangePicker',
     inheritAttrs: false,
     props: {
-      ...commonProps<DateType>(),
-      ...rangePickerProps<DateType>(),
+      ...commonProps<any>(),
+      ...rangePickerProps<any>(),
       ...timePickerProps(),
       order: { type: Boolean, default: true },
-    },
+    } as any,
     slots: Object as CustomSlotsType<{
       renderExtraFooter?: any;
       suffixIcon?: any;