fix: 🐛 (shadow-form) form -> subFormOptions, and inherit parent

Author: charlzyx

src/pro-array-table/mixin.pro.tsx

@@ -146,7 +146,7 @@ export const ArrayTableShowModal: React.FC<
     CommonShadowPopup
 > = (props) => {
   const { SchemaField, form, schema } = useShadowForm(
-    pick(props, "schema", "schemaFieldOptions", "form"),
+    pick(props, "schema", "schemaFieldOptions", "subFormOptions"),
   );
   const mySchema = useFieldSchema();
   const act = props.act ?? mySchema.name;
@@ -189,7 +189,7 @@ export const ArrayTableShowModal: React.FC<
 
   return (
     <Modal
-      {...omit(props, "act", "schema", "schemaFieldOptions", "form")}
+      {...omit(props, "act", "schema", "schemaFieldOptions", "subFormOptions")}
       open={visible}
       title={field.title}
       onCancel={() => {

src/shadow-form/shadow-form.tsx

@@ -6,6 +6,7 @@ import {
   SchemaOptionsContext,
   createSchemaField,
   useField,
+  useForm,
 } from "@formily/react";
 import React, { useContext, useMemo } from "react";
 import ReactIs from "react-is";
@@ -32,13 +33,18 @@ export interface IShadowFormOptions {
   /** createSchemaField 函数配置, components 和 scope */
   schemaFieldOptions?: Parameters<typeof useShadowSchemaField>[0];
   /** createForm 创建的表单实例, 有自定义 effects 等可以通过自定义一个 form 这个传入 */
-  form?: ReturnType<typeof createForm>;
+  subFormOptions?: Parameters<typeof createForm>[0];
 }
 
 export const useShadowForm = (options: IShadowFormOptions) => {
-  const { schema, schemaFieldOptions, form } = options;
+  const { schema, schemaFieldOptions, subFormOptions } = options;
+  const form = useForm();
   const SchemaField = useShadowSchemaField(schemaFieldOptions);
-  const realForm = useMemo(() => form ?? createForm({}), [form]);
+
+  const realForm = useMemo(
+    () => createForm({ ...form.props, ...subFormOptions }),
+    [subFormOptions, form.props],
+  );
   return {
     form: realForm,
     schema,