From 620fbd509ad403fe68b4e167aaa4b79655c150de Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Wed, 29 May 2024 17:24:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20formItem=20formItemProps=20=E8=B0=83?=
 =?UTF-8?q?=E7=A0=94=E5=85=B3=E8=81=94=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/view/equipmentManage/group/editFormula.vue             | 10 +++++++---
 hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue |  4 +++-
 hx-ai-intelligent/src/view/equipmentManage/group/groupEdit.vue |  0
 lib/component/form/form/form-item.vue                          |  4 ++++
 lib/component/form/form/use-form-model.ts                      |  6 +++---
 5 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 hx-ai-intelligent/src/view/equipmentManage/group/groupEdit.vue

diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue
index 1db40f2..df02997 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue
@@ -45,10 +45,12 @@
             field: 'formula',
             component: 'NsTextarea',
             defaultValue: '(A+B)*2',
-            style: { width: '450px' },
+            formItemProps: {
+              wrapperCol: { span: 24 },
+            },
             componentProps: {
               placeholder: '请输入',
-              autosize: {
+              autoSize: {
                 minRows: 6,
                 maxRows: 6,
               },
@@ -70,11 +72,13 @@
             label: '',
             field: 'NsBasicTable',
             component: 'NsBasicTable',
+            formItemProps: {
+              wrapperCol: { span: 24 },
+            },
             componentProps: {
               disabled: true,
               placeholder: '请输入',
               dataSource: mockDataSource.value,
-              style: { width: '450px' },
               pagination: false,
               rowKey: (record) => record.groupName,
               columns: [
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue
index afba0cc..2a38bca 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue
@@ -87,11 +87,13 @@
             label: '',
             field: 'NsBasicTable',
             component: 'NsBasicTable',
+            formItemProps: {
+              wrapperCol: { span: 24 },
+            },
             componentProps: {
               disabled: true,
               placeholder: '请输入',
               dataSource: mockDataSource.value,
-              style: { width: '450px' },
               rowSelection: { type: 'radio' },
               pagination: false,
               rowKey: (record) => record.groupName,
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/groupEdit.vue b/hx-ai-intelligent/src/view/equipmentManage/group/groupEdit.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/component/form/form/form-item.vue b/lib/component/form/form/form-item.vue
index 85e89fe..cb94e68 100644
--- a/lib/component/form/form/form-item.vue
+++ b/lib/component/form/form/form-item.vue
@@ -293,9 +293,13 @@
           },
           onValidateChange: (text: Object | undefined) => {
             if (isUndefined(text)) text = {};
+            console.error(text, 'onValidateChange');
+
             validateRef.value = text;
           },
         };
+        console.log(on, 'checkON');
+
         return {
           ...propsData,
           ...on,
diff --git a/lib/component/form/form/use-form-model.ts b/lib/component/form/form/use-form-model.ts
index 6c9d483..95c6fb3 100644
--- a/lib/component/form/form/use-form-model.ts
+++ b/lib/component/form/form/use-form-model.ts
@@ -1,5 +1,3 @@
-
-
 import type { UnwrapRef, Ref } from 'vue';
 import { unref, nextTick, toRaw } from 'vue';
 import { get, isArray, isNil, isUndefined, isPlainObject, forEach, isFunction } from 'lodash-es';
@@ -173,7 +171,9 @@ export function useFormModel({ schemas, formModel, formElRef, emit }: useFormMod
       //select allowClear时值被设为undefined
       unref(formModel)[key] = value;
     }
-    validateFields([key]).catch(() => {});
+    validateFields([key]).catch((err) => {
+      console.error(`${key}:`, err);
+    });
     // console.log('formModel', key, value, formModel.value);
     // if (fieldRules(key)) {
     //   console.log('getNamePath', getNamePath.value);