From 76a2203237800cb021657c0bd1a6af87d7d541fa Mon Sep 17 00:00:00 2001
From: gaoyunqi <gaoyunqi@gdyd.com>
Date: Wed, 12 Jun 2024 11:38:57 +0800
Subject: [PATCH] =?UTF-8?q?docs:=20=E4=BF=AE=E6=AD=A3=E4=BA=8C=E5=BC=80?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E9=87=8C=E4=B8=80=E5=A4=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20fix:=20=E7=A7=BB=E9=99=A4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E4=B8=AD=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=AE=A1=E6=89=B9=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=EF=BC=88=E5=B7=B2=E7=BB=8F=E6=94=B9=E4=B8=BA=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=97=A0=E7=94=A8=EF=BC=89?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=A1=8C=E4=B8=AD=E7=9A=84=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=8C=89=E9=92=AE=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E6=9F=A5=E7=9C=8B=E6=8C=89=E9=92=AE=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=A4=84=E7=90=86=E8=A1=A8=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=20fix:=20=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E4=B8=8D=E5=9C=A8git=E9=87=8C=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=A4=9A=E4=BA=BA=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E6=97=B6=E4=BA=92=E7=9B=B8=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development.example                      |   38 +
 .env.production.example                       |   38 +
 .gitignore                                    |    2 +
 docs/dev_readme.md                            |    6 +
 docs/表单二开/1_拆分表单.md                   |    2 +-
 docs/表单二开/3_明细表二开例子.md             |    0
 .../4_表单tab页拆分+改为进度条样式.md         |    1 +
 src/components/SimpleForm/src/SimpleForm.vue  | 1256 ++++++++---------
 src/utils/helper/generatorHelper.ts           |  103 +-
 9 files changed, 721 insertions(+), 725 deletions(-)
 create mode 100644 .env.development.example
 create mode 100644 .env.production.example
 create mode 100644 docs/表单二开/3_明细表二开例子.md
 create mode 100644 docs/表单二开/4_表单tab页拆分+改为进度条样式.md

diff --git a/.env.development.example b/.env.development.example
new file mode 100644
index 0000000..2f8de6d
--- /dev/null
+++ b/.env.development.example
@@ -0,0 +1,38 @@
+# 是否开启mock数据，关闭时需要自行对接后台接口
+VITE_USE_MOCK = false
+
+# 资源公共路径,需要以 /开头和结尾
+VITE_PUBLIC_PATH = /
+
+# 本地开发代理，可以解决跨域及多地址代理
+# 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
+# 可以有多个，注意多个不能换行，否则代理将会失效
+# VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
+# VITE_PROXY=[["/api","https://vvbin.cn/test"]]
+
+# 是否删除Console.log
+VITE_DROP_CONSOLE = false
+
+# 接口地址
+# 如果没有跨域问题，直接在这里配置即可
+VITE_GLOB_API_URL=http://10.133.96.105:8077
+# 报表系统地址
+VITE_GLOB_REPORT_URL=http://10.133.96.105:3100
+
+# 文件上传接口  可选
+VITE_GLOB_UPLOAD_URL = /system/oss/upload
+
+# 文件预览接口  可选
+VITE_GLOB_UPLOAD_PREVIEW = http://10.0.252.28:8012/onlinePreview?url=
+
+#外部url地址
+VITE_GLOB_OUT_LINK_URL = ['http://localhost:4100']
+
+#打印项目地址
+VITE_GLOB_PRINT_BASE_URL = http://114.116.210.204:3300
+
+# 接口地址前缀，有些系统所有接口地址都有前缀，可以在这里统一加，方便切换
+VITE_GLOB_API_URL_PREFIX =
+
+# 屏蔽通知消息的轮询
+VITE_DISABLE_NEWS = true
diff --git a/.env.production.example b/.env.production.example
new file mode 100644
index 0000000..9f5ddda
--- /dev/null
+++ b/.env.production.example
@@ -0,0 +1,38 @@
+# 是否开启mock
+VITE_USE_MOCK = true
+
+# 资源公共路径,需要以 / 开头和结尾
+VITE_PUBLIC_PATH = /
+
+# 是否删除Console.log
+VITE_DROP_CONSOLE = true
+
+# 打包是否输出gz｜br文件
+# 可选: gzip | brotli | none
+# 也可以有多个, 例如 ‘gzip’|'brotli',这样会同时生成 .gz和.br文件
+VITE_BUILD_COMPRESS = 'gzip'
+
+# 使用compress时是否删除源文件，默认false
+VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
+
+# 接口地址 可以由nginx做转发或者直接写实际地址
+VITE_GLOB_API_URL=http://10.133.96.60:8088
+
+
+# 文件上传地址 可以由nginx做转发或者直接写实际地址
+VITE_GLOB_UPLOAD_URL = /system/oss/upload
+
+# 文件预览接口  可选
+VITE_GLOB_UPLOAD_PREVIEW = http://114.116.210.204:8012/onlinePreview?url=
+
+#外部url地址
+VITE_GLOB_OUT_LINK_URL = ['http://114.116.210.204:4100']
+
+#打印项目地址
+VITE_GLOB_PRINT_BASE_URL = http://114.116.210.204:3300
+
+# 接口地址前缀，有些系统所有接口地址都有前缀，可以在这里统一加，方便切换
+VITE_GLOB_API_URL_PREFIX =
+
+# 打包是否开启pwa功能
+VITE_USE_PWA = false
diff --git a/.gitignore b/.gitignore
index 5a59c14..2297191 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ tests/server/static/upload
 .env.local
 .env.*.local
 .eslintcache
+.env.development
+.env.production
 
 # Log files
 npm-debug.log*
diff --git a/docs/dev_readme.md b/docs/dev_readme.md
index 8006597..0ecb24e 100644
--- a/docs/dev_readme.md
+++ b/docs/dev_readme.md
@@ -11,9 +11,15 @@
 - 表单和表格需要合理调整字段宽度，响应式布局下需要使用定宽模式，一般情况下，字段的宽度取平均字长 + 2个汉字的宽度为宜，不要留太长的label，也要避免出现label换行
 
 ## Q&A
+
 ### 为什么表单所有字段都成了必填
 默认情况下，绑定流程后，新建节点的所有字段都被设置为必填，需要在流程的开始节点-表单设置中去掉非必填的项。
 
+### 表单设计和代码模版有什么区别
+代码模版生成的本地文件有二开支持，表单符合UI规范，表单设计可以在线发布，像低开一样，不用写代码，但是界面不符合UI规范。
+
+两种方法表单设计器支持内容一致，也都支持流程，差别只是UI方面。建议在设计业务模块优先使用代码模版。
+
 ## 在Tab页中打开表单/流程
 如果你需要自己编程实现Tab页跳转，或者升级旧版框架的页面，可以参考下面步骤：
 ```typescript
diff --git a/docs/表单二开/1_拆分表单.md b/docs/表单二开/1_拆分表单.md
index 0b96b9e..7dcf22e 100644
--- a/docs/表单二开/1_拆分表单.md
+++ b/docs/表单二开/1_拆分表单.md
@@ -68,7 +68,7 @@ export default {
     components: { Form, Col, SimpleFormItem, Row, FormItem },
     mixins: [SimpleFormSetup],
     setup(props, ctx) {
-        const ret = SimpleForm.setup(props, ctx);
+        const ret = SimpleFormSetup.setup(props, ctx);
         return {
             ...ret
         };
diff --git a/docs/表单二开/3_明细表二开例子.md b/docs/表单二开/3_明细表二开例子.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/表单二开/4_表单tab页拆分+改为进度条样式.md b/docs/表单二开/4_表单tab页拆分+改为进度条样式.md
new file mode 100644
index 0000000..72e109a
--- /dev/null
+++ b/docs/表单二开/4_表单tab页拆分+改为进度条样式.md
@@ -0,0 +1 @@
+# 二开实例：Tab页拆分+样式调整+校验
diff --git a/src/components/SimpleForm/src/SimpleForm.vue b/src/components/SimpleForm/src/SimpleForm.vue
index f920557..74e3b8d 100644
--- a/src/components/SimpleForm/src/SimpleForm.vue
+++ b/src/components/SimpleForm/src/SimpleForm.vue
@@ -1,20 +1,16 @@
 <template>
     <div ref="formWrap">
-        <Form ref="formRef" :label-col="getProps?.labelCol" :labelAlign="getProps?.labelAlign"
-            :layout="getProps?.layout" :model="formModel" :wrapper-col="getProps?.wrapperCol"
-            @keypress.enter="handleEnterPress">
+        <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="getColWidth(schema)">
-                    <div v-if="schema?.componentProps.respBreakLine" style="width: 100%; height: 1px"></div>
-                    <template v-if="showComponent(schema) && schema.type !== 'slot'">
-                        <SimpleFormItem v-model:value="formModel[schema.field]" :form-api="formApi"
-                            :isWorkFlow="isWorkFlow" :refreshFieldObj="refreshFieldObj" :schema="schema" />
-                    </template>
-                    <template v-if="schema.type === 'slot'">
-                        <slot :formModel="formModel" :name="schema.slotName" :schema="schema"></slot>
-                    </template>
+                    <Col v-if="getIfShow(schema, formModel[schema.field])" v-show="getIsShow(schema, formModel[schema.field])" :span="getColWidth(schema)">
+                        <div v-if="schema?.componentProps.respBreakLine" style="width: 100%; height: 1px"></div>
+                        <template v-if="showComponent(schema) && schema.type !== 'slot'">
+                            <SimpleFormItem v-model:value="formModel[schema.field]" :form-api="formApi" :isWorkFlow="isWorkFlow" :refreshFieldObj="refreshFieldObj" :schema="schema" />
+                        </template>
+                        <template v-if="schema.type === 'slot'">
+                            <slot :formModel="formModel" :name="schema.slotName" :schema="schema"></slot>
+                        </template>
                     </Col>
                 </template>
             </Row>
@@ -34,21 +30,21 @@
     </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, debounce } from 'lodash-es';
-import { computed, reactive, ref, provide, unref, nextTick, toRaw, createVNode, inject, onMounted, onUnmounted } 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';
+    import { Form, FormInstance, Row, Col, Modal, message } from 'ant-design-vue';
+    import { cloneDeep, isArray, isBoolean, isFunction, isObject, isString, uniqBy, isNil, debounce } from 'lodash-es';
+    import { computed, reactive, ref, provide, unref, nextTick, toRaw, createVNode, inject, onMounted, onUnmounted } 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();
@@ -57,645 +53,645 @@ import { camelCaseString } from '/@/utils/event/design';
     const wrapWidth = ref(960);
     const formData = inject('formData', { noInject: true });
 
-const propsRef = ref<Partial<FormProps>>({});
+    const propsRef = ref<Partial<FormProps>>({});
 
-const schemaRef = ref<Nullable<FormSchema[]>>(null);
+    const schemaRef = ref<Nullable<FormSchema[]>>(null);
 
-const emit = defineEmits(['submit']);
+    const emit = defineEmits(['submit']);
 
-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
+    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
+        }
+    });
+
+    const getSchemas = computed<FormSchema[]>(() => {
+        return (unref(getProps).schemas as any) || unref(schemaRef);
+    });
+
+    // Get the basic configuration of the form
+    const getProps = computed((): FormProps => {
+        return { ...(props.formProps as FormProps), ...unref(propsRef) } as FormProps;
+    });
+
+    // Get uniform row style and Row configuration for the entire form
+    const getRow = computed((): Recordable => {
+        const { baseRowStyle = {}, rowProps } = props.formProps!;
+
+        return {
+            style: baseRowStyle,
+            ...rowProps
+        };
+    });
+
+    function getWrapSize() {
+        const rect = formWrap.value?.getBoundingClientRect();
+        wrapWidth.value = rect?.width || 960;
     }
-});
 
-const getSchemas = computed<FormSchema[]>(() => {
-    return (unref(getProps).schemas as any) || unref(schemaRef);
-});
-
-// Get the basic configuration of the form
-const getProps = computed((): FormProps => {
-    return { ...(props.formProps as FormProps), ...unref(propsRef) } as FormProps;
-});
-
-// Get uniform row style and Row configuration for the entire form
-const getRow = computed((): Recordable => {
-    const { baseRowStyle = {}, rowProps } = props.formProps!;
-
-    return {
-        style: baseRowStyle,
-        ...rowProps
-    };
-});
-
-function getWrapSize() {
-    const rect = formWrap.value?.getBoundingClientRect();
-    wrapWidth.value = rect?.width || 960;
-}
-
-function getColWidth(schema: any) {
-    const compProps = schema.componentProps;
-    if (compProps?.responsive) {
-        if (compProps.respNewRow) {
-            return 24; // 响应式布局下独立成行
-        } else {
-            const wrapValue = wrapWidth.value;
-            if (wrapValue > import.meta.env.VITE_RESP_LG_WIDTH) {
-                return 8;
-            } else if (wrapValue > import.meta.env.VITE_RESP_MD_WIDTH) {
-                return 12;
+    function getColWidth(schema: any) {
+        const compProps = schema.componentProps;
+        if (compProps?.responsive) {
+            if (compProps.respNewRow) {
+                return 24; // 响应式布局下独立成行
             } else {
-                return 24;
+                const wrapValue = wrapWidth.value;
+                if (wrapValue > import.meta.env.VITE_RESP_LG_WIDTH) {
+                    return 8;
+                } else if (wrapValue > import.meta.env.VITE_RESP_MD_WIDTH) {
+                    return 12;
+                } else {
+                    return 24;
+                }
+            }
+        }
+        return schema.colProps?.span;
+    }
+
+    const debGetWrapSize = debounce(getWrapSize, 300);
+
+    onMounted(() => {
+        window.addEventListener('resize', debGetWrapSize);
+        getWrapSize();
+        nextTick(() => {
+            //添加隐藏组件
+            if (unref(getProps)?.hiddenComponent?.length) {
+                unref(getProps)?.hiddenComponent?.forEach((component) => {
+                    formModel[component.bindField] = component.value;
+                });
+            }
+        });
+    });
+
+    onUnmounted(() => {
+        window.removeEventListener('resize', debGetWrapSize);
+    });
+
+    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) {}
+    };
+
+    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;
             }
         }
     }
-    return schema.colProps?.span;
-}
 
-const debGetWrapSize = debounce(getWrapSize, 300);
-
-onMounted(() => {
-    window.addEventListener('resize', debGetWrapSize);
-    getWrapSize();
-    nextTick(() => {
-        //添加隐藏组件
-        if (unref(getProps)?.hiddenComponent?.length) {
-            unref(getProps)?.hiddenComponent?.forEach((component) => {
-                formModel[component.bindField] = component.value;
-            });
+    /**
+     * 回车提交表单
+     */
+    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();
+            }
         }
-    });
-});
-
-onUnmounted(() => {
-    window.removeEventListener('resize', debGetWrapSize);
-});
-
-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
+
+    //调用表单验证
+    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;
+    };
 
-    isShow = isShow && itemIsAdvanced;
-    return isShow;
-}
+    const setDefaultValue = async (): Promise<void> => {
+        getComponent(getSchemas.value);
+    };
 
-function getIfShow(schema: FormSchema, itemValue: any): boolean {
-    const { ifShow } = schema;
+    // 重置表单所有数据
+    const resetFields = async (): Promise<void> => {
+        Object.keys(formModel).forEach((key) => {
+            //没有绑定字段的组件不处理
+            if (!key) return;
+            const schema = findSchema(unref(getSchemas), key);
 
-    let isIfShow = true;
+            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 (isBoolean(ifShow)) {
-        isIfShow = ifShow;
-    }
-    if (isFunction(ifShow)) {
-        isIfShow = ifShow({
-            values: itemValue,
-            model: formModel!,
-            schema: schema,
-            field: schema.field
+            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 : '';
+            }
         });
-    }
-    return isIfShow;
-}
+        nextTick(() => clearValidate());
+    };
 
-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);
-formData.formModel=formModel;
-const handleSubmit = async () => {
-    try {
+    // 更改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', 'extParams', `${schema.componentProps['events'][eventKey]}`);
+                            event(schema, formModel, formApi, { formData });
+                        } catch (error) {
+                            console.log('error', error);
+                            notification.error({
+                                message: 'Tip',
+                                description: '触发事件填写有误！'
+                            });
+                        }
+                    }
+                }
+            }
+        }
+
+        // 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);
+                    }
+                }
+            });
+        });
+
+        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);
+                }
+
+                if (thisItem.key && it.key && thisItem.key === it.key) {
+                    it = deepMerge(it, thisItem);
+                } else if (thisItem.field === it.field) {
+                    it = deepMerge(it, thisItem);
+                }
+            });
+        });
+    };
+
+    //重置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];
+        }
+
+        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) {
+            schemaList.splice(index + 1, 0, schema);
+        }
+
+        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 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);
+        const formEl = unref(formRef);
+        if (!formEl) return;
+        try {
+            const values = await validate();
+            emit('submit', values);
+        } catch (error: any) {
+            throw new Error(error);
         }
-    });
-}
+    };
 
-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;
-        }
-    }
-}
+    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
+        });
+    };
 
-/**
- * 回车提交表单
- */
-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 regTest = async (regular: regTestProps) => {
+        const regExpression = regular.regExpression;
+        const testRes = regExpression.test(regular.testValue);
+        testRes ? message.success(regular.successMessage) : message.error(regular.errorMessage);
+    };
 
-//调用表单验证
-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];
+    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 {
-                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 : '';
+            return defHttp[request.requestType](
+                {
+                    url: request.requestUrl,
+                    data: request.params
+                },
+                {
+                    errorMessageMode: request.errorMessageMode || 'none'
+                }
+            );
         }
-    });
-    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];
+    const refreshAPI = (field: string) => {
+        if (!field) return;
+        if (!Object.keys(unref(refreshFieldObj)).includes(field)) {
+            unref(refreshFieldObj)[field] = 0;
         }
-    });
+        unref(refreshFieldObj)[field]++;
+    };
 
-    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', 'extParams', `${schema.componentProps['events'][eventKey]}`);
-                            event(schema, formModel, formApi, { formData });
-                    } catch (error) {
-                        console.log('error', error);
-                        notification.error({
-                            message: 'Tip',
-                            description: '触发事件填写有误！'
-                        });
-                    }
-                }
-            }
-        }
-    }
-
-    // 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);
+    const changeStyle = (schema, style, field?) => {
+        if (field) {
+            const changeSchema = unref(getSchemas).filter((item) => {
+                if (props.isCamelCase) {
+                    return camelCaseString(item.field) === field;
                 } else {
-                    schema.push(val);
+                    return item.field === field;
                 }
-            }
-        });
-    });
-
-    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);
-            }
-
-            if (thisItem.key && it.key && thisItem.key === it.key) {
-                it = deepMerge(it, thisItem);
-            } else if (thisItem.field === it.field) {
-                it = deepMerge(it, thisItem);
-            }
-        });
-    });
-};
-
-//重置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];
-    }
-
-    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);
-            }
+            });
+            schema = changeSchema[0];
         }
-    }
-    schemaRef.value = schemaList;
-};
-//追加schema
-const appendSchemaByField = async (schema: FormSchema, prefixField: string | undefined, first?: boolean | undefined): Promise<void> => {
-    const schemaList: FormSchema[] = cloneDeep(unref(getSchemas));
+        schema.componentProps.style = { ...schema.componentProps.style, ...style };
+    };
 
-    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);
-    }
+    const formApi: FormActionType = {
+        submit,
+        validate,
+        clearValidate,
+        scrollToField,
+        validateFields,
+        resetFields,
+        setProps,
+        updateSchema,
+        setFieldsValue,
+        getFieldsValue,
+        removeSchemaByFiled,
+        appendSchemaByField,
+        resetSchema,
+        showModal,
+        regTest,
+        httpRequest,
+        refreshAPI,
+        changeStyle,
+        setDefaultValue
+    };
 
-    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 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 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;
-            } 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);
+    //将表单方法  导出 给父组件使用。
+    defineExpose<FormActionType>(formApi);
 </script>
diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts
index 7f2ab23..2ab6598 100644
--- a/src/utils/helper/generatorHelper.ts
+++ b/src/utils/helper/generatorHelper.ts
@@ -581,55 +581,6 @@ export function buildListCode(model: GeneratorConfig): string {
       </BasicTable>
       ${model.listConfig.isLeftMenu ? '</div>' : ''}
       
-  ${
-    hasStartWorkButton
-      ? `
-      <LookProcess
-        v-if="visibleLookProcessRef"
-        :taskId="taskIdRef"
-        :processId="processIdRef"
-        @close="visibleLookProcessRef = false"
-        :visible="visibleLookProcessRef"
-      />
-      <LaunchProcess
-        v-if="visibleLaunchProcessRef"
-        :schemaId="schemaIdRef"
-        :form-data="formDataRef"
-        :form-id="formIdComputedRef"
-        :rowKeyData="rowKeyData"
-        :draftsId="draftsId"
-        @close="handleCloseLaunch"
-      />
-      <ApprovalProcess
-        v-if="visibleApproveProcessRef"
-        :taskId="taskIdRef"
-        :processId="processIdRef"
-        :schemaId="schemaIdRef"
-        @close="handleCloseApproval"
-        :visible="visibleApproveProcessRef"
-      />
-      ${
-        hasFlowRecordButton
-          ? `<BasicModal
-      v-if="visibleFlowRecordModal"
-      :visible="visibleFlowRecordModal"
-      :title="t('查看流转记录')"
-      :paddingRight="15"
-      :showOkBtn="false"
-      :width="1200"
-      @visible-change="
-        (v) => {
-          visibleFlowRecordModal = v;
-        }
-      "
-      :bodyStyle="{ minHeight: '400px !important' }"
-    >
-      <FlowRecord :processId="processIdRef" />
-    </BasicModal>`
-          : ''
-      }`
-      : ''
-  }
   ${
     hasTemplatePrint
       ? ` <PrintPreview
@@ -999,8 +950,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
   });
   
   function dbClickRow(record) {
-    if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
-      const { processId, taskIds, schemaId } = record.workflowData;
+    const { processId, taskIds, schemaId } = record.workflowData || {}; 
+    if (taskIds && taskIds.length) {
       router.push({
         path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
         query: {
@@ -1008,8 +959,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
           formName: formName
         }
       });
-    } else if (record.workflowData?.schemaId && !record.workflowData.taskIds && record.workflowData.processId) {
-      const { processId, schemaId } = record.workflowData;
+    } else if (schemaId && !taskIds && processId) {
       router.push({
         path: '/flow/' + schemaId + '/' + processId + '/approveFlow',
         query: {
@@ -1377,13 +1327,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
       ${
         formType === 'modal'
           ? `
-      router.push({
-        path: '/form/${lowerClassName}/' + record.id + '/viewForm',
-        query: {
-          formPath: '${model.outputConfig.outputValue}/${lowerClassName}',
-          formName: formName
-        }
-      });`
+      dbClickRow(record);
+      `
           : ` 
     openDrawer(true, {
       isView: true,
@@ -1527,38 +1472,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
     if (record.workflowData?.enabled) {
       //与工作流有关联的表单
       if (record.workflowData.status) {
-        //如果是本人需要审批的数据 就会有taskIds  所以需要修改绑定事件
-        const act: ActionItem = {};
-        if (record.workflowData.taskIds) {
-          act.tooltip = '查看流程(待审批)';
-          act.icon = 'daishenpi|svg';
-          act.onClick = handleApproveProcess.bind(null, record);
-        } else {
-          act.tooltip =
-            '查看流程' + (record.workflowData.status === 'ACTIVE' ? '(审批中)' : '(已完成)');
-          act.icon =
-            record.workflowData.status === 'ACTIVE' ? 'jinshenpi|svg' : 'shenpiwancheng|svg';
-          act.onClick = handleStartwork.bind(null, record);
-        }
-        actionsList.unshift(act);
-        ${
-          hasFlowRecordButton
-            ? `if (hasFlowRecord) {
-          actionsList.splice(1, 0, {
-            tooltip: '查看流转记录',
-            icon: 'liuzhuanxinxi|svg',
-            onClick: handleFlowRecord.bind(null, record),
-          });
-        }`
-            : ''
-        }
-       
+        // 查看按钮现在同时有流程和表单的功能        
       } else {
-        actionsList.unshift({
-          icon: 'faqishenpi|svg',
-          tooltip: record.workflowData.draftId ? '编辑草稿' : '发起审批' ,
-          onClick: handleLaunchProcess.bind(null, record),
-        });
         actionsList = actionsList.concat(editAndDelBtn);
       }
     } else {
@@ -1778,7 +1693,7 @@ export function buildSimpleFormCode(model: GeneratorConfig, _tableInfo: TableInf
       }
       emits('form-mounted', formProps);
     } catch (error) {
-      
+
     }
   });
   // 根据菜单页面权限，设置表单属性（必填，禁用，显示）
@@ -1811,7 +1726,7 @@ export function buildSimpleFormCode(model: GeneratorConfig, _tableInfo: TableInf
         systemFormRef.value,
         formProps.schemas); //表单事件：获取表单数据
     } catch (error) {
-      
+
     }
   }
   // 辅助设置表单数据
@@ -1911,7 +1826,7 @@ ${
       <ModalForm ref="formRef" :fromPage="FromPageType.MENU" />
     </BasicDrawer>`
 }
-  
+
 </template>
 <script lang="ts" setup>
   import { ref, computed, reactive } from 'vue';