Quellcode durchsuchen

fix: type error of form hoc and datepicker month

point.halo vor 11 Monaten
Ursprung
Commit
121ec35b49

+ 2 - 6
packages/semi-foundation/datePicker/monthFoundation.ts

@@ -19,8 +19,8 @@ export interface MonthFoundationProps {
     disabledDate: (day: Date, options?: { rangeStart: string; rangeEnd: string }) => boolean;
     weeksRowNum: number;
     onWeeksRowNumChange: (weeksRowNum: number) => void;
-    renderDate: () => void;
-    renderFullDate: () => void;
+    renderDate: (dayNumber: number, fullDate: string) => React.ReactNode;
+    renderFullDate: (dayNumber: number, fullDate: string, dayStatus: any) => React.ReactNode;
     hoverDay: string; // Real-time hover date
     startDateOffset: () => void;
     endDateOffset: () => void;
@@ -35,10 +35,6 @@ export type MonthDayInfo = {
     dayNumber: number;
     dayNumberFull?: string;
     fullDate: string
-} | {
-    dayNumber: string;
-    dayNumberFull?: string;
-    fullDate: string
 };
 
 export interface MonthInfo {

+ 1 - 1
packages/semi-foundation/package.json

@@ -29,7 +29,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "6187fa0e9aab01113105701add48de86dbc332b2",
+    "gitHead": "495c8a72c1811f44d980b1bfa562d3b18d354228",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",

+ 4 - 2
packages/semi-ui/datePicker/month.tsx

@@ -15,7 +15,9 @@ const prefixCls = cssClasses.PREFIX;
 export interface MonthProps extends MonthFoundationProps, BaseProps {
     forwardRef: React.Ref<any>;
     locale: Locale['DatePicker'];
-    focusRecordsRef: React.RefObject<{ rangeStart: boolean; rangeEnd: boolean }>
+    focusRecordsRef: React.RefObject<{ rangeStart: boolean; rangeEnd: boolean }>;
+    renderDate: (dayNumber: number, fullDate: string) => React.ReactNode;
+    renderFullDate: (dayNumber: number, fullDate: string, dayStatus: any) => React.ReactNode
 }
 
 export type MonthState = MonthFoundationState;
@@ -350,7 +352,7 @@ export default class Month extends BaseComponent<MonthProps, MonthState> {
             [`${cssClasses.DAY}-main`]: true,
         });
 
-        const fullDateArgs = [dayNumber, fullDate, dayStatus];
+        const fullDateArgs: [number, string, any] = [dayNumber, fullDate, dayStatus];
         const customRender = isFunction(renderFullDate);
 
         return (

+ 1 - 0
packages/semi-ui/form/hoc/withField.tsx

@@ -637,6 +637,7 @@ function withField<
             return FieldComponent();
         }
     };
+    // @ts-ignore
     SemiField = forwardRef(SemiField);
     (SemiField as React.FC).displayName = getDisplayName(Component);
     return SemiField as any;

+ 1 - 0
packages/semi-ui/form/hoc/withFormApi.tsx

@@ -14,6 +14,7 @@ function withFormApi<
             </FormApiContext.Consumer>
         );
     };
+    // @ts-ignore
     WithApiCom = forwardRef(WithApiCom);
     return WithApiCom as R;
 }

+ 1 - 0
packages/semi-ui/form/hoc/withFormState.tsx

@@ -14,6 +14,7 @@ function withFormState<
             </FormStateContext.Consumer>
         );
     };
+    // @ts-ignore
     WithStateCom = forwardRef(WithStateCom);
     return WithStateCom as R;
 }