From e2e12cd5c52204d7712265c794641c712424cb63 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 11 Jan 2023 16:10:58 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96FormBuilder?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/FormBuilder.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/Form/FormBuilder.vue b/src/components/Form/FormBuilder.vue
index 6de34440..cac91d0a 100644
--- a/src/components/Form/FormBuilder.vue
+++ b/src/components/Form/FormBuilder.vue
@@ -1,6 +1,7 @@
 <template>
   <div class='JForm-content'>
     <a-form
+      ref='form'
       v-bind='props'
       :model='formData.data'
       layout='vertical'
@@ -95,13 +96,12 @@ import type { Options, OptionsItem, OptionsComponent } from './index.modules'
 import { PropType } from 'vue'
 import { get, isArray, isString, pick, set } from 'lodash-es'
 import { formProps } from 'ant-design-vue/es/form'
-import { Form } from 'ant-design-vue';
 import componentType from './util'
 import {
   QuestionCircleOutlined
 } from '@ant-design/icons-vue';
 
-const useform = Form.useForm;
+const form = ref()
 
 const props = defineProps({
   ...formProps,
@@ -128,8 +128,6 @@ const formOptions = reactive<{ data: OptionsComponent[]}>({
   data: []
 }) // 表单Item
 
-const { resetFields, validate} = useform(formData, props.rules)
-
 const rowType = ref<string | undefined>(undefined)
 
 const calculateItemSpan = (span?: number | string) => {
@@ -196,7 +194,7 @@ const handleFormData = (data: Options, parentKey: Array<string> = []): any => {
  * 重置表单
  */
 const resetModel = () => {
-  resetFields()
+  form.value.resetFields()
 }
 
 /**
@@ -204,9 +202,9 @@ const resetModel = () => {
  */
 const formValidate = () => {
   return new Promise((res, rej) => {
-    validate().then(data => {
+    form.value.validate().then(() => {
       res(formData.data)
-    }).catch(err => {
+    }).catch((err: any) => {
       rej(err)
     })
   })