diff --git a/packages/core/client/src/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.tsx index f310ec6154..db80511c9d 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.tsx @@ -25,6 +25,8 @@ const commonItems: SchemaSettingsItemType[] = [ const { form } = useFormBlockContext(); const field = useField(); const { dn } = useDesignable(); + const { service } = useDetailsBlockContext(); + return { collectionName: name, defaultFilter: fieldSchema?.['x-decorator-props']?.params?.filter || {}, @@ -43,6 +45,7 @@ const commonItems: SchemaSettingsItemType[] = [ 'x-decorator-props': fieldSchema['x-decorator-props'], }, }); + service.params[0].page = 1; }, }; }, diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx index f1f67bd497..d1d4e1cb74 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx @@ -146,7 +146,6 @@ export const tableBlockSettings = new SchemaSettings({ params.filter = filter; field.decoratorProps.params = params; fieldSchema['x-decorator-props']['params'] = params; - const filters = service.params?.[1]?.filters || {}; dn.emit('patch', { schema: { @@ -154,6 +153,7 @@ export const tableBlockSettings = new SchemaSettings({ 'x-decorator-props': fieldSchema['x-decorator-props'], }, }); + service.params[0].page = 1; }, [dn, field.decoratorProps, fieldSchema, service], );