chore: form reset logic modification

src/components/Form/src/BasicForm.vue

@@ -194,7 +194,7 @@
               model: formModel,
               field: schema.field,
               values: {
-                ...unerf(defaultValueRef),
+                ...unref(defaultValueRef),
                 ...formModel,
               },
             });
@@ -271,11 +271,11 @@
         const formEl = unref(formElRef);
         if (!formEl) return;
         Object.keys(formModel).forEach((key) => {
-          (formModel as any)[key] = undefined;
+          (formModel as any)[key] = defaultValueRef.value[key];
         });
-        const values = formEl.resetFields();
+        // const values = formEl.resetFields();
         emit('reset', toRaw(formModel));
-        return values;
+        // return values;
       }
 
       /**

src/components/Form/src/FormItem.tsx

@@ -139,6 +139,7 @@ export default defineComponent({
       }
       return rules;
     }
+
     function renderComponent() {
       const {
         componentProps,
@@ -163,7 +164,6 @@ export default defineComponent({
           }
         },
       };
-
       const Comp = componentMap.get(component);
 
       const { autoSetPlaceHolder, size } = props.formProps;
@@ -189,9 +189,22 @@ export default defineComponent({
       const bindValue = {
         [isCheck ? 'checked' : 'value']: (props.formModel as any)[field],
       };
+      // TODO先兼容antd的警告，后面官方修复后删除
+      if (component === 'Select') {
+        if (Reflect.has(propsData, 'options')) {
+          propsData.options = propsData.options.map((item: any) => {
+            return {
+              key: item.value,
+              ...item,
+            };
+          });
+        }
+      }
+
       if (!renderComponentContent) {
         return <Comp {...propsData} {...on} {...bindValue} />;
       }
+
       return (
         <Comp {...propsData} {...on} {...bindValue}>
           {{