diff --git a/packages/pro-form/examples/layouts/BasicLayout.vue b/packages/pro-form/examples/layouts/BasicLayout.vue
index 2e2961aa..b8205fd9 100644
--- a/packages/pro-form/examples/layouts/BasicLayout.vue
+++ b/packages/pro-form/examples/layouts/BasicLayout.vue
@@ -19,11 +19,11 @@
@@ -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);
diff --git a/packages/pro-form/examples/views/QueryFilter.vue b/packages/pro-form/examples/views/QueryFilter.vue
index b6c3830b..75cb11a9 100644
--- a/packages/pro-form/examples/views/QueryFilter.vue
+++ b/packages/pro-form/examples/views/QueryFilter.vue
@@ -1,5 +1,5 @@
-
+
{
const formModel = reactive({
name: '456',
- country: undefined,
+ country: [],
expirationTime: ref(dayjs('2015/01/01', dateFormat)),
rangeTimes: ref(),
weakTime: ref(),
@@ -135,4 +135,8 @@ function handleSubmit(params: any) {
function onCollapsed(collapsed: boolean) {
console.log(collapsed);
}
+
+function onReset(params: any) {
+ console.log(params);
+}
diff --git a/packages/pro-form/src/BaseForm/BaseForm.tsx b/packages/pro-form/src/BaseForm/BaseForm.tsx
index 5aef05e1..de5d0059 100644
--- a/packages/pro-form/src/BaseForm/BaseForm.tsx
+++ b/packages/pro-form/src/BaseForm/BaseForm.tsx
@@ -37,7 +37,7 @@ const BaseForm = defineComponent({
...formEvents,
...formMethods
} as BaseFormType;
-
+
createFromInstance(instance);
expose(instance);
diff --git a/packages/pro-form/src/BaseForm/hooks/useFormEvents.ts b/packages/pro-form/src/BaseForm/hooks/useFormEvents.ts
index 35d43257..d90642e0 100644
--- a/packages/pro-form/src/BaseForm/hooks/useFormEvents.ts
+++ b/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();
};
diff --git a/packages/pro-form/src/QueryFilter/components/form-action/action.tsx b/packages/pro-form/src/QueryFilter/components/form-action/action.tsx
index 2c12471a..dee8f992 100644
--- a/packages/pro-form/src/QueryFilter/components/form-action/action.tsx
+++ b/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);
};
diff --git a/packages/pro-form/src/helpers/grid.tsx b/packages/pro-form/src/helpers/grid.tsx
index 9056098f..8bdea756 100644
--- a/packages/pro-form/src/helpers/grid.tsx
+++ b/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();
const _colProps = ref();
- if (formInstance) {
- const { grid, colProps } = unref(formInstance.getFormProps);
- _grid.value = grid;
- _colProps.value = colProps;
- }
const config = computed(() => {
if (typeof props === 'object') {