From 3de22b44b15e3fb430e1fc1e4ba3e08fb20fbc02 Mon Sep 17 00:00:00 2001
From: zzc0217 <73435678+zzc0217@users.noreply.github.com>
Date: Wed, 27 Dec 2023 10:47:43 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=A1=A8=E5=8D=95=E4=BD=BF=E7=94=A8up?=
 =?UTF-8?q?dateSchema=E6=97=B6=E5=8F=AA=E5=AF=B9=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84schema=E9=87=8D=E8=AE=BE=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修复搜索表单使用updateSchema时，如果使用fieldMapToTime引起的bug

* fix: set all schema to default value

---------

Co-authored-by: likui628 <90845831+likui628@users.noreply.github.com>
---
 src/components/Form/src/hooks/useFormEvents.ts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts
index d27f5af8..1220551e 100644
--- a/src/components/Form/src/hooks/useFormEvents.ts
+++ b/src/components/Form/src/hooks/useFormEvents.ts
@@ -284,21 +284,19 @@ export function useFormEvents({
       return;
     }
     const schema: FormSchema[] = [];
+    const updatedSchema: FormSchema[] = [];
     unref(getSchema).forEach((val) => {
-      let _val;
-      updateData.forEach((item) => {
-        if (val.field === item.field) {
-          _val = item;
-        }
-      });
-      if (_val !== undefined && val.field === _val.field) {
-        const newSchema = deepMerge(val, _val);
+      const updatedItem = updateData.find((item) => val.field === item.field);
+
+      if (updatedItem) {
+        const newSchema = deepMerge(val, updatedItem);
+        updatedSchema.push(newSchema as FormSchema);
         schema.push(newSchema as FormSchema);
       } else {
         schema.push(val);
       }
     });
-    _setDefaultValue(schema);
+    _setDefaultValue(updatedSchema);
 
     schemaRef.value = uniqBy(schema, 'field');
   }