fix(ui): fix ts of FormGroup

Author: xiejay97

packages/ui/src/components/form/FormGroup.tsx

@@ -1,3 +1,4 @@
+import type { AbstractControl } from './abstract-control';
 import type { FormGroup } from './form-group';
 
 import React from 'react';
@@ -9,7 +10,7 @@ export const DFormGroupContext = React.createContext<FormGroup | null>(null);
 
 export interface DFormGroupProps {
   children: React.ReactNode;
-  dFormGroup: FormGroup;
+  dFormGroup: AbstractControl;
   dTitle?: React.ReactNode;
 }
 
@@ -18,7 +19,7 @@ export function DFormGroup(props: DFormGroupProps): JSX.Element | null {
   const { children, dFormGroup, dTitle } = useComponentConfig(COMPONENT_NAME, props);
 
   return (
-    <DFormGroupContext.Provider value={dFormGroup}>
+    <DFormGroupContext.Provider value={dFormGroup as any as FormGroup}>
       {dTitle}
       {children}
     </DFormGroupContext.Provider>

packages/ui/src/components/form/form-group.ts

@@ -21,6 +21,11 @@ type GetFormControlProperty<T, S> = S extends `${infer K}.${infer R}`
   ? T[S]
   : any;
 
+type GetFormGroupT<C extends FormGroup<any>> = C extends FormGroup<infer T> ? T : unknown;
+type GetFormGroupValue<T extends { [K in keyof T]: AbstractControl }> = {
+  [K in keyof T]?: T[K] extends FormGroup ? GetFormGroupValue<GetFormGroupT<T[K]>> : T[K]['value'];
+};
+
 function find(control: AbstractControl, path: string[] | string, delimiter: string) {
   if (path == null) return null;
 
@@ -107,15 +112,15 @@ export class FormGroup<T extends { [K in keyof T]: AbstractControl } = any> exte
     });
     this.updateValueAndValidity(onlySelf);
   }
-  override patchValue(value: { [K in keyof T]?: T[K]['value'] } & { [K: string]: any }, onlySelf?: boolean): void {
+  override patchValue(value: GetFormGroupValue<T> & { [K: string]: any }, onlySelf?: boolean): void {
     Object.keys(value).forEach((name) => {
       if (this.controls[name]) {
         this.controls[name].patchValue(value[name], true);
       }
     });
     this.updateValueAndValidity(onlySelf);
   }
-  override reset(value: { [K in keyof T]?: T[K]['value'] } & { [K: string]: any } = {}, onlySelf?: boolean): void {
+  override reset(value: GetFormGroupValue<T> & { [K: string]: any } = {}, onlySelf?: boolean): void {
     this._forEachChild((control, name) => {
       control.reset(value[name], true);
     });