From 528e8038bb0fa1f1c1cea55b056246aa8bdc2482 Mon Sep 17 00:00:00 2001
From: GAOANG <1140589958@qq.com>
Date: Tue, 2 Apr 2024 14:18:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=88=9B=E5=BB=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=8A=E5=8F=AA=E8=AF=BB=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8Cformlist=E5=88=97=E8=A1=A8=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/componentMap.ts       |  18 +-
 .../Form/src/components/Readonly.vue          |  57 +-
 .../src/components/SimpleFormItem.vue         | 692 +++++++++---------
 src/utils/helper/generatorHelper.ts           |  40 +-
 src/views/secondDev/approveFlowPage.vue       |  47 +-
 src/views/secondDev/formCreatePage.vue        | 200 ++---
 6 files changed, 546 insertions(+), 508 deletions(-)

diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts
index d3215eb..63ff4a2 100644
--- a/src/components/Form/src/componentMap.ts
+++ b/src/components/Form/src/componentMap.ts
@@ -142,6 +142,16 @@ componentMap.set('ErpApply', ErpApply);
 componentMap.set('ErpUpload', ErpUpload);
 componentMap.set('ErpCheck', ErpCheck);
 componentMap.set('AutoComplete', AutoComplete);
+const readonlySupportList = [
+    "Input",
+    "AutoCodeRule",
+    "DatePicker",
+    "TimePicker",
+    "Info",
+    "Text",
+    'InputTextArea',
+    'InputNumber'
+]
 
 export function add(compName: ComponentType, component: Component) {
     componentMap.set(compName, component);
@@ -151,4 +161,10 @@ export function del(compName: ComponentType) {
     componentMap.delete(compName);
 }
 
-export { componentMap };
+export function isreadComponent() {
+    let str = readonlySupportList.join('|')
+    const reg = new RegExp(str);
+    return reg
+}
+
+export { componentMap, readonlySupportList };
diff --git a/src/components/Form/src/components/Readonly.vue b/src/components/Form/src/components/Readonly.vue
index 78303ba..a05a6ac 100644
--- a/src/components/Form/src/components/Readonly.vue
+++ b/src/components/Form/src/components/Readonly.vue
@@ -3,40 +3,41 @@
 </template>
 
 <script setup>
-    import { ref, watch } from 'vue';
+import { ref, watch } from 'vue';
+import { readonlySupportList } from '/@/components/Form/src/componentMap';
 
-    const props = defineProps({
-        value: String,
-        schema: Object,
-    });
+const props = defineProps({
+    value: String,
+    schema: Object,
+});
 
-    const fieldValue = ref(genFieldValue(props.value));
+const fieldValue = ref(genFieldValue(props.value));
 
-    function genFieldValue(val) {
-        if (!props?.schema || (!val && val !== 0)) {
-            return '';
-        }
-        const schema = props.schema;
-        const { componentProps, component } = schema;
-
-        if (['Input', 'AutoCodeRule', 'DatePicker', 'InputTextArea', 'InputNumber'].includes(component)) {
-            return `${componentProps?.addonBefore || ''}${val}${componentProps?.addonAfter || ''}`;
-        }
-        if (component === 'Switch') {
-            return val === 1 ? '是' : '否';
-        }
+function genFieldValue(val) {
+    if (!props?.schema || (!val && val !== 0)) {
+        return '';
     }
+    const schema = props.schema;
+    const { componentProps, component } = schema;
 
-    watch(
-        () => props.value,
-        (newValue) => {
-            fieldValue.value = genFieldValue(newValue);
-        },
-    );
+    if (readonlySupportList.includes(component)) {
+        return `${componentProps?.addonBefore || ''}${val}${componentProps?.addonAfter || ''}`;
+    }
+    if (component === 'Switch') {
+        return val === 1 ? '是' : '否';
+    }
+}
+
+watch(
+    () => props.value,
+    (newValue) => {
+        fieldValue.value = genFieldValue(newValue);
+    },
+);
 </script>
 
 <style>
-    .field-readonly {
-        white-space: pre-wrap;
-    }
+.field-readonly {
+    white-space: pre-wrap;
+}
 </style>
diff --git a/src/components/SimpleForm/src/components/SimpleFormItem.vue b/src/components/SimpleForm/src/components/SimpleFormItem.vue
index 9432f4a..701270c 100644
--- a/src/components/SimpleForm/src/components/SimpleFormItem.vue
+++ b/src/components/SimpleForm/src/components/SimpleFormItem.vue
@@ -2,68 +2,65 @@
     <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" />
-                    </template>
+                <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" />
+                </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">
+            <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>
         </template>
         <!--如果是子表单 组件 需要v-model:value="表单对象[字段名]"-->
         <template v-else-if="schema.component.includes('Form')">
-            <FormItem
-                v-if="getShow(schema)"
-                v-show="getIsShow(schema)"
-                :key="schema.key"
-                :label="getComponentsProps.showLabel ? schema.label : ''"
-                :label-col="labelCol"
-                :labelAlign="formProps?.labelAlign"
-                :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" />
+            <FormItem v-if="getShow(schema)" v-show="getIsShow(schema)" :key="schema.key"
+                :label="getComponentsProps.showLabel ? schema.label : ''" :label-col="labelCol"
+                :labelAlign="formProps?.labelAlign" :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" />
             </FormItem>
         </template>
         <!--如果是子表单 组件 需要v-model:value="表单对象[字段名]"-->
         <template v-else-if="schema.component.includes('OneForOne')">
-            <FormItem
-                v-if="getShow(schema)"
-                v-show="getIsShow(schema)"
-                :key="schema.key"
-                :label="getComponentsProps.showLabel ? schema.label : ''"
-                :label-col="labelCol"
-                :labelAlign="formProps?.labelAlign"
-                :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" />
+            <FormItem v-if="getShow(schema)" v-show="getIsShow(schema)" :key="schema.key"
+                :label="getComponentsProps.showLabel ? schema.label : ''" :label-col="labelCol"
+                :labelAlign="formProps?.labelAlign" :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" />
             </FormItem>
         </template>
         <template v-else-if="schema.component === 'TableLayout'">
             <TableLayoutPreview v-if="getShow(schema)" v-show="getIsShow(schema)" :element="schema">
                 <template #tdElement="{ tdElement }">
                     <div class="h-full">
-                        <div
-                            :style="{
-                                height: tdElement.height ? tdElement.height + 'px' : '',
-                                minHeight: (tdElement.height || '42') + 'px',
-                                overflow: 'hidden',
-                                padding: '10px'
-                            }"
-                        >
+                        <div :style="{
+            height: tdElement.height ? tdElement.height + 'px' : '',
+            minHeight: (tdElement.height || '42') + 'px',
+            overflow: 'hidden',
+            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" />
+                                <SimpleFormItem v-if="showComponent(childSchema)"
+                                    v-model:value="formModel![childSchema.field]" :form-api="formApi"
+                                    :isWorkFlow="isWorkFlow" :refreshFieldObj="refreshFieldObj" :schema="childSchema" />
                             </template>
                         </div>
                     </div>
@@ -72,46 +69,41 @@
         </template>
         <!--如果是时间区间 组件 需要v-model:startField="表单对象[字段名]" v-model:endField="表单对象[字段名]"-->
         <template v-else-if="schema.component.includes('Range')">
-            <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"
-                :validateTrigger="['blur', 'change']"
-                :wrapperCol="itemLabelWidthProp.wrapperCol"
-            >
-                <component
-                    :is="componentMap.get(schema.component)"
-                    v-model:endField="schema.field.split(',')[1]"
-                    v-model:startField="schema.field.split(',')[0]"
-                    v-model:value="formModel![schema.field]"
-                    :disabled="getDisable"
-                    :size="formProps?.size"
-                    v-bind="schema.componentProps"
-                />
+            <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" :validateTrigger="['blur', 'change']" :wrapperCol="itemLabelWidthProp.wrapperCol">
+                <component :is="componentMap.get(schema.component)" v-model:endField="schema.field.split(',')[1]"
+                    v-model:startField="schema.field.split(',')[0]" v-model:value="formModel![schema.field]"
+                    :disabled="getDisable" :size="formProps?.size" v-bind="schema.componentProps" />
             </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>
@@ -123,337 +115,329 @@
         </template>
         <!--如果是 意见簿 组件 需要使用defaultValue直接赋值 -->
         <template v-else-if="schema.component.includes('Opinion')">
-            <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"
-                :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" />
+            <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" :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" />
             </FormItem>
         </template>
         <template v-else>
-            <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"
-                :validateTrigger="['blur', 'change']"
-                :wrapperCol="itemLabelWidthProp.wrapperCol"
-            >
-                <template v-if="getDisable && /Input|AutoCodeRule|DatePicker/.test(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" :validateTrigger="['blur', 'change']" :wrapperCol="itemLabelWidthProp.wrapperCol">
+                <template v-if="getDisable && readonlySupport(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>
     </div>
 </template>
 <script lang="ts" setup>
-    import { Form, Col, Row, Tabs, TabPane, Divider } from 'ant-design-vue';
-    import { isBoolean, isFunction, upperFirst, cloneDeep } from 'lodash-es';
-    import { computed, onMounted, unref, inject, Ref, watch, ref } from 'vue';
-    import { componentMap } from '/@/components/Form/src/componentMap';
-    import { checkedValueComponents } from '/@/components/Form/src/helper';
-    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 { useMessage } from '/@/hooks/web/useMessage';
-    import TableLayoutPreview from '/@/components/Form/src/components/TableLayoutPreview.vue';
-    import { camelCaseString } from '/@/utils/event/design';
-    import Readonly from '/@/components/Form/src/components/Readonly.vue';
+import { Form, Col, Row, Tabs, TabPane, Divider } from 'ant-design-vue';
+import { isBoolean, isFunction, upperFirst, cloneDeep } from 'lodash-es';
+import { computed, onMounted, unref, inject, Ref, watch, ref } from 'vue';
+import { componentMap } from '/@/components/Form/src/componentMap';
+import { checkedValueComponents } from '/@/components/Form/src/helper';
+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 { useMessage } from '/@/hooks/web/useMessage';
+import TableLayoutPreview from '/@/components/Form/src/components/TableLayoutPreview.vue';
+import { camelCaseString } from '/@/utils/event/design';
+import Readonly from '/@/components/Form/src/components/Readonly.vue';
 
-    const FormItem = Form.Item;
+const FormItem = Form.Item;
 
-    const props = defineProps({
-        // 表单配置规则
-        schema: {
-            type: Object as PropType<FormSchema>,
-            default: () => {}
-        },
-        value: [Object, String, Number, Boolean, Array],
-        formApi: {
-            type: Object as PropType<FormActionType>
-        },
-        //刷新api使用
-        refreshFieldObj: {
-            type: Object,
-            default: () => {}
-        },
-        //是否是工作流
-        isWorkFlow: {
-            type: Boolean,
-            default: false
-        }
-    });
+const props = defineProps({
+    // 表单配置规则
+    schema: {
+        type: Object as PropType<FormSchema>,
+        default: () => { }
+    },
+    value: [Object, String, Number, Boolean, Array],
+    formApi: {
+        type: Object as PropType<FormActionType>
+    },
+    //刷新api使用
+    refreshFieldObj: {
+        type: Object,
+        default: () => { }
+    },
+    //是否是工作流
+    isWorkFlow: {
+        type: Boolean,
+        default: false
+    }
+});
 
-    const formModel = inject<Recordable>('formModel');
-    const formProps = inject<Ref<FormProps>>('formProps');
-    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
-        }
-    );
-    watch(
-        () => activeKey?.value,
-        (val) => {
-            if (props.isWorkFlow) tabActiveKey.value = val!;
-        },
-        {
-            immediate: true
-        }
-    );
+const formModel = inject<Recordable>('formModel');
+const formProps = inject<Ref<FormProps>>('formProps');
+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
+    }
+);
+watch(
+    () => activeKey?.value,
+    (val) => {
+        if (props.isWorkFlow) tabActiveKey.value = val!;
+    },
+    {
+        immediate: true
+    }
+);
 
-    // watch(
-    //   () => props.value,
-    //   (val) => {
-    //     if (!val) return;
-    //     let { componentProps = {} } = props.schema;
-    //     if (componentProps['events']) {
-    //       for (const eventKey in componentProps['events']) {
-    //         try {
-    //           const event = new Function(
-    //             'schema',
-    //             'formModel',
-    //             'formActionType',
-    //             `${componentProps['events'][eventKey]}`,
-    //           );
-    //           event(props.schema, formModel, props.formApi);
-    //         } catch (error) {
-    //           notification.error({
-    //             message: 'Tip',
-    //             description: '触发事件填写有误！',
-    //           });
-    //         }
-    //       }
-    //     }
-    //   },
-    //   {
-    //     immediate: true,
-    //   },
-    // );
+// watch(
+//   () => props.value,
+//   (val) => {
+//     if (!val) return;
+//     let { componentProps = {} } = props.schema;
+//     if (componentProps['events']) {
+//       for (const eventKey in componentProps['events']) {
+//         try {
+//           const event = new Function(
+//             'schema',
+//             'formModel',
+//             'formActionType',
+//             `${componentProps['events'][eventKey]}`,
+//           );
+//           event(props.schema, formModel, props.formApi);
+//         } catch (error) {
+//           notification.error({
+//             message: 'Tip',
+//             description: '触发事件填写有误！',
+//           });
+//         }
+//       }
+//     }
+//   },
+//   {
+//     immediate: true,
+//   },
+// );
 
-    const { notification } = useMessage();
-    const getSchema = computed(() => {
-        return props.schema as FormSchema;
-    });
+const { notification } = useMessage();
+const getSchema = computed(() => {
+    return props.schema as FormSchema;
+});
 
-    const getDisable = computed(() => {
-        const { disabled: globDisabled } = formProps!.value;
-        const { dynamicDisabled } = getSchema.value;
-        const { disabled: itemDisabled = false } = unref(getComponentsProps);
-        let disabled = !!globDisabled || itemDisabled;
-        if (isBoolean(dynamicDisabled)) {
-            disabled = dynamicDisabled;
-        }
-        if (isFunction(dynamicDisabled)) {
-            disabled = dynamicDisabled({
-                values: formModel![getSchema.value.field],
-                model: formModel!,
-                schema: unref(getSchema),
-                field: unref(getSchema).field
-            });
-        }
-        return disabled;
-    });
+const getDisable = computed(() => {
+    const { disabled: globDisabled } = formProps!.value;
+    const { dynamicDisabled } = getSchema.value;
+    const { disabled: itemDisabled = false } = unref(getComponentsProps);
+    let disabled = !!globDisabled || itemDisabled;
+    if (isBoolean(dynamicDisabled)) {
+        disabled = dynamicDisabled;
+    }
+    if (isFunction(dynamicDisabled)) {
+        disabled = dynamicDisabled({
+            values: formModel![getSchema.value.field],
+            model: formModel!,
+            schema: unref(getSchema),
+            field: unref(getSchema).field
+        });
+    }
+    return disabled;
+});
 
-    const getComponentsProps = computed(() => {
-        let { componentProps = {} } = props.schema;
+const getComponentsProps = computed(() => {
+    let { componentProps = {} } = props.schema;
 
-        if (isFunction(componentProps)) {
-            componentProps =
-                componentProps({
-                    schema: props.schema,
-                    formModel,
-                    formActionType: props.formApi
-                }) ?? {};
-        } else {
-            if (componentProps['events']) {
-                for (const eventKey in componentProps['events']) {
-                    try {
-                        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;
+    if (isFunction(componentProps)) {
+        componentProps =
+            componentProps({
+                schema: props.schema,
+                formModel,
+                formActionType: props.formApi
+            }) ?? {};
+    } else {
+        if (componentProps['events']) {
+            for (const eventKey in componentProps['events']) {
+                try {
+                    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];
                         }
-                        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, { formData });
+                        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) {
-                                        formModel[item] = cloneFormModel[field];
-                                    }
+                        if (isCamelCase) {
+                            for (let item in formModel) {
+                                let field = camelCaseString(item);
+                                if (cloneFormModel && field && cloneFormModel[field] !== undefined) {
+                                    formModel[item] = cloneFormModel[field];
                                 }
                             }
-                        };
-                    } catch (error) {
-                        console.log('error', error);
-                        notification.error({
-                            message: 'Tip',
-                            description: '触发事件填写有误！'
-                        });
-                    }
+                        }
+                    };
+                } catch (error) {
+                    console.log('error', error);
+                    notification.error({
+                        message: 'Tip',
+                        description: '触发事件填写有误！'
+                    });
                 }
             }
         }
-        if (isBoolean(props.schema.dynamicDisabled)) {
-            componentProps['disabled'] = props.schema.dynamicDisabled;
-        }
-        if (isBoolean(props.schema.required)) {
-            componentProps['required'] = props.schema.required;
-        }
+    }
+    if (isBoolean(props.schema.dynamicDisabled)) {
+        componentProps['disabled'] = props.schema.dynamicDisabled;
+    }
+    if (isBoolean(props.schema.required)) {
+        componentProps['required'] = props.schema.required;
+    }
 
-        return componentProps as Recordable;
-    });
+    return componentProps as Recordable;
+});
 
-    const labelCol = computed(() => {
-        // 列宽支持两种模式 labelWidthMode = flex为百分比宽度 fix 为定宽
-        const commonLabelCol = unref(itemLabelWidthProp).labelCol;
-        const itemLabelCol = unref(getComponentsProps).labelCol;
-        const { labelWidthMode, labelFixWidth } = props.schema.componentProps as any;
-        let labelCol: any = {};
-        if (labelWidthMode !== 'fix') {
-            labelCol.span = itemLabelCol?.span || commonLabelCol?.span;
-        } else {
-            labelCol.style = {
-                width: `${labelFixWidth || 120}px`
-            };
-        }
-        return labelCol;
-    });
-
-    const rules = computed(() => {
-        const requiredRule = {
-            required: unref(getComponentsProps).required || false,
-            message: `${props.schema.label}是必填项`
+const labelCol = computed(() => {
+    // 列宽支持两种模式 labelWidthMode = flex为百分比宽度 fix 为定宽
+    const commonLabelCol = unref(itemLabelWidthProp).labelCol;
+    const itemLabelCol = unref(getComponentsProps).labelCol;
+    const { labelWidthMode, labelFixWidth } = props.schema.componentProps as any;
+    let labelCol: any = {};
+    if (labelWidthMode !== 'fix') {
+        labelCol.span = itemLabelCol?.span || commonLabelCol?.span;
+    } else {
+        labelCol.style = {
+            width: `${labelFixWidth || 120}px`
         };
-        const rulesList = cloneDeep(unref(getComponentsProps).rules);
-        if (!rulesList) return [requiredRule];
-        rulesList?.map((item) => (item.pattern = eval(item.pattern)));
-        return [...rulesList, requiredRule];
-    });
+    }
+    return labelCol;
+});
 
-    //根据labelwidth 生成labelCol
-    const itemLabelWidthProp = useItemLabelWidth(getSchema, formProps!);
-    watch(
-        () => formModel,
-        () => {
-            // console.log('formitem watch!!!!!!!!');
-            //填值以后需要手动校验的组件
-            const validateComponents = ['User', 'RichTextEditor', 'Upload', 'SelectMap'];
-            if (validateComponents.includes(props.schema.component) && formModel![props.schema.field]) {
-                setTimeout(() => {
-                    props.formApi?.validateFields([props.schema.field]);
-                }, 100);
-            }
-        },
-        {
-            deep: true,
-            immediate: true
-        }
-    );
-    onMounted(() => {
-        // console.log('onMounted');
-        // if (
-        //   staticDataComponents.includes(props.schema.component) &&
-        //   (props.schema.componentProps as any)?.datasourceType === 'staticData'
-        // ) {
-        //   let { defaultSelect } = props.schema.componentProps as any;
-        //   emit('update:value', defaultSelect);
-        //   console.log('update:value1', defaultSelect);
-        // } else {
-        //   let { defaultValue } = props.schema;
-        //   if (!!props.schema.field && !noDefaultValueComponents.includes(props.schema.component)) {
-        //     console.log('update:value', props.schema.component === 'SubForm' ? [] : defaultValue);
-        //     emit('update:value', defaultValue);
-        //   }
-        // }
-    });
-
-    const formComponent = (schema) => {
-        return componentMap.get(['caseErpApplyDetailList', 'case_erp_apply_detailList', 'CASE_ERP_APPLY_DETAILList'].includes(schema.field) ? 'ErpApply' : schema.component);
+const rules = computed(() => {
+    const requiredRule = {
+        required: unref(getComponentsProps).required || false,
+        message: `${props.schema.label}是必填项`
     };
+    const rulesList = cloneDeep(unref(getComponentsProps).rules);
+    if (!rulesList) return [requiredRule];
+    rulesList?.map((item) => (item.pattern = eval(item.pattern)));
+    return [...rulesList, requiredRule];
+});
 
-    const defaultComponent = (schema) => {
-        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);
-    }
-
-    function getShow(schema: FormSchema): boolean {
-        const { show } = schema;
-        let isIfShow = true;
-
-        if (isBoolean(show)) {
-            isIfShow = show;
+//根据labelwidth 生成labelCol
+const itemLabelWidthProp = useItemLabelWidth(getSchema, formProps!);
+watch(
+    () => formModel,
+    () => {
+        // console.log('formitem watch!!!!!!!!');
+        //填值以后需要手动校验的组件
+        const validateComponents = ['User', 'RichTextEditor', 'Upload', 'SelectMap'];
+        if (validateComponents.includes(props.schema.component) && formModel![props.schema.field]) {
+            setTimeout(() => {
+                props.formApi?.validateFields([props.schema.field]);
+            }, 100);
         }
-        return isIfShow;
+    },
+    {
+        deep: true,
+        immediate: true
     }
+);
+onMounted(() => {
+    // console.log('onMounted');
+    // if (
+    //   staticDataComponents.includes(props.schema.component) &&
+    //   (props.schema.componentProps as any)?.datasourceType === 'staticData'
+    // ) {
+    //   let { defaultSelect } = props.schema.componentProps as any;
+    //   emit('update:value', defaultSelect);
+    //   console.log('update:value1', defaultSelect);
+    // } else {
+    //   let { defaultValue } = props.schema;
+    //   if (!!props.schema.field && !noDefaultValueComponents.includes(props.schema.component)) {
+    //     console.log('update:value', props.schema.component === 'SubForm' ? [] : defaultValue);
+    //     emit('update:value', defaultValue);
+    //   }
+    // }
+});
 
-    function getIsShow(schema: FormSchema): boolean {
-        const { componentProps, show } = schema as any;
-        let isShow = true;
-        if (isBoolean(componentProps?.isShow)) {
-            isShow = componentProps?.isShow;
-        }
-        if (isBoolean(show)) {
-            isShow = show;
-        }
-        return isShow;
+const formComponent = (schema) => {
+    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);
+};
+
+function showComponent(schema) {
+    return props.isWorkFlow ? !noShowWorkFlowComponents.includes(schema.type) : !noShowGenerateComponents.includes(schema.type);
+}
+
+function readonlySupport(name) {
+    return /Input|AutoCodeRule|DatePicker|Text|TimePicker|Info/.test(name)
+}
+
+function getShow(schema: FormSchema): boolean {
+    const { show } = schema;
+    let isIfShow = true;
+
+    if (isBoolean(show)) {
+        isIfShow = show;
     }
+    return isIfShow;
+}
+
+function getIsShow(schema: FormSchema): boolean {
+    const { componentProps, show } = schema as any;
+    let isShow = true;
+    if (isBoolean(componentProps?.isShow)) {
+        isShow = componentProps?.isShow;
+    }
+    if (isBoolean(show)) {
+        isShow = show;
+    }
+    return isShow;
+}
 </script>
 <style lang="less" scoped>
-    :deep(.ant-form-item-label > label) {
-        white-space: normal;
-        display: inline;
-        line-height: 28px;
-    }
+:deep(.ant-form-item-label > label) {
+    white-space: normal;
+    display: inline;
+    line-height: 28px;
+}
 </style>
 <style lang="less">
-    .ant-select-disabled {
-        .ant-select-selector {
-            border: none !important;
-            background-color: transparent !important;
-            padding-left: 0 !important;
-        }
-
-        .ant-select-selection-item {
-            color: rgb(0 0 0 / 85%) !important;
-        }
-
-        .ant-select-arrow {
-            display: none;
-        }
+.ant-select-disabled {
+    .ant-select-selector {
+        border: none !important;
+        background-color: transparent !important;
+        padding-left: 0 !important;
     }
+
+    .ant-select-selection-item {
+        color: rgb(0 0 0 / 85%) !important;
+    }
+
+    .ant-select-arrow {
+        display: none;
+    }
+}
 </style>
diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts
index a67902e..b4f4f5b 100644
--- a/src/utils/helper/generatorHelper.ts
+++ b/src/utils/helper/generatorHelper.ts
@@ -523,7 +523,7 @@ export function buildListCode(model: GeneratorConfig): string {
         hasBatchDeleteButton || hasTemplatePrint || (hasSetUserIdButton && isSetDataAuth)
           ? `:row-selection="{ selectedRowKeys: selectedKeys, onChange: onSelectChange }"`
           : ''
-      }>
+      }  @row-dbClick="dbClickRow">
        ${
          hasFilterButton
            ? `<template #customFilterIcon="{ filtered, column }" >
@@ -987,6 +987,43 @@ ${hasTemplatePrint ? ' reactive ' : ''}
         : ''
     }
   });
+  
+  function dbClickRow(record) {
+    if (!record.workflowData.schemaId && !record.workflowData.taskIds) {
+      ${
+        formType === 'modal'
+          ? `
+      router.push({
+        path: '/form/${lowerClassName}/' + record.id + '/viewForm',
+        query: {
+            formPath: '${model.outputConfig.outputValue}/${lowerClassName}'
+        }
+      });`
+          : ` 
+    openDrawer(true, {
+      isView: true,
+      id: record.${camelCaseString(mainTable.pkField)},
+    });`
+      }
+    } else if (record.workflowData.taskIds && record.workflowData.taskIds.length) {
+      const { processId, taskIds, schemaId } = record.workflowData;
+      router.push({
+        path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+        query: {
+          taskId: taskIds[0]
+        }
+      });
+    } else {
+      const { processId, schemaId } = record.workflowData;
+      router.push({
+        path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+        query: {
+          readonly: 1,
+          taskId: ''
+        }
+      });
+    }
+  }
 
   function buttonClick(code) {
     ${
@@ -1682,6 +1719,7 @@ export function buildSimpleFormCode(model: GeneratorConfig, _tableInfo: TableInf
           systemFormRef.value,
           formProps.schemas); //表单事件：加载表单
       }
+      emits('form-mounted', formProps);
     } catch (error) {
       
     }
diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue
index 33922b6..ca06844 100644
--- a/src/views/secondDev/approveFlowPage.vue
+++ b/src/views/secondDev/approveFlowPage.vue
@@ -173,32 +173,29 @@ function getTaskRecords() {
 }
 
 onMounted(async () => {
-    if (unref(taskId)) {
-        try {
-            let res = await getApprovalProcess(unref(taskId), unref(processId));
-            initProcessData(res);
-            if (!readonly.value) {
-                if (res.buttonConfigs) {
-                    approvalData.buttonConfigs = res.buttonConfigs;
-                }
-                if (res.relationTasks) {
-                    data.predecessorTasks = res.relationTasks;
-                }
-                if (res.isAddOrSubSign) {
-                    approvalData.isAddOrSubSign = res.isAddOrSubSign;
-                }
-
-                approvalData.approvedType = ApproveType.AGREE;
-                approvedType.value = ApproveType.AGREE;
-                approvalData.approvedContent = '';
-                approvalData.rejectNodeActivityId = '';
-                approvalData.rejectNodeActivityIds = [];
-                approvalData.circulateConfigs = [];
+    try {
+        let res = await getApprovalProcess(unref(taskId), unref(processId));
+        initProcessData(res);
+        if (!readonly.value) {
+            if (res.buttonConfigs) {
+                approvalData.buttonConfigs = res.buttonConfigs;
             }
-            renderKey.value = Math.random() + '';
-        } catch (error) { }
-    } else {
-    }
+            if (res.relationTasks) {
+                data.predecessorTasks = res.relationTasks;
+            }
+            if (res.isAddOrSubSign) {
+                approvalData.isAddOrSubSign = res.isAddOrSubSign;
+            }
+
+            approvalData.approvedType = ApproveType.AGREE;
+            approvedType.value = ApproveType.AGREE;
+            approvalData.approvedContent = '';
+            approvalData.rejectNodeActivityId = '';
+            approvalData.rejectNodeActivityIds = [];
+            approvalData.circulateConfigs = [];
+        }
+        renderKey.value = Math.random() + '';
+    } catch (error) { }
 });
 
 async function submit() {
diff --git a/src/views/secondDev/formCreatePage.vue b/src/views/secondDev/formCreatePage.vue
index 8d6c294..2b7d4fb 100644
--- a/src/views/secondDev/formCreatePage.vue
+++ b/src/views/secondDev/formCreatePage.vue
@@ -21,121 +21,123 @@
 </template>
 
 <script setup>
-    import { useRouter } from 'vue-router';
-    import { FromPageType } from '/@/enums/workflowEnum';
-    import { ref, computed, onMounted, onBeforeMount, nextTick, defineAsyncComponent } from 'vue';
-    import { useMessage } from '/@/hooks/web/useMessage';
-    import { useI18n } from '/@/hooks/web/useI18n';
-    import { CheckCircleOutlined, StopOutlined, CloseOutlined } from '@ant-design/icons-vue';
-    import { useMultipleTabStore } from '/@/store/modules/multipleTab';
-    import useEventBus from '/@/hooks/event/useEventBus';
+import { useRouter } from 'vue-router';
+import { FromPageType } from '/@/enums/workflowEnum';
+import { ref, computed, onMounted, onBeforeMount, nextTick, defineAsyncComponent } from 'vue';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { CheckCircleOutlined, StopOutlined, CloseOutlined } from '@ant-design/icons-vue';
+import { useMultipleTabStore } from '/@/store/modules/multipleTab';
+import useEventBus from '/@/hooks/event/useEventBus';
 
-    const dynamicComponent = ref(null);
-    const formType = ref('2'); // 0 新建 1 修改 2 查看
-    const formRef = ref();
-    const props = defineProps({});
-    const { bus, FORM_LIST_MODIFIED } = useEventBus();
+const dynamicComponent = ref(null);
+const formType = ref('2'); // 0 新建 1 修改 2 查看
+const formRef = ref();
+const props = defineProps({});
+const { bus, FORM_LIST_MODIFIED } = useEventBus();
 
-    const router = useRouter();
-    const { currentRoute } = router;
+const router = useRouter();
+const { currentRoute } = router;
 
-    const { formPath } = currentRoute.value.query;
-    const pathArr = formPath.split('/');
+const { formPath } = currentRoute.value.query;
+const pathArr = formPath.split('/');
 
-    const tabStore = useMultipleTabStore();
-    const formProps = ref(null);
-    const formId = ref(currentRoute.value?.params?.id);
+const tabStore = useMultipleTabStore();
+const formProps = ref(null);
+console.error(currentRoute.value)
+const formId = ref(currentRoute.value?.params?.id);
 
-    const { notification } = useMessage();
-    const { t } = useI18n();
-    const hash = location.hash;
-    const mode = ref('read');
-    if (hash.indexOf('createForm') > 0) {
-        mode.value = 'create';
-    } else if (hash.indexOf('updateForm') > 0) {
-        mode.value = 'update';
-    } else if (hash.indexOf('viewForm') > 0) {
-        mode.value = 'view';
+const { notification } = useMessage();
+const { t } = useI18n();
+const hash = location.hash;
+const mode = ref('read');
+if (hash.indexOf('createForm') > 0) {
+    mode.value = 'create';
+} else if (hash.indexOf('updateForm') > 0) {
+    mode.value = 'update';
+} else if (hash.indexOf('viewForm') > 0) {
+    mode.value = 'view';
+}
+
+dynamicComponent.value = defineAsyncComponent({
+    loader: () => import(`./../../views/${pathArr[0]}/${pathArr[1]}/components/Form.vue`)
+});
+
+function onFormMounted(_formProps) {
+    formProps.value = _formProps;
+    setFormType();
+}
+
+async function setFormType() {
+    const _mode = mode.value;
+    if (_mode === 'create') {
+        return;
     }
-
-    dynamicComponent.value = defineAsyncComponent({
-        loader: () => import(`./../../views/${pathArr[0]}/${pathArr[1]}/components/Form.vue`)
-    });
-
-    function onFormMounted(_formProps) {
-        formProps.value = _formProps;
-        setFormType();
+    await nextTick();
+    if (_mode === 'view') {
+        await formRef.value.setDisabledForm();
     }
+    // console.error(55555, _formProps)
+    await formRef.value.setFormDataFromId(formId.value);
+}
 
-    async function setFormType() {
-        const _mode = mode.value;
-        if (_mode === 'create') {
-            return;
+function close() {
+    tabStore.closeTab(currentRoute.value, router);
+}
+
+async function handleSubmit() {
+    try {
+        const saveSuccess = await saveModal();
+        if (saveSuccess) {
+            notification.success({
+                message: 'Tip',
+                description: formType.value === '0' ? t('新增成功！') : t('修改成功！')
+            }); //提示消息
+            formRef.value.resetFields();
+            setTimeout(() => {
+                bus.emit(FORM_LIST_MODIFIED, { path: formPath, mode });
+                close();
+            }, 1000);
         }
-        await nextTick();
-        if (_mode === 'view') {
-            await formRef.value.setDisabledForm();
-        }
-        await formRef.value.setFormDataFromId(formId.value);
+    } finally {
     }
+}
 
-    function close() {
-        tabStore.closeTab(currentRoute.value, router);
-    }
-
-    async function handleSubmit() {
-        try {
-            const saveSuccess = await saveModal();
-            if (saveSuccess) {
-                notification.success({
-                    message: 'Tip',
-                    description: formType.value === '0' ? t('新增成功！') : t('修改成功！')
-                }); //提示消息
-                formRef.value.resetFields();
-                setTimeout(() => {
-                    bus.emit(FORM_LIST_MODIFIED, { path: formPath, mode });
-                    close();
-                }, 1000);
-            }
-        } finally {
+async function saveModal() {
+    let saveSuccess = false;
+    const _mode = mode.value;
+    try {
+        const values = await formRef.value?.validate();
+        //添加隐藏组件
+        if (formProps.hiddenComponent?.length) {
+            formProps.hiddenComponent.forEach((component) => {
+                values[component.bindField] = component.value;
+            });
         }
-    }
-
-    async function saveModal() {
-        let saveSuccess = false;
-        const _mode = mode.value;
-        try {
-            const values = await formRef.value?.validate();
-            //添加隐藏组件
-            if (formProps.hiddenComponent?.length) {
-                formProps.hiddenComponent.forEach((component) => {
-                    values[component.bindField] = component.value;
-                });
-            }
-            if (values !== false) {
-                try {
-                    if (_mode === 'create') {
-                        saveSuccess = await formRef.value.add(values);
-                    } else {
-                        saveSuccess = await formRef.value.update({ values, rowId: formId.value });
-                    }
-                    return saveSuccess;
-                } catch (error) {}
-            }
-        } catch (error) {
-            console.error('saveModal Error: ', error);
+        if (values !== false) {
+            try {
+                if (_mode === 'create') {
+                    saveSuccess = await formRef.value.add(values);
+                } else {
+                    saveSuccess = await formRef.value.update({ values, rowId: formId.value });
+                }
+                return saveSuccess;
+            } catch (error) { }
         }
+    } catch (error) {
+        console.error('saveModal Error: ', error);
     }
+}
 </script>
 
 <style lang="less" scoped>
-    .page-bg-wrap {
-        background-color: #fff;
-    }
+.page-bg-wrap {
+    background-color: #fff;
+}
 
-    .top-toolbar {
-        min-height: 40px;
-        margin-bottom: 8px;
-        border-bottom: 1px solid #eee;
-    }
+.top-toolbar {
+    min-height: 40px;
+    margin-bottom: 8px;
+    border-bottom: 1px solid #eee;
+}
 </style>