From 53b5209c30328c0f56d0d5c4e834d4502d31a9d7 Mon Sep 17 00:00:00 2001
From: gaoyunqi <gaoyunqi@gdyd.com>
Date: Sun, 18 Feb 2024 16:57:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A8=E5=8D=95=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E6=94=AF=E6=8C=81=E7=9B=B4=E6=8E=A5=E4=BC=A0?=
 =?UTF-8?q?=E5=85=A5=E5=87=BD=E6=95=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=89=A9=E5=B1=95=E5=8F=82=E6=95=B0=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=93=8D=E6=8E=A7=E5=85=A8=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SimpleForm/src/SimpleForm.vue  | 1331 ++++++++---------
 .../src/components/SimpleFormItem.vue         |  240 +--
 2 files changed, 666 insertions(+), 905 deletions(-)

diff --git a/src/components/SimpleForm/src/SimpleForm.vue b/src/components/SimpleForm/src/SimpleForm.vue
index 1633dbb..5f10a61 100644
--- a/src/components/SimpleForm/src/SimpleForm.vue
+++ b/src/components/SimpleForm/src/SimpleForm.vue
@@ -1,758 +1,657 @@
 <template>
-  <div>
-    <Form
-      ref="formRef"
-      :model="formModel"
-      :layout="getProps?.layout"
-      :label-col="getProps?.labelCol"
-      :wrapper-col="getProps?.wrapperCol"
-      :labelAlign="getProps?.labelAlign"
-      @keypress.enter="handleEnterPress"
-    >
-      <Row v-bind="getRow">
-        <template v-for="schema in getSchemas" :key="schema.field">
-          <Col
-            :span="schema.colProps?.span"
-            v-show="getIsShow(schema, formModel[schema.field])"
-            v-if="getIfShow(schema, formModel[schema.field])"
-          >
-            <template v-if="showComponent(schema)">
-              <SimpleFormItem
-                :refreshFieldObj="refreshFieldObj"
-                :schema="schema"
-                :form-api="formApi"
-                :isWorkFlow="isWorkFlow"
-                v-model:value="formModel[schema.field]"
-              />
-            </template>
-          </Col>
-        </template>
-      </Row>
+    <div>
+        <Form ref="formRef" :label-col="getProps?.labelCol" :labelAlign="getProps?.labelAlign" :layout="getProps?.layout" :model="formModel" :wrapper-col="getProps?.wrapperCol" @keypress.enter="handleEnterPress">
+            <Row v-bind="getRow">
+                <template v-for="schema in getSchemas" :key="schema.field">
+                    <Col v-if="getIfShow(schema, formModel[schema.field])" v-show="getIsShow(schema, formModel[schema.field])" :span="schema.colProps?.span">
+                        <template v-if="showComponent(schema)">
+                            <SimpleFormItem v-model:value="formModel[schema.field]" :form-api="formApi" :isWorkFlow="isWorkFlow" :refreshFieldObj="refreshFieldObj" :schema="schema" />
+                        </template>
+                    </Col>
+                </template>
+            </Row>
 
-      <div :style="{ textAlign: getProps.buttonLocation }">
-        <slot name="buttonBefore"></slot>
+            <div :style="{ textAlign: getProps.buttonLocation }">
+                <slot name="buttonBefore"></slot>
 
-        <a-button type="primary" v-if="getProps.showSubmitButton" @click="handleSubmit">
-          {{ t('提交') }}
-        </a-button>
-        <a-button style="margin-left: 10px" v-if="getProps.showResetButton" @click="handleReset">
-          {{ t('重置') }}
-        </a-button>
-        <slot name="buttonAfter"></slot>
-      </div>
-    </Form>
-  </div>
+                <a-button v-if="getProps.showSubmitButton" type="primary" @click="handleSubmit">
+                    {{ t('提交') }}
+                </a-button>
+                <a-button v-if="getProps.showResetButton" style="margin-left: 10px" @click="handleReset">
+                    {{ t('重置') }}
+                </a-button>
+                <slot name="buttonAfter"></slot>
+            </div>
+        </Form>
+    </div>
 </template>
 <script lang="ts" setup>
-  import { Form, FormInstance, Row, Col, Modal, message } from 'ant-design-vue';
-  import {
-    cloneDeep,
-    isArray,
-    isBoolean,
-    isFunction,
-    isObject,
-    isString,
-    uniqBy,
-    isNil,
-  } from 'lodash-es';
-  import {
-    computed,
-    reactive,
-    ref,
-    provide,
-    unref,
-    nextTick,
-    toRaw,
-    createVNode,
-    inject,
-    onMounted,
-  } from 'vue';
-  import {
-    CardComponentProps,
-    FormActionType,
-    FormProps,
-    FormSchema,
-    GridComponentProps,
-    TabComponentProps,
-    regTestProps,
-    requestProps,
-  } from '../../Form/src/types/form';
-  import SimpleFormItem from './components/SimpleFormItem.vue';
-  import { NamePath, ValidateOptions } from 'ant-design-vue/lib/form/interface';
-  import {
-    arrayValueComponents,
-    defaultValueComponents,
-    staticDataComponents,
-    noFieldComponent,
-    noDefaultValueComponents,
-    noShowWorkFlowComponents,
-    noShowGenerateComponents,
-  } from '../../Form/src/helper';
-  import { deepMerge } from '/@/utils';
-  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-  import type { ModalFuncProps } from 'ant-design-vue/lib/modal/Modal';
-  import { defHttp } from '/@/utils/http/axios';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { needDicDefaultValue } from '../../Designer/src/types';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { camelCaseString } from '/@/utils/event/design';
-  const { t } = useI18n();
-  const { notification } = useMessage();
-  const formRef = ref<FormInstance>();
+    import { Form, FormInstance, Row, Col, Modal, message } from 'ant-design-vue';
+    import { cloneDeep, isArray, isBoolean, isFunction, isObject, isString, uniqBy, isNil } from 'lodash-es';
+    import { computed, reactive, ref, provide, unref, nextTick, toRaw, createVNode, inject, onMounted } from 'vue';
+    import { CardComponentProps, FormActionType, FormProps, FormSchema, GridComponentProps, TabComponentProps, regTestProps, requestProps } from '../../Form/src/types/form';
+    import SimpleFormItem from './components/SimpleFormItem.vue';
+    import { NamePath, ValidateOptions } from 'ant-design-vue/lib/form/interface';
+    import { arrayValueComponents, defaultValueComponents, staticDataComponents, noFieldComponent, noDefaultValueComponents, noShowWorkFlowComponents, noShowGenerateComponents } from '../../Form/src/helper';
+    import { deepMerge } from '/@/utils';
+    import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+    import type { ModalFuncProps } from 'ant-design-vue/lib/modal/Modal';
+    import { defHttp } from '/@/utils/http/axios';
+    import { useI18n } from '/@/hooks/web/useI18n';
+    import { needDicDefaultValue } from '../../Designer/src/types';
+    import { useMessage } from '/@/hooks/web/useMessage';
+    import { camelCaseString } from '/@/utils/event/design';
 
-  const propsRef = ref<Partial<FormProps>>({});
+    const { t } = useI18n();
+    const { notification } = useMessage();
+    const formRef = ref<FormInstance>();
 
-  const schemaRef = ref<Nullable<FormSchema[]>>(null);
+    const propsRef = ref<Partial<FormProps>>({});
 
-  const emit = defineEmits(['submit']);
+    const schemaRef = ref<Nullable<FormSchema[]>>(null);
 
-  const props = defineProps({
-    // 表单配置规则
-    formProps: {
-      type: Object as PropType<FormProps>,
-    },
-    //表单数据
-    formModel: {
-      type: Object as PropType<Recordable>,
-      default: () => {},
-    },
-    //是否是工作流
-    isWorkFlow: {
-      type: Boolean,
-      default: false,
-    },
-    //是否系统表单需要转驼峰，兼容旧系统表单
-    isCamelCase: {
-      type: Boolean,
-      default: false,
-    },
-  });
+    const emit = defineEmits(['submit']);
 
-  const getSchemas = computed<FormSchema[]>(() => {
-    return (unref(getProps).schemas as any) || unref(schemaRef);
-  });
+    const props = defineProps({
+        // 表单配置规则
+        formProps: {
+            type: Object as PropType<FormProps>
+        },
+        //表单数据
+        formModel: {
+            type: Object as PropType<Recordable>,
+            default: () => {}
+        },
+        //是否是工作流
+        isWorkFlow: {
+            type: Boolean,
+            default: false
+        },
+        //是否系统表单需要转驼峰，兼容旧系统表单
+        isCamelCase: {
+            type: Boolean,
+            default: false
+        },
+        // 自定义监听 用于以编码开发的形式替代json配置中的change事件
+        watches: {
+            type: Array
+        }
+    });
 
-  // Get the basic configuration of the form
-  const getProps = computed((): FormProps => {
-    return { ...(props.formProps as FormProps), ...unref(propsRef) } as FormProps;
-  });
+    const getSchemas = computed<FormSchema[]>(() => {
+        return (unref(getProps).schemas as any) || unref(schemaRef);
+    });
 
-  // Get uniform row style and Row configuration for the entire form
-  const getRow = computed((): Recordable => {
-    const { baseRowStyle = {}, rowProps } = props.formProps!;
+    // Get the basic configuration of the form
+    const getProps = computed((): FormProps => {
+        return { ...(props.formProps as FormProps), ...unref(propsRef) } as FormProps;
+    });
 
-    return {
-      style: baseRowStyle,
-      ...rowProps,
+    // Get uniform row style and Row configuration for the entire form
+    const getRow = computed((): Recordable => {
+        const { baseRowStyle = {}, rowProps } = props.formProps!;
+
+        return {
+            style: baseRowStyle,
+            ...rowProps
+        };
+    });
+
+    onMounted(() => {
+        nextTick(() => {
+            //添加隐藏组件
+            if (unref(getProps)?.hiddenComponent?.length) {
+                unref(getProps)?.hiddenComponent?.forEach((component) => {
+                    formModel[component.bindField] = component.value;
+                });
+            }
+        });
+    });
+
+    function showComponent(schema) {
+        return props.isWorkFlow ? !noShowWorkFlowComponents.includes(schema.type) : !noShowGenerateComponents.includes(schema.type);
+    }
+
+    function getIsShow(schema: FormSchema, itemValue: any): boolean {
+        const { show } = schema;
+        const { showAdvancedButton } = getProps.value;
+        const itemIsAdvanced = showAdvancedButton ? (isBoolean(schema.isAdvanced) ? schema.isAdvanced : true) : true;
+
+        let isShow = true;
+
+        if (isBoolean(show)) {
+            isShow = show;
+        }
+        if (isFunction(show)) {
+            isShow = show({
+                values: itemValue,
+                model: formModel!,
+                schema: schema,
+                field: schema.field
+            });
+        }
+
+        isShow = isShow && itemIsAdvanced;
+        return isShow;
+    }
+
+    function getIfShow(schema: FormSchema, itemValue: any): boolean {
+        const { ifShow } = schema;
+
+        let isIfShow = true;
+
+        if (isBoolean(ifShow)) {
+            isIfShow = ifShow;
+        }
+        if (isFunction(ifShow)) {
+            isIfShow = ifShow({
+                values: itemValue,
+                model: formModel!,
+                schema: schema,
+                field: schema.field
+            });
+        }
+        return isIfShow;
+    }
+
+    const formModel = reactive<Recordable>(props.formModel);
+    const isCustom = inject<boolean>('isCustomForm', false);
+    provide('formModel', formModel);
+    provide('formProps', getProps);
+    provide('isCustomForm', isCustom || props.isWorkFlow);
+    provide('isCamelCase', props.isCamelCase);
+    const handleSubmit = async () => {
+        try {
+            const { submitFunc } = unref(getProps);
+            if (submitFunc && isFunction(submitFunc)) {
+                await submitFunc();
+                return;
+            }
+            const res = await formRef.value!.validate();
+            emit('submit', res);
+        } catch (error) {}
     };
-  });
 
-  onMounted(() => {
-    nextTick(() => {
-      //添加隐藏组件
-      if (unref(getProps)?.hiddenComponent?.length) {
-        unref(getProps)?.hiddenComponent?.forEach((component) => {
-          formModel[component.bindField] = component.value;
-        });
-      }
-    });
-  });
+    const handleReset = () => {
+        resetFields();
+    };
 
-  function showComponent(schema) {
-    return props.isWorkFlow
-      ? !noShowWorkFlowComponents.includes(schema.type)
-      : !noShowGenerateComponents.includes(schema.type);
-  }
+    const refreshFieldObj = ref<object>({});
 
-  function getIsShow(schema: FormSchema, itemValue: any): boolean {
-    const { show } = schema;
-    const { showAdvancedButton } = getProps.value;
-    const itemIsAdvanced = showAdvancedButton
-      ? isBoolean(schema.isAdvanced)
-        ? schema.isAdvanced
-        : true
-      : true;
-
-    let isShow = true;
-
-    if (isBoolean(show)) {
-      isShow = show;
-    }
-    if (isFunction(show)) {
-      isShow = show({
-        values: itemValue,
-        model: formModel!,
-        schema: schema,
-        field: schema.field,
-      });
-    }
-
-    isShow = isShow && itemIsAdvanced;
-    return isShow;
-  }
-
-  function getIfShow(schema: FormSchema, itemValue: any): boolean {
-    const { ifShow } = schema;
-
-    let isIfShow = true;
-
-    if (isBoolean(ifShow)) {
-      isIfShow = ifShow;
-    }
-    if (isFunction(ifShow)) {
-      isIfShow = ifShow({
-        values: itemValue,
-        model: formModel!,
-        schema: schema,
-        field: schema.field,
-      });
-    }
-    return isIfShow;
-  }
-
-  const formModel = reactive<Recordable>(props.formModel);
-  const isCustom = inject<boolean>('isCustomForm', false);
-  provide('formModel', formModel);
-  provide('formProps', getProps);
-  provide('isCustomForm', isCustom || props.isWorkFlow);
-  provide('isCamelCase', props.isCamelCase);
-  const handleSubmit = async () => {
-    try {
-      const { submitFunc } = unref(getProps);
-      if (submitFunc && isFunction(submitFunc)) {
-        await submitFunc();
-        return;
-      }
-      const res = await formRef.value!.validate();
-      emit('submit', res);
-    } catch (error) {}
-  };
-
-  const handleReset = () => {
-    resetFields();
-  };
-
-  const refreshFieldObj = ref<object>({});
-
-  getComponent(getSchemas.value);
-
-  function getComponent(component) {
-    const layoutComponents = ['tab', 'grid', 'card'];
-    component?.map((info) => {
-      if (layoutComponents.includes(info.type!)) {
-        info.children?.map((childInfo) => {
-          childInfo.list.map((com) => {
-            if (layoutComponents.includes(com.type) || com.type === 'table-layout') {
-              getComponent(childInfo.list);
-            } else {
-              setComponentDefault(com);
-            }
-          });
-        });
-      } else if (info.type === 'table-layout') {
-        info.children?.map((childInfo) => {
-          childInfo.list.map((com) => {
-            com.children.map((item) => {
-              if (layoutComponents.includes(item.type) || item.type === 'table-layout') {
-                getComponent(com.children);
-              } else {
-                setComponentDefault(item);
-              }
-            });
-          });
-        });
-      } else {
-        setComponentDefault(info);
-      }
-    });
-  }
-
-  function setComponentDefault(item) {
-    if (
-      (staticDataComponents.includes(item.component) &&
-        (item.componentProps as any)?.datasourceType === 'staticData') ||
-      (needDicDefaultValue.includes(item.type) &&
-        (item.componentProps as any)?.datasourceType === 'dic')
-    ) {
-      let { defaultSelect } = item.componentProps as any;
-      formModel[item.field] = defaultSelect;
-      return;
-    }
-    let { defaultValue } = item;
-    if (!!item.field && !noDefaultValueComponents.includes(item.component)) {
-      if (item.component === 'OneForOne') {
-        if (item.componentProps.childSchemas?.length) {
-          const singleFormObj = {};
-          item.componentProps.childSchemas.map((singleCom) => {
-            if (
-              (staticDataComponents.includes(singleCom.component) &&
-                (singleCom.componentProps as any)?.datasourceType === 'staticData') ||
-              (needDicDefaultValue.includes(singleCom.type) &&
-                (singleCom.componentProps as any)?.datasourceType === 'dic')
-            ) {
-              let { defaultSelect } = singleCom.componentProps as any;
-              singleFormObj[singleCom.field] = defaultSelect;
-            } else {
-              singleFormObj[singleCom.field] = singleCom.defaultValue;
-            }
-          });
-          formModel[item.field] = [singleFormObj];
-        }
-        return;
-      } else {
-        formModel[item.field] = item.component === 'SubForm' ? [] : defaultValue;
-        return;
-      }
-    }
-  }
-
-  /**
-   * 回车提交表单
-   */
-  function handleEnterPress(e: KeyboardEvent) {
-    const { autoSubmitOnEnter } = unref(getProps);
-    if (!autoSubmitOnEnter) return;
-    if (e.key === 'Enter' && e.target && e.target instanceof HTMLElement) {
-      const target: HTMLElement = e.target as HTMLElement;
-      if (target && target.tagName && target.tagName.toUpperCase() == 'INPUT') {
-        handleSubmit();
-      }
-    }
-  }
-
-  //调用表单验证
-  const validate = async (nameList?: NamePath[]): Promise<any> => formRef.value?.validate(nameList);
-
-  //清除表单验证
-  const clearValidate = async (name?: string | string[]): Promise<any> =>
-    formRef.value?.clearValidate(name);
-
-  //跳到某个字段
-  const scrollToField = async (name: NamePath, options?: ScrollOptions): Promise<any> =>
-    formRef.value?.scrollToField(name, options);
-
-  //验证某个字段
-  const validateFields = async (
-    nameList?: NamePath[] | string,
-    options?: ValidateOptions,
-  ): Promise<any> => formRef.value?.validateFields(nameList, options);
-
-  const findSchema = (schemaArr, key) => {
-    let schema;
-    const formListComponent = ['tab', 'grid', 'card'];
-    schemaArr?.some((info) => {
-      if (formListComponent.includes(info.type!)) {
-        const hasComponent = info.children.some((childInfo) => {
-          schema = childInfo.list.find((com) => com.field === key);
-          if (!!schema) return true;
-          schema = findSchema(childInfo.list, key);
-          return !!schema;
-        });
-        return !!hasComponent;
-      } else if (info.type === 'table-layout') {
-        const hasComponent = info.children.some((childInfo) => {
-          return childInfo.list.some((chil) => {
-            schema = chil.children.find((com) => com.field === key);
-            if (!!schema) return true;
-            schema = findSchema(chil.children, key);
-            return !!schema;
-          });
-        });
-        return !!hasComponent;
-      } else {
-        schema = info.field === key ? info : null;
-        return !!schema;
-      }
-    });
-    return schema;
-  };
-
-  const setDefaultValue = async (): Promise<void> => {
     getComponent(getSchemas.value);
-  };
 
-  // 重置表单所有数据
-  const resetFields = async (): Promise<void> => {
-    Object.keys(formModel).forEach((key) => {
-      //没有绑定字段的组件不处理
-      if (!key) return;
-      const schema = findSchema(unref(getSchemas), key);
-
-      const isInput = schema?.component && defaultValueComponents.includes(schema.component);
-      const isSubForm = schema?.component && arrayValueComponents.includes(schema.component);
-      const isRange = schema?.component && schema?.component.includes('Range');
-      const isStatic =
-        schema?.component &&
-        staticDataComponents.includes(schema.component) &&
-        schema?.componentProps.datasourceType === 'staticData';
-      const isDic =
-        schema?.type &&
-        needDicDefaultValue.includes(schema.type) &&
-        schema?.componentProps.datasourceType === 'dic';
-
-      if (isSubForm) {
-        if (schema.component === 'OneForOne') {
-          if (schema.componentProps.childSchemas?.length) {
-            const singleFormObj = {};
-            schema.componentProps.childSchemas.map((singleCom) => {
-              if (
-                (staticDataComponents.includes(singleCom.component) &&
-                  singleCom?.componentProps.datasourceType === 'staticData') ||
-                (needDicDefaultValue.includes(singleCom.type) &&
-                  singleCom?.componentProps.datasourceType === 'dic')
-              ) {
-                singleFormObj[singleCom.field] = singleCom?.componentProps.defaultSelect;
-              } else {
-                singleFormObj[singleCom.field] = singleCom.defaultValue;
-              }
-            });
-            formModel[key] = [singleFormObj];
-          }
-        } else {
-          formModel[key] = [];
-        }
-      } else if (isInput) {
-        formModel[key] = schema?.defaultValue || '';
-      } else if (isRange) {
-        const startTimeKey = key.split(',')[0];
-        const endTimeKey = key.split(',')[1];
-        formModel[key] = schema?.defaultValue || [];
-        formModel[startTimeKey] =
-          schema?.defaultValue && schema?.defaultValue.length > 0 && schema?.defaultValue[0];
-        formModel[endTimeKey] =
-          schema?.defaultValue && schema?.defaultValue.length > 0 && schema?.defaultValue[1];
-      } else if (isStatic || isDic) {
-        formModel[key] = schema?.componentProps.defaultSelect;
-      } else {
-        formModel[key] =
-          schema?.defaultValue || schema?.defaultValue === 0 ? schema?.defaultValue : '';
-      }
-    });
-    nextTick(() => clearValidate());
-  };
-
-  // 更改formProps
-  const setProps = async (formProps: Partial<FormProps>): Promise<void> => {
-    propsRef.value = deepMerge(unref(propsRef) || {}, formProps);
-  };
-
-  //设定某个字段值  慎用  建议直接页面直接操作formModel数据
-  const setFieldsValue = async (values: Recordable): Promise<void> => {
-    Object.keys(values).forEach((key) => {
-      if (!isNil(key)) {
-        formModel[key] = values[key];
-      }
-    });
-
-    executeEvent(getSchemas.value);
-  };
-
-  /**
-   * 执行schema中 所有change事件
-   * 修改bug #5090
-   * 为了保证表单赋值触发所有组件的change事件
-   */
-  const executeEvent = (allSchemas: FormSchema[]) => {
-    for (const schema of allSchemas) {
-      //如果是这几个组件 需要查询子级
-      if (['Card', 'Tab', 'Grid'].includes(schema.component)) {
-        if (schema.component === 'Tab') {
-          for (const child of schema.children as TabComponentProps[]) {
-            executeEvent(child.list);
-          }
-        }
-
-        if (schema.component === 'Card') {
-          for (const child of schema.children as CardComponentProps[]) {
-            executeEvent(child.list);
-          }
-        }
-
-        if (schema.component === 'Grid') {
-          for (const child of schema.children as GridComponentProps[]) {
-            executeEvent(child.list);
-          }
-        }
-      } else {
-        if (schema.componentProps?.['events']) {
-          for (const eventKey in schema.componentProps['events']) {
-            if (eventKey !== 'change') return;
-            try {
-              const event = new Function(
-                'schema',
-                'formModel',
-                'formActionType',
-                `${schema.componentProps['events'][eventKey]}`,
-              );
-              event(schema, formModel, formApi);
-            } catch (error) {
-              console.log('error', error);
-              notification.error({
-                message: 'Tip',
-                description: '触发事件填写有误！',
-              });
+    function getComponent(component) {
+        const layoutComponents = ['tab', 'grid', 'card'];
+        component?.map((info) => {
+            if (layoutComponents.includes(info.type!)) {
+                info.children?.map((childInfo) => {
+                    childInfo.list.map((com) => {
+                        if (layoutComponents.includes(com.type) || com.type === 'table-layout') {
+                            getComponent(childInfo.list);
+                        } else {
+                            setComponentDefault(com);
+                        }
+                    });
+                });
+            } else if (info.type === 'table-layout') {
+                info.children?.map((childInfo) => {
+                    childInfo.list.map((com) => {
+                        com.children.map((item) => {
+                            if (layoutComponents.includes(item.type) || item.type === 'table-layout') {
+                                getComponent(com.children);
+                            } else {
+                                setComponentDefault(item);
+                            }
+                        });
+                    });
+                });
+            } else {
+                setComponentDefault(info);
             }
-          }
+        });
+    }
+
+    function setComponentDefault(item) {
+        if ((staticDataComponents.includes(item.component) && (item.componentProps as any)?.datasourceType === 'staticData') || (needDicDefaultValue.includes(item.type) && (item.componentProps as any)?.datasourceType === 'dic')) {
+            let { defaultSelect } = item.componentProps as any;
+            formModel[item.field] = defaultSelect;
+            return;
         }
-      }
-    }
-
-    // if (componentProps['events']) {
-    //   for (const eventKey in componentProps['events']) {
-    //     try {
-    //       const event = new Function(
-    //         'schema',
-    //         'formModel',
-    //         'formActionType',
-    //         `${componentProps['events'][eventKey]}`,
-    //       );
-    //       componentProps['on' + upperFirst(eventKey)] = function () {
-    //         event(props.schema, formModel, props.formApi);
-    //       };
-    //     } catch (error) {
-    //       console.log('error', error);
-    //       notification.error({
-    //         message: 'Tip',
-    //         description: '触发事件填写有误！',
-    //       });
-    //     }
-    //   }
-    // }
-  };
-
-  //获取表单值  慎用  建议直接页面直接操作formModel数据
-  const getFieldsValue = (): Recordable => {
-    return toRaw(unref(formModel));
-  };
-
-  //更新schema
-  const updateSchema = async (data: Partial<FormSchema> | Partial<FormSchema>[]): Promise<void> => {
-    let updateData: Partial<FormSchema>[] = [];
-    if (isObject(data)) {
-      updateData.push(data as FormSchema);
-    }
-    if (isArray(data)) {
-      updateData = [...data];
-    }
-    const hasField = updateData.every(
-      (item) =>
-        noFieldComponent.includes(item.component!) || (Reflect.has(item, 'field') && item.field),
-    );
-    if (!hasField) {
-      throw new Error(
-        'All children of the form Schema array that need to be updated must contain the `field` field',
-      );
-    }
-    const schema: FormSchema[] = [];
-    updateData.forEach((item: FormSchema) => {
-      unref(getSchemas).forEach((val: FormSchema) => {
-        //如果当前组件是布局组件 需要去child 里面更新
-        if (['Card', 'Tab', 'Grid'].includes(val.component)) {
-          deepEachChild(val.children!, item);
-        } else {
-          if (val.key && item.key && val.key === item.key) {
-            const newSchema = deepMerge(val, item);
-            schema.push(newSchema as FormSchema);
-          } else if (val.field === item.field) {
-            const newSchema = deepMerge(val, item);
-            schema.push(newSchema as FormSchema);
-          } else {
-            schema.push(val);
-          }
+        let { defaultValue } = item;
+        if (!!item.field && !noDefaultValueComponents.includes(item.component)) {
+            if (item.component === 'OneForOne') {
+                if (item.componentProps.childSchemas?.length) {
+                    const singleFormObj = {};
+                    item.componentProps.childSchemas.map((singleCom) => {
+                        if (
+                            (staticDataComponents.includes(singleCom.component) && (singleCom.componentProps as any)?.datasourceType === 'staticData') ||
+                            (needDicDefaultValue.includes(singleCom.type) && (singleCom.componentProps as any)?.datasourceType === 'dic')
+                        ) {
+                            let { defaultSelect } = singleCom.componentProps as any;
+                            singleFormObj[singleCom.field] = defaultSelect;
+                        } else {
+                            singleFormObj[singleCom.field] = singleCom.defaultValue;
+                        }
+                    });
+                    formModel[item.field] = [singleFormObj];
+                }
+                return;
+            } else {
+                formModel[item.field] = item.component === 'SubForm' ? [] : defaultValue;
+                return;
+            }
         }
-      });
-    });
+    }
 
-    schemaRef.value = uniqBy(schema, 'field');
-  };
-  const deepEachChild = (
-    childs: GridComponentProps[] | TabComponentProps[] | CardComponentProps[],
-    thisItem: FormSchema,
-  ) => {
-    childs?.forEach((child: GridComponentProps | CardComponentProps | TabComponentProps) => {
-      child.list.forEach((it: FormSchema) => {
-        if (['Card', 'Tab', 'Grid'].includes(it.component)) {
-          deepEachChild(it.children!, thisItem);
+    /**
+     * 回车提交表单
+     */
+    function handleEnterPress(e: KeyboardEvent) {
+        const { autoSubmitOnEnter } = unref(getProps);
+        if (!autoSubmitOnEnter) return;
+        if (e.key === 'Enter' && e.target && e.target instanceof HTMLElement) {
+            const target: HTMLElement = e.target as HTMLElement;
+            if (target && target.tagName && target.tagName.toUpperCase() == 'INPUT') {
+                handleSubmit();
+            }
+        }
+    }
+
+    //调用表单验证
+    const validate = async (nameList?: NamePath[]): Promise<any> => formRef.value?.validate(nameList);
+
+    //清除表单验证
+    const clearValidate = async (name?: string | string[]): Promise<any> => formRef.value?.clearValidate(name);
+
+    //跳到某个字段
+    const scrollToField = async (name: NamePath, options?: ScrollOptions): Promise<any> => formRef.value?.scrollToField(name, options);
+
+    //验证某个字段
+    const validateFields = async (nameList?: NamePath[] | string, options?: ValidateOptions): Promise<any> => formRef.value?.validateFields(nameList, options);
+
+    const findSchema = (schemaArr, key) => {
+        let schema;
+        const formListComponent = ['tab', 'grid', 'card'];
+        schemaArr?.some((info) => {
+            if (formListComponent.includes(info.type!)) {
+                const hasComponent = info.children.some((childInfo) => {
+                    schema = childInfo.list.find((com) => com.field === key);
+                    if (!!schema) return true;
+                    schema = findSchema(childInfo.list, key);
+                    return !!schema;
+                });
+                return !!hasComponent;
+            } else if (info.type === 'table-layout') {
+                const hasComponent = info.children.some((childInfo) => {
+                    return childInfo.list.some((chil) => {
+                        schema = chil.children.find((com) => com.field === key);
+                        if (!!schema) return true;
+                        schema = findSchema(chil.children, key);
+                        return !!schema;
+                    });
+                });
+                return !!hasComponent;
+            } else {
+                schema = info.field === key ? info : null;
+                return !!schema;
+            }
+        });
+        return schema;
+    };
+
+    const setDefaultValue = async (): Promise<void> => {
+        getComponent(getSchemas.value);
+    };
+
+    // 重置表单所有数据
+    const resetFields = async (): Promise<void> => {
+        Object.keys(formModel).forEach((key) => {
+            //没有绑定字段的组件不处理
+            if (!key) return;
+            const schema = findSchema(unref(getSchemas), key);
+
+            const isInput = schema?.component && defaultValueComponents.includes(schema.component);
+            const isSubForm = schema?.component && arrayValueComponents.includes(schema.component);
+            const isRange = schema?.component && schema?.component.includes('Range');
+            const isStatic = schema?.component && staticDataComponents.includes(schema.component) && schema?.componentProps.datasourceType === 'staticData';
+            const isDic = schema?.type && needDicDefaultValue.includes(schema.type) && schema?.componentProps.datasourceType === 'dic';
+
+            if (isSubForm) {
+                if (schema.component === 'OneForOne') {
+                    if (schema.componentProps.childSchemas?.length) {
+                        const singleFormObj = {};
+                        schema.componentProps.childSchemas.map((singleCom) => {
+                            if (
+                                (staticDataComponents.includes(singleCom.component) && singleCom?.componentProps.datasourceType === 'staticData') ||
+                                (needDicDefaultValue.includes(singleCom.type) && singleCom?.componentProps.datasourceType === 'dic')
+                            ) {
+                                singleFormObj[singleCom.field] = singleCom?.componentProps.defaultSelect;
+                            } else {
+                                singleFormObj[singleCom.field] = singleCom.defaultValue;
+                            }
+                        });
+                        formModel[key] = [singleFormObj];
+                    }
+                } else {
+                    formModel[key] = [];
+                }
+            } else if (isInput) {
+                formModel[key] = schema?.defaultValue || '';
+            } else if (isRange) {
+                const startTimeKey = key.split(',')[0];
+                const endTimeKey = key.split(',')[1];
+                formModel[key] = schema?.defaultValue || [];
+                formModel[startTimeKey] = schema?.defaultValue && schema?.defaultValue.length > 0 && schema?.defaultValue[0];
+                formModel[endTimeKey] = schema?.defaultValue && schema?.defaultValue.length > 0 && schema?.defaultValue[1];
+            } else if (isStatic || isDic) {
+                formModel[key] = schema?.componentProps.defaultSelect;
+            } else {
+                formModel[key] = schema?.defaultValue || schema?.defaultValue === 0 ? schema?.defaultValue : '';
+            }
+        });
+        nextTick(() => clearValidate());
+    };
+
+    // 更改formProps
+    const setProps = async (formProps: Partial<FormProps>): Promise<void> => {
+        propsRef.value = deepMerge(unref(propsRef) || {}, formProps);
+    };
+
+    //设定某个字段值  慎用  建议直接页面直接操作formModel数据
+    const setFieldsValue = async (values: Recordable): Promise<void> => {
+        Object.keys(values).forEach((key) => {
+            if (!isNil(key)) {
+                formModel[key] = values[key];
+            }
+        });
+
+        executeEvent(getSchemas.value);
+    };
+
+    /**
+     * 执行schema中 所有change事件
+     * 修改bug #5090
+     * 为了保证表单赋值触发所有组件的change事件
+     */
+    const executeEvent = (allSchemas: FormSchema[]) => {
+        for (const schema of allSchemas) {
+            //如果是这几个组件 需要查询子级
+            if (['Card', 'Tab', 'Grid'].includes(schema.component)) {
+                if (schema.component === 'Tab') {
+                    for (const child of schema.children as TabComponentProps[]) {
+                        executeEvent(child.list);
+                    }
+                }
+
+                if (schema.component === 'Card') {
+                    for (const child of schema.children as CardComponentProps[]) {
+                        executeEvent(child.list);
+                    }
+                }
+
+                if (schema.component === 'Grid') {
+                    for (const child of schema.children as GridComponentProps[]) {
+                        executeEvent(child.list);
+                    }
+                }
+            } else {
+                if (schema.componentProps?.['events']) {
+                    for (const eventKey in schema.componentProps['events']) {
+                        if (eventKey !== 'change') return;
+                        try {
+                            const event = new Function('schema', 'formModel', 'formActionType', `${schema.componentProps['events'][eventKey]}`);
+                            event(schema, formModel, formApi);
+                        } catch (error) {
+                            console.log('error', error);
+                            notification.error({
+                                message: 'Tip',
+                                description: '触发事件填写有误！'
+                            });
+                        }
+                    }
+                }
+            }
         }
 
-        if (thisItem.key && it.key && thisItem.key === it.key) {
-          it = deepMerge(it, thisItem);
-        } else if (thisItem.field === it.field) {
-          it = deepMerge(it, thisItem);
+        // if (componentProps['events']) {
+        //   for (const eventKey in componentProps['events']) {
+        //     try {
+        //       const event = new Function(
+        //         'schema',
+        //         'formModel',
+        //         'formActionType',
+        //         `${componentProps['events'][eventKey]}`,
+        //       );
+        //       componentProps['on' + upperFirst(eventKey)] = function () {
+        //         event(props.schema, formModel, props.formApi);
+        //       };
+        //     } catch (error) {
+        //       console.log('error', error);
+        //       notification.error({
+        //         message: 'Tip',
+        //         description: '触发事件填写有误！',
+        //       });
+        //     }
+        //   }
+        // }
+    };
+
+    //获取表单值  慎用  建议直接页面直接操作formModel数据
+    const getFieldsValue = (): Recordable => {
+        return toRaw(unref(formModel));
+    };
+
+    //更新schema
+    const updateSchema = async (data: Partial<FormSchema> | Partial<FormSchema>[]): Promise<void> => {
+        let updateData: Partial<FormSchema>[] = [];
+        if (isObject(data)) {
+            updateData.push(data as FormSchema);
         }
-      });
-    });
-  };
+        if (isArray(data)) {
+            updateData = [...data];
+        }
+        const hasField = updateData.every((item) => noFieldComponent.includes(item.component!) || (Reflect.has(item, 'field') && item.field));
+        if (!hasField) {
+            throw new Error('All children of the form Schema array that need to be updated must contain the `field` field');
+        }
+        const schema: FormSchema[] = [];
+        updateData.forEach((item: FormSchema) => {
+            unref(getSchemas).forEach((val: FormSchema) => {
+                //如果当前组件是布局组件 需要去child 里面更新
+                if (['Card', 'Tab', 'Grid'].includes(val.component)) {
+                    deepEachChild(val.children!, item);
+                } else {
+                    if (val.key && item.key && val.key === item.key) {
+                        const newSchema = deepMerge(val, item);
+                        schema.push(newSchema as FormSchema);
+                    } else if (val.field === item.field) {
+                        const newSchema = deepMerge(val, item);
+                        schema.push(newSchema as FormSchema);
+                    } else {
+                        schema.push(val);
+                    }
+                }
+            });
+        });
 
-  //重置schema
-  const resetSchema = async (data: Partial<FormSchema> | Partial<FormSchema>[]): Promise<void> => {
-    let updateData: Partial<FormSchema>[] = [];
-    if (isObject(data)) {
-      updateData.push(data as FormSchema);
-    }
-    if (isArray(data)) {
-      updateData = [...data];
-    }
+        schemaRef.value = uniqBy(schema, 'field');
+    };
+    const deepEachChild = (childs: GridComponentProps[] | TabComponentProps[] | CardComponentProps[], thisItem: FormSchema) => {
+        childs?.forEach((child: GridComponentProps | CardComponentProps | TabComponentProps) => {
+            child.list.forEach((it: FormSchema) => {
+                if (['Card', 'Tab', 'Grid'].includes(it.component)) {
+                    deepEachChild(it.children!, thisItem);
+                }
 
-    const hasField = updateData.every(
-      (item) =>
-        noFieldComponent.includes(item.component!) || (Reflect.has(item, 'field') && item.field),
-    );
-    if (!hasField) {
-      throw new Error(
-        'All children of the form Schema array that need to be updated must contain the `field` field',
-      );
-      return;
-    }
+                if (thisItem.key && it.key && thisItem.key === it.key) {
+                    it = deepMerge(it, thisItem);
+                } else if (thisItem.field === it.field) {
+                    it = deepMerge(it, thisItem);
+                }
+            });
+        });
+    };
 
-    schemaRef.value = updateData as FormSchema[];
-  };
-  //移除schema
-  const removeSchemaByFiled = async (fields: string | string[]): Promise<void> => {
-    const schemaList: FormSchema[] = cloneDeep(unref(getSchemas));
-    if (!fields) {
-      return;
-    }
+    //重置schema
+    const resetSchema = async (data: Partial<FormSchema> | Partial<FormSchema>[]): Promise<void> => {
+        let updateData: Partial<FormSchema>[] = [];
+        if (isObject(data)) {
+            updateData.push(data as FormSchema);
+        }
+        if (isArray(data)) {
+            updateData = [...data];
+        }
 
-    let fieldList: string[] = isString(fields) ? [fields] : fields;
-    if (isString(fields)) {
-      fieldList = [fields];
-    }
-    for (const field of fieldList) {
-      if (isString(field)) {
-        const index = schemaList.findIndex((schema) => schema.field === field);
+        const hasField = updateData.every((item) => noFieldComponent.includes(item.component!) || (Reflect.has(item, 'field') && item.field));
+        if (!hasField) {
+            throw new Error('All children of the form Schema array that need to be updated must contain the `field` field');
+            return;
+        }
+
+        schemaRef.value = updateData as FormSchema[];
+    };
+    //移除schema
+    const removeSchemaByFiled = async (fields: string | string[]): Promise<void> => {
+        const schemaList: FormSchema[] = cloneDeep(unref(getSchemas));
+        if (!fields) {
+            return;
+        }
+
+        let fieldList: string[] = isString(fields) ? [fields] : fields;
+        if (isString(fields)) {
+            fieldList = [fields];
+        }
+        for (const field of fieldList) {
+            if (isString(field)) {
+                const index = schemaList.findIndex((schema) => schema.field === field);
+                if (index !== -1) {
+                    delete formModel[field];
+                    schemaList.splice(index, 1);
+                }
+            }
+        }
+        schemaRef.value = schemaList;
+    };
+    //追加schema
+    const appendSchemaByField = async (schema: FormSchema, prefixField: string | undefined, first?: boolean | undefined): Promise<void> => {
+        const schemaList: FormSchema[] = cloneDeep(unref(getSchemas));
+
+        const index = schemaList.findIndex((schema) => schema.field === prefixField);
+        if (!prefixField || index === -1 || first) {
+            first ? schemaList.unshift(schema) : schemaList.push(schema);
+            schemaRef.value = schemaList;
+            return;
+        }
         if (index !== -1) {
-          delete formModel[field];
-          schemaList.splice(index, 1);
+            schemaList.splice(index + 1, 0, schema);
         }
-      }
-    }
-    schemaRef.value = schemaList;
-  };
-  //追加schema
-  const appendSchemaByField = async (
-    schema: FormSchema,
-    prefixField: string | undefined,
-    first?: boolean | undefined,
-  ): Promise<void> => {
-    const schemaList: FormSchema[] = cloneDeep(unref(getSchemas));
 
-    const index = schemaList.findIndex((schema) => schema.field === prefixField);
-    if (!prefixField || index === -1 || first) {
-      first ? schemaList.unshift(schema) : schemaList.push(schema);
-      schemaRef.value = schemaList;
-      return;
-    }
-    if (index !== -1) {
-      schemaList.splice(index + 1, 0, schema);
-    }
+        schemaRef.value = schemaList;
+    };
 
-    schemaRef.value = schemaList;
-  };
+    // 提交
+    const submit = async (e?: Event): Promise<void> => {
+        e && e.preventDefault();
+        const { submitFunc } = unref(getProps);
+        if (submitFunc && isFunction(submitFunc)) {
+            await submitFunc();
+            return;
+        }
+        const formEl = unref(formRef);
+        if (!formEl) return;
+        try {
+            const values = await validate();
+            emit('submit', values);
+        } catch (error: any) {
+            throw new Error(error);
+        }
+    };
 
-  // 提交
-  const submit = async (e?: Event): Promise<void> => {
-    e && e.preventDefault();
-    const { submitFunc } = unref(getProps);
-    if (submitFunc && isFunction(submitFunc)) {
-      await submitFunc();
-      return;
-    }
-    const formEl = unref(formRef);
-    if (!formEl) return;
-    try {
-      const values = await validate();
-      emit('submit', values);
-    } catch (error: any) {
-      throw new Error(error);
-    }
-  };
+    const showModal = async (modal: ModalFuncProps) => {
+        Modal.confirm({
+            title: modal.title,
+            icon: createVNode(ExclamationCircleOutlined),
+            content: createVNode('div', { style: 'color:red;' }, modal.content),
+            onOk: modal.onOk,
+            onCancel: modal.onCancel,
+            ...modal
+        });
+    };
 
-  const showModal = async (modal: ModalFuncProps) => {
-    Modal.confirm({
-      title: modal.title,
-      icon: createVNode(ExclamationCircleOutlined),
-      content: createVNode('div', { style: 'color:red;' }, modal.content),
-      onOk: modal.onOk,
-      onCancel: modal.onCancel,
-      ...modal,
-    });
-  };
+    const regTest = async (regular: regTestProps) => {
+        const regExpression = regular.regExpression;
+        const testRes = regExpression.test(regular.testValue);
+        testRes ? message.success(regular.successMessage) : message.error(regular.errorMessage);
+    };
 
-  const regTest = async (regular: regTestProps) => {
-    const regExpression = regular.regExpression;
-    const testRes = regExpression.test(regular.testValue);
-    testRes ? message.success(regular.successMessage) : message.error(regular.errorMessage);
-  };
-
-  const httpRequest = async (request: requestProps) => {
-    if (request.requestType.toLowerCase() === 'get') {
-      return defHttp[request.requestType](
-        {
-          url: request.requestUrl,
-          params: request.params,
-        },
-        {
-          errorMessageMode: request.errorMessageMode || 'none',
-        },
-      );
-    } else {
-      return defHttp[request.requestType](
-        {
-          url: request.requestUrl,
-          data: request.params,
-        },
-        {
-          errorMessageMode: request.errorMessageMode || 'none',
-        },
-      );
-    }
-  };
-
-  const refreshAPI = (field: string) => {
-    if (!field) return;
-    if (!Object.keys(unref(refreshFieldObj)).includes(field)) {
-      unref(refreshFieldObj)[field] = 0;
-    }
-    unref(refreshFieldObj)[field]++;
-  };
-
-  const changeStyle = (schema, style, field?) => {
-    if (field) {
-      const changeSchema = unref(getSchemas).filter((item) => {
-        if (props.isCamelCase) {
-          return camelCaseString(item.field) === field;
+    const httpRequest = async (request: requestProps) => {
+        if (request.requestType.toLowerCase() === 'get') {
+            return defHttp[request.requestType](
+                {
+                    url: request.requestUrl,
+                    params: request.params
+                },
+                {
+                    errorMessageMode: request.errorMessageMode || 'none'
+                }
+            );
         } else {
-          return item.field === field;
+            return defHttp[request.requestType](
+                {
+                    url: request.requestUrl,
+                    data: request.params
+                },
+                {
+                    errorMessageMode: request.errorMessageMode || 'none'
+                }
+            );
         }
-      });
-      schema = changeSchema[0];
-    }
-    schema.componentProps.style = { ...schema.componentProps.style, ...style };
-  };
+    };
 
-  const formApi: FormActionType = {
-    submit,
-    validate,
-    clearValidate,
-    scrollToField,
-    validateFields,
-    resetFields,
-    setProps,
-    updateSchema,
-    setFieldsValue,
-    getFieldsValue,
-    removeSchemaByFiled,
-    appendSchemaByField,
-    resetSchema,
-    showModal,
-    regTest,
-    httpRequest,
-    refreshAPI,
-    changeStyle,
-    setDefaultValue,
-  };
+    const refreshAPI = (field: string) => {
+        if (!field) return;
+        if (!Object.keys(unref(refreshFieldObj)).includes(field)) {
+            unref(refreshFieldObj)[field] = 0;
+        }
+        unref(refreshFieldObj)[field]++;
+    };
 
-  //将表单方法  导出 给父组件使用。
-  defineExpose<FormActionType>(formApi);
+    const changeStyle = (schema, style, field?) => {
+        if (field) {
+            const changeSchema = unref(getSchemas).filter((item) => {
+                if (props.isCamelCase) {
+                    return camelCaseString(item.field) === field;
+                } else {
+                    return item.field === field;
+                }
+            });
+            schema = changeSchema[0];
+        }
+        schema.componentProps.style = { ...schema.componentProps.style, ...style };
+    };
+
+    const formApi: FormActionType = {
+        submit,
+        validate,
+        clearValidate,
+        scrollToField,
+        validateFields,
+        resetFields,
+        setProps,
+        updateSchema,
+        setFieldsValue,
+        getFieldsValue,
+        removeSchemaByFiled,
+        appendSchemaByField,
+        resetSchema,
+        showModal,
+        regTest,
+        httpRequest,
+        refreshAPI,
+        changeStyle,
+        setDefaultValue
+    };
+
+    //将表单方法  导出 给父组件使用。
+    defineExpose<FormActionType>(formApi);
 </script>
diff --git a/src/components/SimpleForm/src/components/SimpleFormItem.vue b/src/components/SimpleForm/src/components/SimpleFormItem.vue
index 13eb402..806a547 100644
--- a/src/components/SimpleForm/src/components/SimpleFormItem.vue
+++ b/src/components/SimpleForm/src/components/SimpleFormItem.vue
@@ -2,52 +2,20 @@
     <div>
         <!--如果是grid 组件 需要新增grid布局包裹-->
         <template v-if="schema.component.includes('Grid')">
-            <Row
-                v-show="getIsShow(schema)"
-                :align="(schema.componentProps as any ).align"
-                :gutter="(schema.componentProps as any ).gutter ?? 0"
-                :justify="(schema.componentProps as any ).justify"
-                type="flex"
-            >
+            <Row v-show="getIsShow(schema)" :align="(schema.componentProps as any ).align" :gutter="(schema.componentProps as any ).gutter ?? 0" :justify="(schema.componentProps as any ).justify" type="flex">
                 <Col v-for="(col, colIndex) in schema.children" :key="colIndex" :span="col.span">
                     <template v-for="childSchema in col.list" :key="childSchema.field">
-                        <SimpleFormItem
-                            v-if="showComponent(childSchema)"
-                            v-model:value="formModel![childSchema.field]"
-                            :form-api="formApi"
-                            :isWorkFlow="isWorkFlow"
-                            :label-col="labelCol"
-                            :refreshFieldObj="refreshFieldObj"
-                            :schema="childSchema"
-                        />
+                        <SimpleFormItem v-if="showComponent(childSchema)" v-model:value="formModel![childSchema.field]" :form-api="formApi" :isWorkFlow="isWorkFlow" :label-col="labelCol" :refreshFieldObj="refreshFieldObj" :schema="childSchema" />
                     </template>
                 </Col>
             </Row>
         </template>
         <!--如果是tab 组件 需要新增tab组件包裹-->
         <template v-else-if="schema.component === 'Tab'">
-            <Tabs
-                v-show="getIsShow(schema)"
-                v-model:activeKey="activeKey"
-                :size="(schema.componentProps as any ).tabSize"
-                :tabPosition="(schema.componentProps as any ).tabPosition"
-                :type="(schema.componentProps as any ).type"
-            >
-                <TabPane
-                    v-for="(tab, tabIndex) in schema.children"
-                    :key="tabIndex"
-                    :forceRender="true"
-                    :tab="tab.name"
-                >
+            <Tabs v-show="getIsShow(schema)" v-model:activeKey="activeKey" :size="(schema.componentProps as any ).tabSize" :tabPosition="(schema.componentProps as any ).tabPosition" :type="(schema.componentProps as any ).type">
+                <TabPane v-for="(tab, tabIndex) in schema.children" :key="tabIndex" :forceRender="true" :tab="tab.name">
                     <template v-for="childSchema in tab.list" :key="childSchema.field">
-                        <SimpleFormItem
-                            v-if="showComponent(childSchema)"
-                            v-model:value="formModel![childSchema.field]"
-                            :form-api="formApi"
-                            :isWorkFlow="isWorkFlow"
-                            :refreshFieldObj="refreshFieldObj"
-                            :schema="childSchema"
-                        />
+                        <SimpleFormItem v-if="showComponent(childSchema)" v-model:value="formModel![childSchema.field]" :form-api="formApi" :isWorkFlow="isWorkFlow" :refreshFieldObj="refreshFieldObj" :schema="childSchema" />
                     </template>
                 </TabPane>
             </Tabs>
@@ -64,13 +32,7 @@
                 :name="schema.field"
                 :wrapperCol="itemLabelWidthProp.wrapperCol"
             >
-                <component
-                    :is="formComponent(schema)"
-                    v-model:value="formModel![schema.field]"
-                    :disabled="getDisable"
-                    :size="formProps?.size"
-                    v-bind="schema.componentProps"
-                />
+                <component :is="formComponent(schema)" v-model:value="formModel![schema.field]" :disabled="getDisable" :size="formProps?.size" v-bind="schema.componentProps" />
             </FormItem>
         </template>
         <!--如果是子表单 组件 需要v-model:value="表单对象[字段名]"-->
@@ -85,14 +47,7 @@
                 :name="schema.field"
                 :wrapperCol="itemLabelWidthProp.wrapperCol"
             >
-                <component
-                    :is="componentMap.get(schema.component)"
-                    v-model:value="formModel![schema.field]"
-                    :disabled="getDisable"
-                    :refreshFieldObj="refreshFieldObj"
-                    :size="formProps?.size"
-                    v-bind="schema.componentProps"
-                />
+                <component :is="componentMap.get(schema.component)" v-model:value="formModel![schema.field]" :disabled="getDisable" :refreshFieldObj="refreshFieldObj" :size="formProps?.size" v-bind="schema.componentProps" />
             </FormItem>
         </template>
         <template v-else-if="schema.component === 'TableLayout'">
@@ -104,21 +59,11 @@
                                 height: tdElement.height ? tdElement.height + 'px' : '',
                                 minHeight: (tdElement.height || '42') + 'px',
                                 overflow: 'hidden',
-                                padding: '10px',
+                                padding: '10px'
                             }"
                         >
-                            <template
-                                v-for="childSchema in tdElement.children"
-                                :key="childSchema.field"
-                            >
-                                <SimpleFormItem
-                                    v-if="showComponent(childSchema)"
-                                    v-model:value="formModel![childSchema.field]"
-                                    :form-api="formApi"
-                                    :isWorkFlow="isWorkFlow"
-                                    :refreshFieldObj="refreshFieldObj"
-                                    :schema="childSchema"
-                                />
+                            <template v-for="childSchema in tdElement.children" :key="childSchema.field">
+                                <SimpleFormItem v-if="showComponent(childSchema)" v-model:value="formModel![childSchema.field]" :form-api="formApi" :isWorkFlow="isWorkFlow" :refreshFieldObj="refreshFieldObj" :schema="childSchema" />
                             </template>
                         </div>
                     </div>
@@ -149,62 +94,24 @@
                 />
             </FormItem>
             <!-- 因为Range会变为 开始时间 和 结束时间 2个属性给与表单数据 所以需要2个隐藏框绑定  starTime  和 endTime -->
-            <FormItem
-                v-show="false"
-                :key="schema.key"
-                :label="getComponentsProps.showLabel ? schema.label : ''"
-                :name="schema.field.split(',')[0]"
-            >
+            <FormItem v-show="false" :key="schema.key" :label="getComponentsProps.showLabel ? schema.label : ''" :name="schema.field.split(',')[0]">
                 <input type="hidden" />
             </FormItem>
-            <FormItem
-                v-show="false"
-                :key="schema.key"
-                :label="getComponentsProps.showLabel ? schema.label : ''"
-                :name="schema.field.split(',')[1]"
-            >
+            <FormItem v-show="false" :key="schema.key" :label="getComponentsProps.showLabel ? schema.label : ''" :name="schema.field.split(',')[1]">
                 <input type="hidden" />
             </FormItem>
         </template>
         <!--如果checked  或者 switch组件 需要v-model:checked="表单对象[字段名]" "-->
         <template v-else-if="checkedValueComponents.includes(schema.component)">
-            <FormItem
-                v-if="getShow(schema)"
-                v-show="getIsShow(schema)"
-                :key="schema.key"
-                :label="getComponentsProps.showLabel ? schema.label : ''"
-                :label-col="labelCol"
-                :name="schema.field"
-                :rules="rules"
-                :wrapperCol="itemLabelWidthProp.wrapperCol"
-            >
-                <component
-                    :is="componentMap.get(schema.component)"
-                    :key="refreshFieldObj[schema.field]"
-                    v-model:checked="formModel![schema.field]"
-                    :disabled="getDisable"
-                    :size="formProps?.size"
-                    v-bind="getComponentsProps"
-                />
+            <FormItem v-if="getShow(schema)" v-show="getIsShow(schema)" :key="schema.key" :label="getComponentsProps.showLabel ? schema.label : ''" :label-col="labelCol" :name="schema.field" :rules="rules" :wrapperCol="itemLabelWidthProp.wrapperCol">
+                <component :is="componentMap.get(schema.component)" :key="refreshFieldObj[schema.field]" v-model:checked="formModel![schema.field]" :disabled="getDisable" :size="formProps?.size" v-bind="getComponentsProps" />
             </FormItem>
         </template>
         <!--如果是card 组件 需要新增card组件包裹-->
         <template v-else-if="schema.component.includes('Card')">
-            <CollapseContainer
-                v-show="getIsShow(schema)"
-                :bordered="false"
-                :hasLeftBorder="true"
-                :title="(schema.componentProps as any ).title"
-            >
+            <CollapseContainer v-show="getIsShow(schema)" :bordered="false" :hasLeftBorder="true" :title="(schema.componentProps as any ).title">
                 <template v-for="childSchema  in schema.children![0].list" :key="childSchema.field">
-                    <SimpleFormItem
-                        v-if="showComponent(childSchema)"
-                        v-model:value="formModel![childSchema.field]"
-                        :form-api="formApi"
-                        :isWorkFlow="isWorkFlow"
-                        :refreshFieldObj="refreshFieldObj"
-                        :schema="childSchema"
-                    />
+                    <SimpleFormItem v-if="showComponent(childSchema)" v-model:value="formModel![childSchema.field]" :form-api="formApi" :isWorkFlow="isWorkFlow" :refreshFieldObj="refreshFieldObj" :schema="childSchema" />
                 </template>
             </CollapseContainer>
         </template>
@@ -227,14 +134,7 @@
                 :validateTrigger="['blur', 'change']"
                 :wrapperCol="itemLabelWidthProp.wrapperCol"
             >
-                <component
-                    :is="componentMap.get(schema.component)"
-                    :key="refreshFieldObj[schema.field]"
-                    :disabled="getDisable"
-                    :size="formProps?.size"
-                    :value="schema.defaultValue"
-                    v-bind="getComponentsProps"
-                />
+                <component :is="componentMap.get(schema.component)" :key="refreshFieldObj[schema.field]" :disabled="getDisable" :size="formProps?.size" :value="schema.defaultValue" v-bind="getComponentsProps" />
             </FormItem>
         </template>
         <template v-else>
@@ -249,20 +149,11 @@
                 :validateTrigger="['blur', 'change']"
                 :wrapperCol="itemLabelWidthProp.wrapperCol"
             >
-                <template
-                    v-if="getDisable && /Input|AutoCodeRule|DatePicker/.test(schema.component)"
-                >
+                <template v-if="getDisable && /Input|AutoCodeRule|DatePicker/.test(schema.component)">
                     <readonly :schema="schema" :value="formModel![schema.field]" />
                 </template>
                 <template v-else>
-                    <component
-                        :is="defaultComponent(schema)"
-                        :key="refreshFieldObj[schema.field]"
-                        v-model:value="formModel![schema.field]"
-                        :disabled="getDisable"
-                        :size="formProps?.size"
-                        v-bind="getComponentsProps"
-                    />
+                    <component :is="defaultComponent(schema)" :key="refreshFieldObj[schema.field]" v-model:value="formModel![schema.field]" :disabled="getDisable" :size="formProps?.size" v-bind="getComponentsProps" />
                 </template>
             </FormItem>
         </template>
@@ -277,10 +168,7 @@
     import { useItemLabelWidth } from '/@/components/Form/src/hooks/useLabelWidth';
     import { FormActionType, FormProps, FormSchema } from '/@/components/Form/src/types/form';
     import { CollapseContainer } from '/@/components/Container';
-    import {
-        noShowWorkFlowComponents,
-        noShowGenerateComponents,
-    } from '/@/components/Form/src/helper';
+    import { noShowWorkFlowComponents, noShowGenerateComponents } from '/@/components/Form/src/helper';
     import { useMessage } from '/@/hooks/web/useMessage';
     import TableLayoutPreview from '/@/components/Form/src/components/TableLayoutPreview.vue';
     import { camelCaseString } from '/@/utils/event/design';
@@ -292,22 +180,22 @@
         // 表单配置规则
         schema: {
             type: Object as PropType<FormSchema>,
-            default: () => {},
+            default: () => {}
         },
         value: [Object, String, Number, Boolean, Array],
         formApi: {
-            type: Object as PropType<FormActionType>,
+            type: Object as PropType<FormActionType>
         },
         //刷新api使用
         refreshFieldObj: {
             type: Object,
-            default: () => {},
+            default: () => {}
         },
         //是否是工作流
         isWorkFlow: {
             type: Boolean,
-            default: false,
-        },
+            default: false
+        }
     });
 
     const formModel = inject<Recordable>('formModel');
@@ -315,14 +203,16 @@
     const tabActiveKey = inject<Ref<number>>('tabActiveKey', ref(0));
     const activeKey = ref<number>(0);
     const isCamelCase = inject<boolean>('isCamelCase', false);
+    // 注入整个表单的配置，formProps是个计算属性，不能修改，formData则来自每个业务的表单页面。
+    const formData = inject('formData', { noInject: true });
     watch(
         () => tabActiveKey?.value,
         (val) => {
             if (props.isWorkFlow) activeKey.value = val!;
         },
         {
-            immediate: true,
-        },
+            immediate: true
+        }
     );
     watch(
         () => activeKey?.value,
@@ -330,8 +220,8 @@
             if (props.isWorkFlow) tabActiveKey.value = val!;
         },
         {
-            immediate: true,
-        },
+            immediate: true
+        }
     );
 
     // watch(
@@ -381,7 +271,7 @@
                 values: formModel![getSchema.value.field],
                 model: formModel!,
                 schema: unref(getSchema),
-                field: unref(getSchema).field,
+                field: unref(getSchema).field
             });
         }
         return disabled;
@@ -395,38 +285,31 @@
                 componentProps({
                     schema: props.schema,
                     formModel,
-                    formActionType: props.formApi,
+                    formActionType: props.formApi
                 }) ?? {};
         } else {
             if (componentProps['events']) {
                 for (const eventKey in componentProps['events']) {
                     try {
-                        const event = new Function(
-                            'schema',
-                            'formModel',
-                            'formActionType',
-                            `${componentProps['events'][eventKey]}`,
-                        );
+                        const fun = componentProps['events'][eventKey];
+                        let event;
+                        if (typeof fun === 'string') {
+                            event = new Function('schema', 'formModel', 'formActionType', 'extParams', `${fun}`);
+                        } else if (typeof fun === 'function') {
+                            event = fun;
+                        }
                         componentProps['on' + upperFirst(eventKey)] = function () {
                             let cloneFormModel = cloneDeep(formModel);
                             for (let item in cloneFormModel) {
                                 let field = camelCaseString(item);
                                 if (field) cloneFormModel[field] = cloneFormModel[item];
                             }
-                            event(
-                                props.schema,
-                                isCamelCase ? cloneFormModel : formModel,
-                                props.formApi,
-                            );
+                            event(props.schema, isCamelCase ? cloneFormModel : formModel, props.formApi, { formData });
 
                             if (isCamelCase) {
                                 for (let item in formModel) {
                                     let field = camelCaseString(item);
-                                    if (
-                                        cloneFormModel &&
-                                        field &&
-                                        cloneFormModel[field] !== undefined
-                                    ) {
+                                    if (cloneFormModel && field && cloneFormModel[field] !== undefined) {
                                         formModel[item] = cloneFormModel[field];
                                     }
                                 }
@@ -436,7 +319,7 @@
                         console.log('error', error);
                         notification.error({
                             message: 'Tip',
-                            description: '触发事件填写有误！',
+                            description: '触发事件填写有误！'
                         });
                     }
                 }
@@ -453,15 +336,13 @@
     });
 
     const labelCol = computed(() => {
-        return unref(getComponentsProps).span
-            ? { span: unref(getComponentsProps).span }
-            : unref(itemLabelWidthProp).labelCol;
+        return unref(getComponentsProps).span ? { span: unref(getComponentsProps).span } : unref(itemLabelWidthProp).labelCol;
     });
 
     const rules = computed(() => {
         const requiredRule = {
             required: unref(getComponentsProps).required || false,
-            message: `${props.schema.label}是必填项`,
+            message: `${props.schema.label}是必填项`
         };
         const rulesList = cloneDeep(unref(getComponentsProps).rules);
         if (!rulesList) return [requiredRule];
@@ -477,10 +358,7 @@
             // console.log('formitem watch!!!!!!!!');
             //填值以后需要手动校验的组件
             const validateComponents = ['User', 'RichTextEditor', 'Upload', 'SelectMap'];
-            if (
-                validateComponents.includes(props.schema.component) &&
-                formModel![props.schema.field]
-            ) {
+            if (validateComponents.includes(props.schema.component) && formModel![props.schema.field]) {
                 setTimeout(() => {
                     props.formApi?.validateFields([props.schema.field]);
                 }, 100);
@@ -488,8 +366,8 @@
         },
         {
             deep: true,
-            immediate: true,
-        },
+            immediate: true
+        }
     );
     onMounted(() => {
         // console.log('onMounted');
@@ -510,31 +388,15 @@
     });
 
     const formComponent = (schema) => {
-        return componentMap.get(
-            [
-                'caseErpApplyDetailList',
-                'case_erp_apply_detailList',
-                'CASE_ERP_APPLY_DETAILList',
-            ].includes(schema.field)
-                ? 'ErpApply'
-                : schema.component,
-        );
+        return componentMap.get(['caseErpApplyDetailList', 'case_erp_apply_detailList', 'CASE_ERP_APPLY_DETAILList'].includes(schema.field) ? 'ErpApply' : schema.component);
     };
 
     const defaultComponent = (schema) => {
-        return componentMap.get(
-            schema.key === 'ac18952da41b45c9a66ffba3e42b7f3d'
-                ? 'ErpUpload'
-                : schema.key === 'b3ba87573cf0466d951bc63fd4df1c78'
-                ? 'ErpCheck'
-                : schema.component,
-        );
+        return componentMap.get(schema.key === 'ac18952da41b45c9a66ffba3e42b7f3d' ? 'ErpUpload' : schema.key === 'b3ba87573cf0466d951bc63fd4df1c78' ? 'ErpCheck' : schema.component);
     };
 
     function showComponent(schema) {
-        return props.isWorkFlow
-            ? !noShowWorkFlowComponents.includes(schema.type)
-            : !noShowGenerateComponents.includes(schema.type);
+        return props.isWorkFlow ? !noShowWorkFlowComponents.includes(schema.type) : !noShowGenerateComponents.includes(schema.type);
     }
 
     function getShow(schema: FormSchema): boolean {