chore(form): fixed type issues

l123wx · Oct 15, 2024 · 581ddb5 · 581ddb5
1 parent ceebac6
commit 581ddb5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/src/form/FormContext.tsx b/src/form/FormContext.tsx
@@ -47,7 +47,7 @@ export const FormListContext = React.createContext<{
   name: NamePath;
   rules: TdFormListProps['rules'];
   formListMapRef: React.RefObject<Map<any, React.RefObject<FormItemInstance>>>;
-  initialData: TdFormProps['initialData'];
+  initialData: TdFormListProps['initialData'];
 }>({
   name: undefined,
   rules: undefined,

diff --git a/src/form/FormItem.tsx b/src/form/FormItem.tsx
@@ -32,7 +32,7 @@ import useDefaultProps from '../hooks/useDefaultProps';
 import { useLocaleReceiver } from '../locale/LocalReceiver';
 
 export interface FormItemProps extends TdFormItemProps, StyledProps {
-  children?: React.ReactNode | ((form: FormInstanceFunctions) => React.ReactElement);
+  children?: React.ReactNode | React.ReactNode[] | ((form: FormInstanceFunctions) => React.ReactElement);
 }
 
 export interface FormItemInstance {

diff --git a/src/form/useInitialData.ts b/src/form/useInitialData.ts
@@ -1,5 +1,6 @@
 import React from 'react';
 import get from 'lodash/get';
+import isFunction from 'lodash/isFunction';
 
 // 兼容特殊数据结构和受控 key
 import Tree from '../tree/Tree';
@@ -13,6 +14,9 @@ import CheckboxGroup from '../checkbox/CheckboxGroup';
 import DateRangePicker from '../date-picker/DateRangePicker';
 import TimeRangePicker from '../time-picker/TimeRangePicker';
 
+import { FormItemProps } from './FormItem';
+import { TdFormListProps, TdFormProps } from './type';
+
 // FormItem 子组件受控 key
 export const ctrlKeyMap = new Map();
 ctrlKeyMap.set(Checkbox, 'checked');
@@ -36,25 +40,36 @@ export function getDefaultInitialData({
   initialData,
   FormContextInitialData,
   FormListInitialData,
+}: {
+  name: FormItemProps['name'];
+  formListName: TdFormListProps['name'];
+  children: FormItemProps['children'];
+  initialData: FormItemProps['initialData'];
+  FormContextInitialData: TdFormProps['initialData'];
+  FormListInitialData: TdFormListProps['initialData'];
 }) {
   let defaultInitialData;
   if (FormContextInitialData) {
     if (typeof name === 'string') defaultInitialData = get(FormContextInitialData, name);
     if (Array.isArray(name)) {
-      const nameList = formListName ? [formListName, ...name] : name;
+      const nameList = formListName ? [formListName, name].flat() : name;
       defaultInitialData = get(FormContextInitialData, nameList);
     }
   }
   if (FormListInitialData.length) {
     defaultInitialData = get(FormListInitialData, name);
   }
   if (typeof initialData !== 'undefined') defaultInitialData = initialData;
-  React.Children.forEach(children, (child) => {
-    if (child && React.isValidElement(child) && typeof defaultInitialData === 'undefined') {
-      // @ts-ignore
-      const isMultiple = child?.props?.multiple;
-      defaultInitialData = isMultiple ? [] : initialDataMap.get(child.type);
-    }
-  });
+
+  if (!isFunction(children)) {
+    React.Children.forEach(children, (child) => {
+      if (child && React.isValidElement(child) && typeof defaultInitialData === 'undefined') {
+        // @ts-ignore
+        const isMultiple = child?.props?.multiple;
+        defaultInitialData = isMultiple ? [] : initialDataMap.get(child.type);
+      }
+    });
+  }
+
   return defaultInitialData;
 }