fix: 优化、修复不合理问题

packages/pro-form/examples/layouts/BasicLayout.vue

@@ -19,11 +19,11 @@
     <!-- custom right-content -->
     <template #rightContentRender>
       <div style="margin-right: 12px">
-        <a-avatar shape="square" size="small">
+        <Avatar shape="square" size="small">
           <template #icon>
             <UserOutlined />
           </template>
-        </a-avatar>
+        </Avatar>
       </div>
     </template>
     <!-- custom breadcrumb itemRender  -->
@@ -72,6 +72,8 @@
 import { computed, reactive, ref, watchEffect, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { getMenuData, clearMenuItem, type RouteContextProps } from '@ant-design-vue/pro-layout';
+import { Avatar } from 'ant-design-vue';
+
 
 const watermarkContent = ref('Pro Layout');
 const loading = ref(false);

packages/pro-form/examples/views/QueryFilter.vue

@@ -1,5 +1,5 @@
 <template>
-    <QueryFilter :model="formModel" @finish="handleSubmit" @collapsed="onCollapsed">
+    <QueryFilter :model="formModel" @finish="handleSubmit" @collapsed="onCollapsed" @reset="onReset">
         <ProFormText
             name="name"
             label="应用名称"
@@ -109,7 +109,7 @@ const fetchUser = async () => {
 
 const formModel = reactive({
     name: '456',
-    country: undefined,
+    country: [],
     expirationTime: ref<Dayjs>(dayjs('2015/01/01', dateFormat)),
     rangeTimes: ref<RangeValue>(),
     weakTime: ref<Dayjs>(),
@@ -135,4 +135,8 @@ function handleSubmit(params: any) {
 function onCollapsed(collapsed: boolean) {
     console.log(collapsed);
 }
+
+function onReset(params: any) {
+    console.log(params);
+}
 </script>

packages/pro-form/src/BaseForm/BaseForm.tsx

@@ -37,7 +37,7 @@ const BaseForm = defineComponent({
             ...formEvents,
             ...formMethods
         } as BaseFormType;
-
+        
         createFromInstance(instance);
 
         expose(instance);

packages/pro-form/src/BaseForm/hooks/useFormEvents.ts

@@ -57,7 +57,7 @@ export const useFromEvents = (params: EventsParams) => {
   const resetFields = (name?: NamePath) => {
     unref(formInstanceRef)?.resetFields(name);
 
-    props.onReset?.(model.value);
+    props.onReset?.(handleFormValues(model.value));
     submitOnReset && handleSubmit();
   };
 

packages/pro-form/src/QueryFilter/components/form-action/action.tsx

@@ -37,7 +37,9 @@ export const Action = defineComponent({
   },
   emits: ['collapsed'],
   setup(props, { emit }) {
+
     const { submit, resetForm } = useFormInstance();
+
     const onCollapsed = () => {
       emit('collapsed', !props.collapsed);
     };

packages/pro-form/src/helpers/grid.tsx

@@ -54,14 +54,8 @@ export const gridHelpers: (config: ProFormGridConfig & CommonProps) => GridHelpe
 });
 
 export const useGridHelpers = (props?: (ProFormGridConfig & CommonProps) | boolean) => {
-  const formInstance = useFormInstance();
   const _grid = ref<boolean>();
   const _colProps = ref<ColProps>();
-  if (formInstance) {
-    const { grid, colProps } = unref(formInstance.getFormProps);
-    _grid.value = grid;
-    _colProps.value = colProps;
-  }
 
   const config = computed(() => {
     if (typeof props === 'object') {